projects
/
15.05
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
brcm63xx: fix gpio register usage
[15.05/openwrt.git]
/
target
/
linux
/
brcm63xx
/
patches-3.18
/
375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch
diff --git
a/target/linux/brcm63xx/patches-3.18/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch
b/target/linux/brcm63xx/patches-3.18/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch
index
24dd3a9
..
d561e43
100644
(file)
--- a/
target/linux/brcm63xx/patches-3.18/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch
+++ b/
target/linux/brcm63xx/patches-3.18/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch
@@
-100,7
+100,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
- u32 mask;
+ res[0].flags = IORESOURCE_MEM;
+ res[0].start = bcm63xx_regset_address(RSET_GPIO);
- u32 mask;
+ res[0].flags = IORESOURCE_MEM;
+ res[0].start = bcm63xx_regset_address(RSET_GPIO);
-+ res[0].start += d
ata
;
++ res[0].start += d
ir
;
- if (gpio >= chip->ngpio)
- BUG();
- if (gpio >= chip->ngpio)
- BUG();
@@
-115,7
+115,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
- }
+ res[1].flags = IORESOURCE_MEM;
+ res[1].start = bcm63xx_regset_address(RSET_GPIO);
- }
+ res[1].flags = IORESOURCE_MEM;
+ res[1].start = bcm63xx_regset_address(RSET_GPIO);
-+ res[1].start += d
ir
;
++ res[1].start += d
ata
;
- return !!(bcm_gpio_readl(reg) & mask);
-}
- return !!(bcm_gpio_readl(reg) & mask);
-}
@@
-175,7
+175,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+ else
+ data_low_reg = GPIO_DATA_LO_REG;
+ else
+ data_low_reg = GPIO_DATA_LO_REG;
-+ bcm63xx_gpio_init_one(0,
data_low_reg, GPIO_CTL_LO_REG
, min(ngpio, 32));
++ bcm63xx_gpio_init_one(0,
GPIO_CTL_LO_REG, data_low_reg
, min(ngpio, 32));
-static struct gpio_chip bcm63xx_gpio_chip = {
- .label = "bcm63xx-gpio",
-static struct gpio_chip bcm63xx_gpio_chip = {
- .label = "bcm63xx-gpio",
@@
-191,7
+191,7
@@
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
-int __init bcm63xx_gpio_init(void)
-{
- bcm63xx_gpio_out_low_reg_init();
-int __init bcm63xx_gpio_init(void)
-{
- bcm63xx_gpio_out_low_reg_init();
-+ bcm63xx_gpio_init_one(1, GPIO_
DATA_HI_REG, GPIO_CTL
_HI_REG, ngpio - 32);
++ bcm63xx_gpio_init_one(1, GPIO_
CTL_HI_REG, GPIO_DATA
_HI_REG, ngpio - 32);
- gpio_out_low = bcm_gpio_readl(gpio_out_low_reg);
- if (!BCMCPU_IS_6345())
- gpio_out_low = bcm_gpio_readl(gpio_out_low_reg);
- if (!BCMCPU_IS_6345())