| Message ID | 20191212091841.30941-1-rasmus.villemoes@prevas.dk |
|---|---|
| State | Accepted |
| Commit | 42a13a0b9faf88da332675c997f06a063fc77133 |
| Delegated to: | Mario Six |
| Headers | show |
| Series | mpc83xx: set MPC83XX_GPIO_CTRLRS to 2 for MPC8309 | expand |
On Thu, Dec 12, 2019 at 10:18 AM Rasmus Villemoes <rasmus.villemoes@prevas.dk> wrote: > > The MPC8309 has two gpio controllers (which is already correctly > reflected in its struct immap definition). > > Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> > --- > arch/powerpc/include/asm/arch-mpc83xx/gpio.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/include/asm/arch-mpc83xx/gpio.h b/arch/powerpc/include/asm/arch-mpc83xx/gpio.h > index 385d651d20..8a6896e622 100644 > --- a/arch/powerpc/include/asm/arch-mpc83xx/gpio.h > +++ b/arch/powerpc/include/asm/arch-mpc83xx/gpio.h > @@ -9,7 +9,8 @@ > #if defined(CONFIG_ARCH_MPC8313) || defined(CONFIG_ARCH_MPC8308) || \ > defined(CONFIG_ARCH_MPC8315) > #define MPC83XX_GPIO_CTRLRS 1 > -#elif defined(CONFIG_ARCH_MPC834X) || defined(CONFIG_ARCH_MPC837X) > +#elif defined(CONFIG_ARCH_MPC834X) || defined(CONFIG_ARCH_MPC837X) || \ > + defined(CONFIG_ARCH_MPC8309) > #define MPC83XX_GPIO_CTRLRS 2 > #else > #define MPC83XX_GPIO_CTRLRS 0 > -- > 2.23.0 > Reviewed-by: Mario Six <mario.six@gdsys.cc> Applied to mpc83xx/next. Best regards, Mario
diff --git a/arch/powerpc/include/asm/arch-mpc83xx/gpio.h b/arch/powerpc/include/asm/arch-mpc83xx/gpio.h index 385d651d20..8a6896e622 100644 --- a/arch/powerpc/include/asm/arch-mpc83xx/gpio.h +++ b/arch/powerpc/include/asm/arch-mpc83xx/gpio.h @@ -9,7 +9,8 @@ #if defined(CONFIG_ARCH_MPC8313) || defined(CONFIG_ARCH_MPC8308) || \ defined(CONFIG_ARCH_MPC8315) #define MPC83XX_GPIO_CTRLRS 1 -#elif defined(CONFIG_ARCH_MPC834X) || defined(CONFIG_ARCH_MPC837X) +#elif defined(CONFIG_ARCH_MPC834X) || defined(CONFIG_ARCH_MPC837X) || \ + defined(CONFIG_ARCH_MPC8309) #define MPC83XX_GPIO_CTRLRS 2 #else #define MPC83XX_GPIO_CTRLRS 0
The MPC8309 has two gpio controllers (which is already correctly reflected in its struct immap definition). Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> --- arch/powerpc/include/asm/arch-mpc83xx/gpio.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)