diff options
| author | Tom Rini | 2020-01-09 13:42:43 -0500 |
|---|---|---|
| committer | Tom Rini | 2020-01-09 13:42:43 -0500 |
| commit | c00bd81ae0d6eb1f94e26b31be3a64cadaa05bcb (patch) | |
| tree | b22ed421df354799a4b08ca2f4fa3cc3a02ae715 /arch | |
| parent | d6b92b9742f125542dd0985976c3a6c560ed40fd (diff) | |
| parent | fddf876a8f56ff53d1354387ebf7fd3997189349 (diff) | |
Merge branch 'next' of https://gitlab.denx.de/u-boot/custodians/u-boot-mpc83xx
- A small PR with MC8309 fixes from Rasmus.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/Kconfig | 8 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/arch-mpc83xx/gpio.h | 3 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/immap_83xx.h | 3 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/mpc8xxx_spi.h | 1 |
4 files changed, 12 insertions, 3 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig index 72053ceab4c..5d7650294dd 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -220,6 +220,8 @@ config ARCH_MPC8309 select MPC83XX_QUICC_ENGINE select MPC83XX_PCI_SUPPORT select MPC83XX_SECOND_I2C_SUPPORT + select SYS_FSL_ERRATUM_ESDHC111 + select FSL_ELBC config ARCH_MPC831X bool @@ -231,6 +233,7 @@ config ARCH_MPC8313 bool select ARCH_MPC831X select MPC83XX_SECOND_I2C_SUPPORT + select FSL_ELBC config ARCH_MPC8315 bool @@ -238,6 +241,7 @@ config ARCH_MPC8315 select MPC83XX_PCIE1_SUPPORT select MPC83XX_PCIE2_SUPPORT select MPC83XX_SATA_SUPPORT + select FSL_ELBC config ARCH_MPC832X bool @@ -274,6 +278,7 @@ config ARCH_MPC837X select MPC83XX_SATA_SUPPORT select MPC83XX_LDP_PIN select MPC83XX_SECOND_I2C_SUPPORT + select FSL_ELBC config SYS_IMMR hex "Value for IMMR" @@ -317,6 +322,9 @@ endif endmenu +config FSL_ELBC + bool + source "board/esd/vme8349/Kconfig" source "board/freescale/mpc8308rdb/Kconfig" source "board/freescale/mpc8313erdb/Kconfig" diff --git a/arch/powerpc/include/asm/arch-mpc83xx/gpio.h b/arch/powerpc/include/asm/arch-mpc83xx/gpio.h index 385d651d200..8a6896e6229 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 diff --git a/arch/powerpc/include/asm/immap_83xx.h b/arch/powerpc/include/asm/immap_83xx.h index d02da6495ce..609869c7154 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 b583a3269d6..470ee955f30 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) || \ |