| Message ID | 20191212083535.24251-1-rasmus.villemoes@prevas.dk |
|---|---|
| State | Accepted |
| Commit | 375d817d9ed3eabed13b9ddfa6efad8e6430891c |
| Delegated to: | Mario Six |
| Headers | show |
| Series | mpc83xx: immap_83xx: add spi8xxx_t in immap for mpc8309 | expand |
On Thu, Dec 12, 2019 at 9:35 AM Rasmus Villemoes <rasmus.villemoes@prevas.dk> wrote: > > Allow drivers/spi/mpc8xxx_spi.c to be built for an mpc8309 target. > > Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> > --- > arch/powerpc/include/asm/immap_83xx.h | 3 +-- > arch/powerpc/include/asm/mpc8xxx_spi.h | 1 + > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/include/asm/immap_83xx.h b/arch/powerpc/include/asm/immap_83xx.h > index d02da6495c..609869c715 100644 > --- a/arch/powerpc/include/asm/immap_83xx.h > +++ b/arch/powerpc/include/asm/immap_83xx.h > @@ -941,8 +941,7 @@ typedef struct immap { > u8 res4[0x500]; > fsl_lbc_t im_lbc; /* Local Bus Controller Regs */ > u8 res5[0x1000]; > - u8 spi[0x100]; > - u8 res6[0xf00]; > + spi8xxx_t spi; /* Serial Peripheral Interface */ > dma83xx_t dma; /* DMA */ > pciconf83xx_t pci_conf[1]; /* PCI Configuration Registers */ > u8 res7[0x80]; > diff --git a/arch/powerpc/include/asm/mpc8xxx_spi.h b/arch/powerpc/include/asm/mpc8xxx_spi.h > index b583a3269d..470ee955f3 100644 > --- a/arch/powerpc/include/asm/mpc8xxx_spi.h > +++ b/arch/powerpc/include/asm/mpc8xxx_spi.h > @@ -11,6 +11,7 @@ > #include <asm/types.h> > > #if defined(CONFIG_ARCH_MPC8308) || \ > + defined(CONFIG_ARCH_MPC8309) || \ > defined(CONFIG_ARCH_MPC8313) || \ > defined(CONFIG_ARCH_MPC8315) || \ > defined(CONFIG_ARCH_MPC834X) || \ > -- > 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/immap_83xx.h b/arch/powerpc/include/asm/immap_83xx.h index d02da6495c..609869c715 100644 --- a/arch/powerpc/include/asm/immap_83xx.h +++ b/arch/powerpc/include/asm/immap_83xx.h @@ -941,8 +941,7 @@ typedef struct immap { u8 res4[0x500]; fsl_lbc_t im_lbc; /* Local Bus Controller Regs */ u8 res5[0x1000]; - u8 spi[0x100]; - u8 res6[0xf00]; + spi8xxx_t spi; /* Serial Peripheral Interface */ dma83xx_t dma; /* DMA */ pciconf83xx_t pci_conf[1]; /* PCI Configuration Registers */ u8 res7[0x80]; diff --git a/arch/powerpc/include/asm/mpc8xxx_spi.h b/arch/powerpc/include/asm/mpc8xxx_spi.h index b583a3269d..470ee955f3 100644 --- a/arch/powerpc/include/asm/mpc8xxx_spi.h +++ b/arch/powerpc/include/asm/mpc8xxx_spi.h @@ -11,6 +11,7 @@ #include <asm/types.h> #if defined(CONFIG_ARCH_MPC8308) || \ + defined(CONFIG_ARCH_MPC8309) || \ defined(CONFIG_ARCH_MPC8313) || \ defined(CONFIG_ARCH_MPC8315) || \ defined(CONFIG_ARCH_MPC834X) || \
Allow drivers/spi/mpc8xxx_spi.c to be built for an mpc8309 target. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> --- arch/powerpc/include/asm/immap_83xx.h | 3 +-- arch/powerpc/include/asm/mpc8xxx_spi.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-)