No board in the tree selects ARCH_MPC8560, and the SoC is unmaintained. Remove the unused architecture configuration, reset and clock handling, and CPU identification.
Signed-off-by: Bradley Morgan <[email protected]> --- arch/powerpc/cpu/mpc85xx/Kconfig | 9 +-------- arch/powerpc/cpu/mpc85xx/cpu.c | 17 ----------------- arch/powerpc/cpu/mpc85xx/cpu_init.c | 6 ++---- arch/powerpc/cpu/mpc85xx/fdt.c | 6 ++---- arch/powerpc/cpu/mpc85xx/speed.c | 4 +--- arch/powerpc/cpu/mpc8xxx/cpu.c | 1 - arch/powerpc/include/asm/fsl_lbc.h | 2 +- arch/powerpc/include/asm/immap_85xx.h | 4 ---- arch/powerpc/include/asm/processor.h | 1 - 9 files changed, 7 insertions(+), 43 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 2d405501c57..bcdeef59fe7 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -335,11 +335,6 @@ config ARCH_MPC8544 select SYS_PPC_E500_USE_DEBUG_TLB select FSL_ELBC -config ARCH_MPC8560 - bool - select FSL_LAW - select SYS_FSL_HAS_DDR1 - config ARCH_P1010 bool select A003399_NOR_WORKAROUND if SYS_FSL_ERRATUM_IFC_A003399 && !SPL @@ -756,7 +751,6 @@ config SYS_CCSRBAR_DEFAULT default 0xff700000 if ARCH_BSC9131 || \ ARCH_BSC9132 || \ ARCH_MPC8544 || \ - ARCH_MPC8560 || \ ARCH_P1010 || \ ARCH_P1020 || \ ARCH_P1021 || \ @@ -969,7 +963,6 @@ config SYS_FSL_NUM_LAWS ARCH_P1024 || \ ARCH_P2020 default 10 if ARCH_MPC8544 - default 8 if ARCH_MPC8560 help Number of local access windows. This is fixed per SoC. If not sure, do not change. @@ -1104,7 +1097,7 @@ config SYS_FSL_IFC_CLK_DIV config SYS_FSL_LBC_CLK_DIV int "Divider of platform clock" - depends on FSL_ELBC || ARCH_MPC8560 + depends on FSL_ELBC default 2 if ARCH_P2041 default 1 diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index c33250faac6..b4e9f6aac66 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -301,22 +301,6 @@ int checkcpu (void) int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { -/* Everything after the first generation of PQ3 parts has RSTCR */ -#if defined(CONFIG_ARCH_MPC8560) - unsigned long val, msr; - - /* - * Initiate hard reset in debug control register DBCR0 - * Make sure MSR[DE] = 1. This only resets the core. - */ - msr = mfmsr (); - msr |= MSR_DE; - mtmsr (msr); - - val = mfspr(DBCR0); - val |= 0x70000000; - mtspr(DBCR0,val); -#else volatile ccsr_gur_t *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR); /* Call board-specific preparation for reset */ @@ -331,7 +315,6 @@ int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) /* Attempt last-stage board-specific reset */ board_reset_last(); -#endif return 1; } diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index c6923a797f9..7970c296e5a 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -546,8 +546,7 @@ int l2cache_init(void) return -1; break; case 0x1: - if (ver == SVR_8560 || - ver == SVR_8541 || ver == SVR_8555) { + if (ver == SVR_8541 || ver == SVR_8555) { puts("128 KiB "); /* set L2E=1, L2I=1, & L2BLKSZ=1 (128 KiBibyte) */ cache_ctl = 0xc4000000; @@ -557,8 +556,7 @@ int l2cache_init(void) } break; case 0x2: - if (ver == SVR_8560 || - ver == SVR_8541 || ver == SVR_8555) { + if (ver == SVR_8541 || ver == SVR_8555) { puts("256 KiB "); /* set L2E=1, L2I=1, & L2BLKSZ=2 (256 KiBibyte) */ cache_ctl = 0xc8000000; diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index e115c19cf8d..e7d1d9473d2 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -229,15 +229,13 @@ static inline u32 l2cache_size(void) case 0x0: break; case 0x1: - if (ver == SVR_8560 || - ver == SVR_8541 || ver == SVR_8555) + if (ver == SVR_8541 || ver == SVR_8555) return 128; else return 256; break; case 0x2: - if (ver == SVR_8560 || - ver == SVR_8541 || ver == SVR_8555) + if (ver == SVR_8541 || ver == SVR_8555) return 256; else return 512; diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index 8e9808953dc..ed4ae33e6a8 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -593,9 +593,7 @@ int get_clocks(void) * for that SOC. This information is taken from application note * AN2919. */ -#if defined(CONFIG_ARCH_MPC8560) - gd->arch.i2c1_clk = sys_info.freq_systembus; -#elif defined(CONFIG_ARCH_MPC8544) +#if defined(CONFIG_ARCH_MPC8544) /* * On the 8544, the I2C clock is the same as the SEC clock. This can be * either CCB/2 or CCB/3, depending on the value of cfg_sec_freq. See diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c index 8d652e36d17..3594c1e3de2 100644 --- a/arch/powerpc/cpu/mpc8xxx/cpu.c +++ b/arch/powerpc/cpu/mpc8xxx/cpu.c @@ -33,7 +33,6 @@ static struct cpu_type cpu_type_list[] = { CPU_TYPE_ENTRY(8547, 8547, 1), CPU_TYPE_ENTRY(8548, 8548, 1), CPU_TYPE_ENTRY(8555, 8555, 1), - CPU_TYPE_ENTRY(8560, 8560, 1), CPU_TYPE_ENTRY(8567, 8567, 1), CPU_TYPE_ENTRY(8568, 8568, 1), CPU_TYPE_ENTRY(8569, 8569, 1), diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h index d98673c40b3..9efb6ae6cd0 100644 --- a/arch/powerpc/include/asm/fsl_lbc.h +++ b/arch/powerpc/include/asm/fsl_lbc.h @@ -321,7 +321,7 @@ void lbc_sdram_init(void); */ #define LCRR_CLKDIV 0x0000001F #define LCRR_CLKDIV_SHIFT 0 -#if defined(CONFIG_MPC83xx) || defined(CONFIG_ARCH_MPC8560) +#if defined(CONFIG_MPC83xx) #define LCRR_CLKDIV_2 0x00000002 #define LCRR_CLKDIV_4 0x00000004 #define LCRR_CLKDIV_8 0x00000008 diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 4479ef813c8..b646d24bc6b 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -123,10 +123,6 @@ typedef struct ccsr_i2c { u8 res[4096 - 1 * sizeof(struct fsl_i2c_base)]; } ccsr_i2c_t; -typedef struct ccsr_duart { - u8 res[4096]; -} ccsr_duart_t; - /* eSPI Registers */ typedef struct ccsr_espi { u32 mode; /* eSPI mode */ diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index 77414c05aba..b78a726445d 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h @@ -1021,7 +1021,6 @@ #define SVR_8547 0x803101 #define SVR_8548 0x803100 #define SVR_8555 0x807100 -#define SVR_8560 0x807000 #define SVR_8567 0x807501 #define SVR_8568 0x807500 #define SVR_8569 0x808000 -- 2.47.3
