Message ID | 1381978053-31170-1-git-send-email-Yuantian.Tang@freescale.com |
---|---|
State | Accepted |
Delegated to: | York Sun |
Headers | show |
On 10/16/2013 07:47 PM, Yuantian.Tang@freescale.com wrote: > From: Tang Yuantian <yuantian.tang@freescale.com> > > The offset of register address within GPIO module is just > CONFIG_SYS_MPC85xx_GPIO_ADDR. So, fix it. The following platforms > are confirmed: MPC8572, P1023, P1020, P1022, P2020, P4080, > P5020, P5040, T4240, B4860. > > Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com> > --- Applied to u-boot-mpc85xx/master. Thanks. York
diff --git a/arch/powerpc/include/asm/mpc85xx_gpio.h b/arch/powerpc/include/asm/mpc85xx_gpio.h index 3d11884..87bb4a0 100644 --- a/arch/powerpc/include/asm/mpc85xx_gpio.h +++ b/arch/powerpc/include/asm/mpc85xx_gpio.h @@ -20,7 +20,7 @@ static inline void mpc85xx_gpio_set(unsigned int mask, unsigned int dir, unsigned int val) { - ccsr_gpio_t *gpio = (void *)(CONFIG_SYS_MPC85xx_GPIO_ADDR + 0xc00); + ccsr_gpio_t *gpio = (void *)(CONFIG_SYS_MPC85xx_GPIO_ADDR); /* First mask off the unwanted parts of "dir" and "val" */ dir &= mask; @@ -56,7 +56,7 @@ static inline void mpc85xx_gpio_set_high(unsigned int gpios) static inline unsigned int mpc85xx_gpio_get(unsigned int mask) { - ccsr_gpio_t *gpio = (void *)(CONFIG_SYS_MPC85xx_GPIO_ADDR + 0xc00); + ccsr_gpio_t *gpio = (void *)(CONFIG_SYS_MPC85xx_GPIO_ADDR); /* Read the requested values */ return in_be32(&gpio->gpdat) & mask;