diff options
author | Florian Fainelli <florian@openwrt.org> | 2010-05-15 21:26:56 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2010-05-15 21:26:56 +0000 |
commit | 928da83f5beb644cb706ca41ddc8742035929cde (patch) | |
tree | 1e9ad139da4f3c3fb6161d23bd895dbfe451872e /target/linux/rdc/patches-2.6.30/002-rdc321x_gpio.patch | |
parent | fa8c4aa1644ef3a1c1af3b0e245ef0cad19209cc (diff) | |
download | upstream-928da83f5beb644cb706ca41ddc8742035929cde.tar.gz upstream-928da83f5beb644cb706ca41ddc8742035929cde.tar.bz2 upstream-928da83f5beb644cb706ca41ddc8742035929cde.zip |
fix panic on boot due to invalid IORESOURCE for MFD cells, fix gpio value setting
SVN-Revision: 21459
Diffstat (limited to 'target/linux/rdc/patches-2.6.30/002-rdc321x_gpio.patch')
-rw-r--r-- | target/linux/rdc/patches-2.6.30/002-rdc321x_gpio.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/rdc/patches-2.6.30/002-rdc321x_gpio.patch b/target/linux/rdc/patches-2.6.30/002-rdc321x_gpio.patch index a9e6348f7c..592d86ab05 100644 --- a/target/linux/rdc/patches-2.6.30/002-rdc321x_gpio.patch +++ b/target/linux/rdc/patches-2.6.30/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 = pdev->dev.driver_data; + 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; |