X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f024fd0c2ae5e7499c6c0473a0b1aa9490611380..9ee3790b2ad1c280570dd7beaeb112c7fce7b314:/target/linux/rdc/patches-2.6.32/002-rdc321x_gpio.patch?ds=inline

diff --git a/target/linux/rdc/patches-2.6.32/002-rdc321x_gpio.patch b/target/linux/rdc/patches-2.6.32/002-rdc321x_gpio.patch
index e1aa46e8a..42ad6aa64 100644
--- a/target/linux/rdc/patches-2.6.32/002-rdc321x_gpio.patch
+++ b/target/linux/rdc/patches-2.6.32/002-rdc321x_gpio.patch
@@ -109,7 +109,7 @@ Changes from v2:
 +		gpch->data_reg[reg] &= ~(1 << (gpio & 0x1f));
 +
 +	pci_write_config_dword(gpch->sb_pdev,
-+			reg ? gpch->reg1_data_base : gpch->reg2_data_base,
++			reg ? gpch->reg2_data_base : gpch->reg1_data_base,
 +			gpch->data_reg[reg]);
 +}
 +
@@ -171,7 +171,7 @@ Changes from v2:
 +	struct rdc321x_gpio *rdc321x_gpio_dev;
 +	struct rdc321x_gpio_pdata *pdata;
 +
-+	pdata = pdev->dev.platform_data;
++	pdata = platform_get_drvdata(pdev);
 +	if (!pdata) {
 +		dev_err(&pdev->dev, "no platform data supplied\n");
 +		return -ENODEV;
@@ -183,7 +183,7 @@ Changes from v2:
 +		return -ENOMEM;
 +	}
 +
-+	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gpio-reg1");
++	r = platform_get_resource_byname(pdev, IORESOURCE_IO, "gpio-reg1");
 +	if (!r) {
 +		dev_err(&pdev->dev, "failed to get gpio-reg1 resource\n");
 +		err = -ENODEV;
@@ -195,7 +195,7 @@ Changes from v2:
 +	rdc321x_gpio_dev->reg1_ctrl_base = r->start;
 +	rdc321x_gpio_dev->reg1_data_base = r->start + 0x4;
 +
-+	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gpio-reg2");
++	r = platform_get_resource_byname(pdev, IORESOURCE_IO, "gpio-reg2");
 +	if (!r) {
 +		dev_err(&pdev->dev, "failed to get gpio-reg2 resource\n");
 +		err = -ENODEV;