mpc83xx: immap_83xx: add spi8xxx_t in immap for mpc8309

Allow drivers/spi/mpc8xxx_spi.c to be built for an mpc8309 target.

Signed-off-by: Rasmus Villemoes <[email protected]>
Reviewed-by: Mario Six <[email protected]>

diff --git a/arch/powerpc/include/asm/immap_83xx.h b/arch/powerpc/include/asm/immap_83xx.h
index d02da6495ce9261f34e3eccc4b05b10838579358..609869c7154b35d7080511f353f13619e864d530 100644 (file)
--- 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 b583a3269d682df736381c8f51fcbb2adcdb3711..470ee955f303519fa31d33f44fc0a434460579bc 100644 (file)
--- 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) || \