No board selects ARCH_MPC8309, and the SoC is unmaintained. The CPU, clock and GPIO match tables still accepted it.
Remove those stale entries. Signed-off-by: Bradley Morgan <[email protected]> --- arch/powerpc/cpu/mpc83xx/cpu.c | 1 - arch/powerpc/include/asm/arch-mpc83xx/soc.h | 7 ++----- doc/device-tree-bindings/clock/fsl,mpc83xx-clk.txt | 1 - doc/device-tree-bindings/cpu/fsl,mpc83xx.txt | 1 - doc/device-tree-bindings/gpio/fsl,mpc83xx-spisel-boot.txt | 4 ++-- drivers/clk/mpc83xx_clk.c | 7 +++---- drivers/cpu/mpc83xx_cpu.c | 4 ---- drivers/cpu/mpc83xx_cpu.h | 3 --- drivers/gpio/mpc83xx_spisel_boot.c | 1 - drivers/qe/qe.c | 1 - include/mpc83xx.h | 1 - 11 files changed, 7 insertions(+), 24 deletions(-) diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index 7583121eb12..4117f3aa6af 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -47,7 +47,6 @@ int checkcpu(void) u32 partid; } cpu_type_list [] = { CPU_TYPE_ENTRY(8308), - CPU_TYPE_ENTRY(8309), CPU_TYPE_ENTRY(8321), CPU_TYPE_ENTRY(8323), CPU_TYPE_ENTRY(8358_TBGA_), diff --git a/arch/powerpc/include/asm/arch-mpc83xx/soc.h b/arch/powerpc/include/asm/arch-mpc83xx/soc.h index 0473389bc7d..eb82bb9e810 100644 --- a/arch/powerpc/include/asm/arch-mpc83xx/soc.h +++ b/arch/powerpc/include/asm/arch-mpc83xx/soc.h @@ -9,15 +9,13 @@ enum soc_type { SOC_MPC8308, - SOC_MPC8309, SOC_MPC832X, SOC_MPC8360, }; static inline bool mpc83xx_has_sdhc(int type) { - return (type == SOC_MPC8308) || - (type == SOC_MPC8309); + return type == SOC_MPC8308; } static inline bool mpc83xx_has_tsec(int type) @@ -42,8 +40,7 @@ static inline bool mpc83xx_has_second_i2c(int type) static inline bool mpc83xx_has_quicc_engine(int type) { - return (type == SOC_MPC8309) || - (type == SOC_MPC832X) || + return (type == SOC_MPC832X) || (type == SOC_MPC8360); } diff --git a/doc/device-tree-bindings/clock/fsl,mpc83xx-clk.txt b/doc/device-tree-bindings/clock/fsl,mpc83xx-clk.txt index 213123dbab4..6c38a3254e8 100644 --- a/doc/device-tree-bindings/clock/fsl,mpc83xx-clk.txt +++ b/doc/device-tree-bindings/clock/fsl,mpc83xx-clk.txt @@ -5,7 +5,6 @@ system. Required properties: - compatible: must be one of "fsl,mpc8308-clk", - "fsl,mpc8309-clk", "fsl,mpc832x-clk", "fsl,mpc8360-clk" depending on which SoC is employed diff --git a/doc/device-tree-bindings/cpu/fsl,mpc83xx.txt b/doc/device-tree-bindings/cpu/fsl,mpc83xx.txt index 5acb2c403c9..6e0052869d3 100644 --- a/doc/device-tree-bindings/cpu/fsl,mpc83xx.txt +++ b/doc/device-tree-bindings/cpu/fsl,mpc83xx.txt @@ -5,7 +5,6 @@ MPC83xx SoCs contain a e300 core as their main processor. Required properties: - compatible: must be one of "fsl,mpc83xx", "fsl,mpc8308", - "fsl,mpc8309", "fsl,mpc832x", "fsl,mpc8360" - clocks: has to have two entries, which must be the core clock at index 0 and diff --git a/doc/device-tree-bindings/gpio/fsl,mpc83xx-spisel-boot.txt b/doc/device-tree-bindings/gpio/fsl,mpc83xx-spisel-boot.txt index 52d8bb0a5cb..bdec12d1035 100644 --- a/doc/device-tree-bindings/gpio/fsl,mpc83xx-spisel-boot.txt +++ b/doc/device-tree-bindings/gpio/fsl,mpc83xx-spisel-boot.txt @@ -7,14 +7,14 @@ The SPISEL_BOOT signal is always an output. Required properties: -- compatible: must be "fsl,mpc83xx-spisel-boot" or "fsl,mpc8309-spisel-boot". +- compatible: must be "fsl,mpc83xx-spisel-boot". - reg: must point to the SPI_CS register in the SoC register map. - ngpios: number of gpios provided by driver, normally 1. Example: spisel_boot: spisel_boot@14c { - compatible = "fsl,mpc8309-spisel-boot"; + compatible = "fsl,mpc83xx-spisel-boot"; reg = <0x14c 0x04>; #gpio-cells = <2>; device_type = "gpio"; diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c index 4b2f1705b64..924c0d452a3 100644 --- a/drivers/clk/mpc83xx_clk.c +++ b/drivers/clk/mpc83xx_clk.c @@ -47,7 +47,7 @@ static inline bool is_clk_valid(struct udevice *clk, int id) case MPC83XX_CLK_MEM_SEC: return type == SOC_MPC8360; case MPC83XX_CLK_ENC: - return (type == SOC_MPC8308) || (type == SOC_MPC8309); + return type == SOC_MPC8308; case MPC83XX_CLK_I2C1: return true; case MPC83XX_CLK_TDM: @@ -66,7 +66,7 @@ static inline bool is_clk_valid(struct udevice *clk, int id) case MPC83XX_CLK_SATA: return false; case MPC83XX_CLK_DMAC: - return (type == SOC_MPC8308) || (type == SOC_MPC8309); + return type == SOC_MPC8308; case MPC83XX_CLK_PCI: /* * FIXME: implement proper support for this. @@ -78,7 +78,7 @@ static inline bool is_clk_valid(struct udevice *clk, int id) return mpc83xx_has_second_i2c(type); case MPC83XX_CLK_QE: case MPC83XX_CLK_BRG: - return mpc83xx_has_quicc_engine(type) && (type != SOC_MPC8309); + return mpc83xx_has_quicc_engine(type); case MPC83XX_CLK_LCLK: case MPC83XX_CLK_LBIU: case MPC83XX_CLK_CORE: @@ -318,7 +318,6 @@ const struct clk_ops mpc83xx_clk_ops = { static const struct udevice_id mpc83xx_clk_match[] = { { .compatible = "fsl,mpc8308-clk", .data = SOC_MPC8308 }, - { .compatible = "fsl,mpc8309-clk", .data = SOC_MPC8309 }, { .compatible = "fsl,mpc832x-clk", .data = SOC_MPC832X }, { .compatible = "fsl,mpc8360-clk", .data = SOC_MPC8360 }, { /* sentinel */ } diff --git a/drivers/cpu/mpc83xx_cpu.c b/drivers/cpu/mpc83xx_cpu.c index 56b192ca153..5d5611bd0e4 100644 --- a/drivers/cpu/mpc83xx_cpu.c +++ b/drivers/cpu/mpc83xx_cpu.c @@ -99,9 +99,6 @@ static inline void determine_type(const struct udevice *dev) case 0x8100: priv->type = TYPE_8308; break; - case 0x8110: - priv->type = TYPE_8309; - break; case 0x8066: priv->type = TYPE_8321; break; @@ -284,7 +281,6 @@ static int mpc83xx_cpu_probe(struct udevice *dev) static const struct udevice_id mpc83xx_cpu_ids[] = { { .compatible = "fsl,mpc83xx", }, { .compatible = "fsl,mpc8308", }, - { .compatible = "fsl,mpc8309", }, { .compatible = "fsl,mpc832x", }, { .compatible = "fsl,mpc8360", }, { /* sentinel */ } diff --git a/drivers/cpu/mpc83xx_cpu.h b/drivers/cpu/mpc83xx_cpu.h index f86b36114ab..002e753734f 100644 --- a/drivers/cpu/mpc83xx_cpu.h +++ b/drivers/cpu/mpc83xx_cpu.h @@ -49,7 +49,6 @@ enum mpc83xx_cpu_family { /** * enum mpc83xx_cpu_type - Identifiers for MPC83xx CPU types * @TYPE_8308: Identifier for the MPC8308 CPU type - * @TYPE_8309: Identifier for the MPC8309 CPU type * @TYPE_8321: Identifier for the MPC8321 CPU type * @TYPE_8323: Identifier for the MPC8323 CPU type * @TYPE_8358_TBGA: Identifier for the MPC8358 CPU type (Tape Ball Grid Array @@ -61,7 +60,6 @@ enum mpc83xx_cpu_family { */ enum mpc83xx_cpu_type { TYPE_8308, - TYPE_8309, TYPE_8321, TYPE_8323, TYPE_8358_TBGA, @@ -73,7 +71,6 @@ enum mpc83xx_cpu_type { /* Array mapping the MCP83xx CPUs to their human-readable names */ static const char * const cpu_type_names[] = { [TYPE_8308] = "8308", - [TYPE_8309] = "8309", [TYPE_8321] = "8321", [TYPE_8323] = "8323", [TYPE_8358_TBGA] = "8358_TBGA", diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c index 2be8c73ae3d..220e04218e0 100644 --- a/drivers/gpio/mpc83xx_spisel_boot.c +++ b/drivers/gpio/mpc83xx_spisel_boot.c @@ -129,7 +129,6 @@ static const struct dm_gpio_ops mpc83xx_spisel_boot_ops = { }; static const struct udevice_id mpc83xx_spisel_boot_ids[] = { - { .compatible = "fsl,mpc8309-spisel-boot" }, { .compatible = "fsl,mpc83xx-spisel-boot" }, { /* sentinel */ } }; diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index 25880db37cf..107a3e78f99 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -120,7 +120,6 @@ static void qe_sdma_init(void) * we just need to know what the SNUMs are for the threads. */ static u8 thread_snum[] = { -/* Evthreads 16-29 are not supported in MPC8309 */ 0x04, 0x05, 0x0c, 0x0d, 0x14, 0x15, 0x1c, 0x1d, 0x24, 0x25, 0x2c, 0x2d, diff --git a/include/mpc83xx.h b/include/mpc83xx.h index d570ba61b7f..b46c038f16e 100644 --- a/include/mpc83xx.h +++ b/include/mpc83xx.h @@ -51,7 +51,6 @@ #define SPR_FAMILY(spridr) ((spridr & 0xFFF00000) >> 20) #define SPR_8308 0x8100 -#define SPR_8309 0x8110 #define SPR_832X_FAMILY 0x806 #define SPR_8321 0x8066 #define SPR_8323 0x8062 -- 2.47.3
