diff options
| author | Tom Rini <trini@konsulko.com> | 2022-11-10 10:09:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-11-10 10:09:40 -0500 |
| commit | 0cbeed4f6648e0e4966475e3544280a69ecb59d3 (patch) | |
| tree | a7b4b6b44bc3d43628e654f0c75ef2fab49ffd1b /arch/powerpc/include/asm/mpc85xx_gpio.h | |
| parent | 77b5cc2948f5d93fe3d275302f596ffd8701a875 (diff) | |
| parent | cc1159bbfa94a60e4180846e480b887cf91fa722 (diff) | |
Merge branch '2022-11-10-symbol-migrations'
- Migrate a number of CONFIG symbols to Kconfig and start migrating some
symbol families from CONFIG to the CFG namespace.
Diffstat (limited to 'arch/powerpc/include/asm/mpc85xx_gpio.h')
| -rw-r--r-- | arch/powerpc/include/asm/mpc85xx_gpio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/mpc85xx_gpio.h b/arch/powerpc/include/asm/mpc85xx_gpio.h index feebe15caca..0ed6beca387 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); + ccsr_gpio_t *gpio = (void *)(CFG_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); + ccsr_gpio_t *gpio = (void *)(CFG_SYS_MPC85xx_GPIO_ADDR); /* Read the requested values */ return in_be32(&gpio->gpdat) & mask; |