powerpc: drop MPC8540_ADS and MPC8560_ADS platform support
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Tue, 20 Jun 2023 04:32:59 +0000 (00:32 -0400)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 21 Jun 2023 04:08:53 +0000 (14:08 +1000)
Based on the revision history in the manual(s), these e500-v1
platforms were first available around 2002.

Like a lot of evaluation boards, they attempted to provide break-out
connectors for all possible features, and that combined with four
PCI-X slots (and the age/era) meant for a considerably large board.

As I recall it, from a Linux point of view, the biggest difference
between 8540 and 8560 was in the UART implementation, and that is
reflected in a diff of the defconfigs.

In any case, these are over 20 years old, and by today's standards
only have a small amount of DDR1 memory, and were not widely available.

Given that, it makes sense to remove support from them in 2023.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230620043300.197546-2-paul.gortmaker@windriver.com
arch/powerpc/boot/Makefile
arch/powerpc/boot/dts/fsl/mpc8540ads.dts [deleted file]
arch/powerpc/boot/dts/fsl/mpc8560ads.dts [deleted file]
arch/powerpc/configs/85xx/mpc8540_ads_defconfig [deleted file]
arch/powerpc/configs/85xx/mpc8560_ads_defconfig [deleted file]
arch/powerpc/configs/mpc85xx_base.config
arch/powerpc/platforms/85xx/Makefile
arch/powerpc/platforms/85xx/mpc85xx_ads.c [deleted file]

index bf89765..cf728cb 100644 (file)
@@ -342,8 +342,6 @@ image-$(CONFIG_MPC834x_ITX)         += cuImage.mpc8349emitx \
 image-$(CONFIG_ASP834x)                        += dtbImage.asp834x-redboot
 
 # Board ports in arch/powerpc/platform/85xx/Kconfig
-image-$(CONFIG_MPC8540_ADS)            += cuImage.mpc8540ads
-image-$(CONFIG_MPC8560_ADS)            += cuImage.mpc8560ads
 image-$(CONFIG_MPC85xx_CDS)            += cuImage.mpc8541cds \
                                           cuImage.mpc8548cds_32b \
                                           cuImage.mpc8555cds
diff --git a/arch/powerpc/boot/dts/fsl/mpc8540ads.dts b/arch/powerpc/boot/dts/fsl/mpc8540ads.dts
deleted file mode 100644 (file)
index e03ae13..0000000
+++ /dev/null
@@ -1,355 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * MPC8540 ADS Device Tree Source
- *
- * Copyright 2006, 2008 Freescale Semiconductor Inc.
- */
-
-/dts-v1/;
-
-/include/ "e500v1_power_isa.dtsi"
-
-/ {
-       model = "MPC8540ADS";
-       compatible = "MPC8540ADS", "MPC85xxADS";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       aliases {
-               ethernet0 = &enet0;
-               ethernet1 = &enet1;
-               ethernet2 = &enet2;
-               serial0 = &serial0;
-               serial1 = &serial1;
-               pci0 = &pci0;
-       };
-
-       cpus {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               PowerPC,8540@0 {
-                       device_type = "cpu";
-                       reg = <0x0>;
-                       d-cache-line-size = <32>;       // 32 bytes
-                       i-cache-line-size = <32>;       // 32 bytes
-                       d-cache-size = <0x8000>;                // L1, 32K
-                       i-cache-size = <0x8000>;                // L1, 32K
-                       timebase-frequency = <0>;       //  33 MHz, from uboot
-                       bus-frequency = <0>;    // 166 MHz
-                       clock-frequency = <0>;  // 825 MHz, from uboot
-                       next-level-cache = <&L2>;
-               };
-       };
-
-       memory {
-               device_type = "memory";
-               reg = <0x0 0x8000000>;  // 128M at 0x0
-       };
-
-       soc8540@e0000000 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               device_type = "soc";
-               compatible = "simple-bus";
-               ranges = <0x0 0xe0000000 0x100000>;
-               bus-frequency = <0>;
-
-               ecm-law@0 {
-                       compatible = "fsl,ecm-law";
-                       reg = <0x0 0x1000>;
-                       fsl,num-laws = <8>;
-               };
-
-               ecm@1000 {
-                       compatible = "fsl,mpc8540-ecm", "fsl,ecm";
-                       reg = <0x1000 0x1000>;
-                       interrupts = <17 2>;
-                       interrupt-parent = <&mpic>;
-               };
-
-               memory-controller@2000 {
-                       compatible = "fsl,mpc8540-memory-controller";
-                       reg = <0x2000 0x1000>;
-                       interrupt-parent = <&mpic>;
-                       interrupts = <18 2>;
-               };
-
-               L2: l2-cache-controller@20000 {
-                       compatible = "fsl,mpc8540-l2-cache-controller";
-                       reg = <0x20000 0x1000>;
-                       cache-line-size = <32>; // 32 bytes
-                       cache-size = <0x40000>; // L2, 256K
-                       interrupt-parent = <&mpic>;
-                       interrupts = <16 2>;
-               };
-
-               i2c@3000 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       cell-index = <0>;
-                       compatible = "fsl-i2c";
-                       reg = <0x3000 0x100>;
-                       interrupts = <43 2>;
-                       interrupt-parent = <&mpic>;
-                       dfsrr;
-               };
-
-               dma@21300 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       compatible = "fsl,mpc8540-dma", "fsl,eloplus-dma";
-                       reg = <0x21300 0x4>;
-                       ranges = <0x0 0x21100 0x200>;
-                       cell-index = <0>;
-                       dma-channel@0 {
-                               compatible = "fsl,mpc8540-dma-channel",
-                                               "fsl,eloplus-dma-channel";
-                               reg = <0x0 0x80>;
-                               cell-index = <0>;
-                               interrupt-parent = <&mpic>;
-                               interrupts = <20 2>;
-                       };
-                       dma-channel@80 {
-                               compatible = "fsl,mpc8540-dma-channel",
-                                               "fsl,eloplus-dma-channel";
-                               reg = <0x80 0x80>;
-                               cell-index = <1>;
-                               interrupt-parent = <&mpic>;
-                               interrupts = <21 2>;
-                       };
-                       dma-channel@100 {
-                               compatible = "fsl,mpc8540-dma-channel",
-                                               "fsl,eloplus-dma-channel";
-                               reg = <0x100 0x80>;
-                               cell-index = <2>;
-                               interrupt-parent = <&mpic>;
-                               interrupts = <22 2>;
-                       };
-                       dma-channel@180 {
-                               compatible = "fsl,mpc8540-dma-channel",
-                                               "fsl,eloplus-dma-channel";
-                               reg = <0x180 0x80>;
-                               cell-index = <3>;
-                               interrupt-parent = <&mpic>;
-                               interrupts = <23 2>;
-                       };
-               };
-
-               enet0: ethernet@24000 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       cell-index = <0>;
-                       device_type = "network";
-                       model = "TSEC";
-                       compatible = "gianfar";
-                       reg = <0x24000 0x1000>;
-                       ranges = <0x0 0x24000 0x1000>;
-                       local-mac-address = [ 00 00 00 00 00 00 ];
-                       interrupts = <29 2 30 2 34 2>;
-                       interrupt-parent = <&mpic>;
-                       tbi-handle = <&tbi0>;
-                       phy-handle = <&phy0>;
-
-                       mdio@520 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               compatible = "fsl,gianfar-mdio";
-                               reg = <0x520 0x20>;
-
-                               phy0: ethernet-phy@0 {
-                                       interrupt-parent = <&mpic>;
-                                       interrupts = <5 1>;
-                                       reg = <0x0>;
-                               };
-                               phy1: ethernet-phy@1 {
-                                       interrupt-parent = <&mpic>;
-                                       interrupts = <5 1>;
-                                       reg = <0x1>;
-                               };
-                               phy3: ethernet-phy@3 {
-                                       interrupt-parent = <&mpic>;
-                                       interrupts = <7 1>;
-                                       reg = <0x3>;
-                               };
-                               tbi0: tbi-phy@11 {
-                                       reg = <0x11>;
-                                       device_type = "tbi-phy";
-                               };
-                       };
-               };
-
-               enet1: ethernet@25000 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       cell-index = <1>;
-                       device_type = "network";
-                       model = "TSEC";
-                       compatible = "gianfar";
-                       reg = <0x25000 0x1000>;
-                       ranges = <0x0 0x25000 0x1000>;
-                       local-mac-address = [ 00 00 00 00 00 00 ];
-                       interrupts = <35 2 36 2 40 2>;
-                       interrupt-parent = <&mpic>;
-                       tbi-handle = <&tbi1>;
-                       phy-handle = <&phy1>;
-
-                       mdio@520 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               compatible = "fsl,gianfar-tbi";
-                               reg = <0x520 0x20>;
-
-                               tbi1: tbi-phy@11 {
-                                       reg = <0x11>;
-                                       device_type = "tbi-phy";
-                               };
-                       };
-               };
-
-               enet2: ethernet@26000 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       cell-index = <2>;
-                       device_type = "network";
-                       model = "FEC";
-                       compatible = "gianfar";
-                       reg = <0x26000 0x1000>;
-                       ranges = <0x0 0x26000 0x1000>;
-                       local-mac-address = [ 00 00 00 00 00 00 ];
-                       interrupts = <41 2>;
-                       interrupt-parent = <&mpic>;
-                       tbi-handle = <&tbi2>;
-                       phy-handle = <&phy3>;
-
-                       mdio@520 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               compatible = "fsl,gianfar-tbi";
-                               reg = <0x520 0x20>;
-
-                               tbi2: tbi-phy@11 {
-                                       reg = <0x11>;
-                                       device_type = "tbi-phy";
-                               };
-                       };
-               };
-
-               serial0: serial@4500 {
-                       cell-index = <0>;
-                       device_type = "serial";
-                       compatible = "fsl,ns16550", "ns16550";
-                       reg = <0x4500 0x100>;   // reg base, size
-                       clock-frequency = <0>;  // should we fill in in uboot?
-                       interrupts = <42 2>;
-                       interrupt-parent = <&mpic>;
-               };
-
-               serial1: serial@4600 {
-                       cell-index = <1>;
-                       device_type = "serial";
-                       compatible = "fsl,ns16550", "ns16550";
-                       reg = <0x4600 0x100>;   // reg base, size
-                       clock-frequency = <0>;  // should we fill in in uboot?
-                       interrupts = <42 2>;
-                       interrupt-parent = <&mpic>;
-               };
-               mpic: pic@40000 {
-                       interrupt-controller;
-                       #address-cells = <0>;
-                       #interrupt-cells = <2>;
-                       reg = <0x40000 0x40000>;
-                       compatible = "chrp,open-pic";
-                       device_type = "open-pic";
-               };
-       };
-
-       pci0: pci@e0008000 {
-               interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-               interrupt-map = <
-
-                       /* IDSEL 0x02 */
-                       0x1000 0x0 0x0 0x1 &mpic 0x1 0x1
-                       0x1000 0x0 0x0 0x2 &mpic 0x2 0x1
-                       0x1000 0x0 0x0 0x3 &mpic 0x3 0x1
-                       0x1000 0x0 0x0 0x4 &mpic 0x4 0x1
-
-                       /* IDSEL 0x03 */
-                       0x1800 0x0 0x0 0x1 &mpic 0x4 0x1
-                       0x1800 0x0 0x0 0x2 &mpic 0x1 0x1
-                       0x1800 0x0 0x0 0x3 &mpic 0x2 0x1
-                       0x1800 0x0 0x0 0x4 &mpic 0x3 0x1
-
-                       /* IDSEL 0x04 */
-                       0x2000 0x0 0x0 0x1 &mpic 0x3 0x1
-                       0x2000 0x0 0x0 0x2 &mpic 0x4 0x1
-                       0x2000 0x0 0x0 0x3 &mpic 0x1 0x1
-                       0x2000 0x0 0x0 0x4 &mpic 0x2 0x1
-
-                       /* IDSEL 0x05 */
-                       0x2800 0x0 0x0 0x1 &mpic 0x2 0x1
-                       0x2800 0x0 0x0 0x2 &mpic 0x3 0x1
-                       0x2800 0x0 0x0 0x3 &mpic 0x4 0x1
-                       0x2800 0x0 0x0 0x4 &mpic 0x1 0x1
-
-                       /* IDSEL 0x0c */
-                       0x6000 0x0 0x0 0x1 &mpic 0x1 0x1
-                       0x6000 0x0 0x0 0x2 &mpic 0x2 0x1
-                       0x6000 0x0 0x0 0x3 &mpic 0x3 0x1
-                       0x6000 0x0 0x0 0x4 &mpic 0x4 0x1
-
-                       /* IDSEL 0x0d */
-                       0x6800 0x0 0x0 0x1 &mpic 0x4 0x1
-                       0x6800 0x0 0x0 0x2 &mpic 0x1 0x1
-                       0x6800 0x0 0x0 0x3 &mpic 0x2 0x1
-                       0x6800 0x0 0x0 0x4 &mpic 0x3 0x1
-
-                       /* IDSEL 0x0e */
-                       0x7000 0x0 0x0 0x1 &mpic 0x3 0x1
-                       0x7000 0x0 0x0 0x2 &mpic 0x4 0x1
-                       0x7000 0x0 0x0 0x3 &mpic 0x1 0x1
-                       0x7000 0x0 0x0 0x4 &mpic 0x2 0x1
-
-                       /* IDSEL 0x0f */
-                       0x7800 0x0 0x0 0x1 &mpic 0x2 0x1
-                       0x7800 0x0 0x0 0x2 &mpic 0x3 0x1
-                       0x7800 0x0 0x0 0x3 &mpic 0x4 0x1
-                       0x7800 0x0 0x0 0x4 &mpic 0x1 0x1
-
-                       /* IDSEL 0x12 */
-                       0x9000 0x0 0x0 0x1 &mpic 0x1 0x1
-                       0x9000 0x0 0x0 0x2 &mpic 0x2 0x1
-                       0x9000 0x0 0x0 0x3 &mpic 0x3 0x1
-                       0x9000 0x0 0x0 0x4 &mpic 0x4 0x1
-
-                       /* IDSEL 0x13 */
-                       0x9800 0x0 0x0 0x1 &mpic 0x4 0x1
-                       0x9800 0x0 0x0 0x2 &mpic 0x1 0x1
-                       0x9800 0x0 0x0 0x3 &mpic 0x2 0x1
-                       0x9800 0x0 0x0 0x4 &mpic 0x3 0x1
-
-                       /* IDSEL 0x14 */
-                       0xa000 0x0 0x0 0x1 &mpic 0x3 0x1
-                       0xa000 0x0 0x0 0x2 &mpic 0x4 0x1
-                       0xa000 0x0 0x0 0x3 &mpic 0x1 0x1
-                       0xa000 0x0 0x0 0x4 &mpic 0x2 0x1
-
-                       /* IDSEL 0x15 */
-                       0xa800 0x0 0x0 0x1 &mpic 0x2 0x1
-                       0xa800 0x0 0x0 0x2 &mpic 0x3 0x1
-                       0xa800 0x0 0x0 0x3 &mpic 0x4 0x1
-                       0xa800 0x0 0x0 0x4 &mpic 0x1 0x1>;
-               interrupt-parent = <&mpic>;
-               interrupts = <24 2>;
-               bus-range = <0 0>;
-               ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-                         0x1000000 0x0 0x0 0xe2000000 0x0 0x100000>;
-               clock-frequency = <66666666>;
-               #interrupt-cells = <1>;
-               #size-cells = <2>;
-               #address-cells = <3>;
-               reg = <0xe0008000 0x1000>;
-               compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
-               device_type = "pci";
-       };
-};
diff --git a/arch/powerpc/boot/dts/fsl/mpc8560ads.dts b/arch/powerpc/boot/dts/fsl/mpc8560ads.dts
deleted file mode 100644 (file)
index c2f9aea..0000000
+++ /dev/null
@@ -1,388 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * MPC8560 ADS Device Tree Source
- *
- * Copyright 2006, 2008 Freescale Semiconductor Inc.
- */
-
-/dts-v1/;
-
-/include/ "e500v1_power_isa.dtsi"
-
-/ {
-       model = "MPC8560ADS";
-       compatible = "MPC8560ADS", "MPC85xxADS";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       aliases {
-               ethernet0 = &enet0;
-               ethernet1 = &enet1;
-               ethernet2 = &enet2;
-               ethernet3 = &enet3;
-               serial0 = &serial0;
-               serial1 = &serial1;
-               pci0 = &pci0;
-       };
-
-       cpus {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               PowerPC,8560@0 {
-                       device_type = "cpu";
-                       reg = <0x0>;
-                       d-cache-line-size = <32>;       // 32 bytes
-                       i-cache-line-size = <32>;       // 32 bytes
-                       d-cache-size = <0x8000>;                // L1, 32K
-                       i-cache-size = <0x8000>;                // L1, 32K
-                       timebase-frequency = <82500000>;
-                       bus-frequency = <330000000>;
-                       clock-frequency = <825000000>;
-               };
-       };
-
-       memory {
-               device_type = "memory";
-               reg = <0x0 0x10000000>;
-       };
-
-       soc8560@e0000000 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               device_type = "soc";
-               compatible = "simple-bus";
-               ranges = <0x0 0xe0000000 0x100000>;
-               bus-frequency = <330000000>;
-
-               ecm-law@0 {
-                       compatible = "fsl,ecm-law";
-                       reg = <0x0 0x1000>;
-                       fsl,num-laws = <8>;
-               };
-
-               ecm@1000 {
-                       compatible = "fsl,mpc8560-ecm", "fsl,ecm";
-                       reg = <0x1000 0x1000>;
-                       interrupts = <17 2>;
-                       interrupt-parent = <&mpic>;
-               };
-
-               memory-controller@2000 {
-                       compatible = "fsl,mpc8540-memory-controller";
-                       reg = <0x2000 0x1000>;
-                       interrupt-parent = <&mpic>;
-                       interrupts = <18 2>;
-               };
-
-               L2: l2-cache-controller@20000 {
-                       compatible = "fsl,mpc8540-l2-cache-controller";
-                       reg = <0x20000 0x1000>;
-                       cache-line-size = <32>; // 32 bytes
-                       cache-size = <0x40000>; // L2, 256K
-                       interrupt-parent = <&mpic>;
-                       interrupts = <16 2>;
-               };
-
-               dma@21300 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       compatible = "fsl,mpc8560-dma", "fsl,eloplus-dma";
-                       reg = <0x21300 0x4>;
-                       ranges = <0x0 0x21100 0x200>;
-                       cell-index = <0>;
-                       dma-channel@0 {
-                               compatible = "fsl,mpc8560-dma-channel",
-                                               "fsl,eloplus-dma-channel";
-                               reg = <0x0 0x80>;
-                               cell-index = <0>;
-                               interrupt-parent = <&mpic>;
-                               interrupts = <20 2>;
-                       };
-                       dma-channel@80 {
-                               compatible = "fsl,mpc8560-dma-channel",
-                                               "fsl,eloplus-dma-channel";
-                               reg = <0x80 0x80>;
-                               cell-index = <1>;
-                               interrupt-parent = <&mpic>;
-                               interrupts = <21 2>;
-                       };
-                       dma-channel@100 {
-                               compatible = "fsl,mpc8560-dma-channel",
-                                               "fsl,eloplus-dma-channel";
-                               reg = <0x100 0x80>;
-                               cell-index = <2>;
-                               interrupt-parent = <&mpic>;
-                               interrupts = <22 2>;
-                       };
-                       dma-channel@180 {
-                               compatible = "fsl,mpc8560-dma-channel",
-                                               "fsl,eloplus-dma-channel";
-                               reg = <0x180 0x80>;
-                               cell-index = <3>;
-                               interrupt-parent = <&mpic>;
-                               interrupts = <23 2>;
-                       };
-               };
-
-               enet0: ethernet@24000 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       cell-index = <0>;
-                       device_type = "network";
-                       model = "TSEC";
-                       compatible = "gianfar";
-                       reg = <0x24000 0x1000>;
-                       ranges = <0x0 0x24000 0x1000>;
-                       local-mac-address = [ 00 00 00 00 00 00 ];
-                       interrupts = <29 2 30 2 34 2>;
-                       interrupt-parent = <&mpic>;
-                       tbi-handle = <&tbi0>;
-                       phy-handle = <&phy0>;
-
-                       mdio@520 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               compatible = "fsl,gianfar-mdio";
-                               reg = <0x520 0x20>;
-
-                               phy0: ethernet-phy@0 {
-                                       interrupt-parent = <&mpic>;
-                                       interrupts = <5 1>;
-                                       reg = <0x0>;
-                               };
-                               phy1: ethernet-phy@1 {
-                                       interrupt-parent = <&mpic>;
-                                       interrupts = <5 1>;
-                                       reg = <0x1>;
-                               };
-                               phy2: ethernet-phy@2 {
-                                       interrupt-parent = <&mpic>;
-                                       interrupts = <7 1>;
-                                       reg = <0x2>;
-                               };
-                               phy3: ethernet-phy@3 {
-                                       interrupt-parent = <&mpic>;
-                                       interrupts = <7 1>;
-                                       reg = <0x3>;
-                               };
-                               tbi0: tbi-phy@11 {
-                                       reg = <0x11>;
-                                       device_type = "tbi-phy";
-                               };
-                       };
-               };
-
-               enet1: ethernet@25000 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       cell-index = <1>;
-                       device_type = "network";
-                       model = "TSEC";
-                       compatible = "gianfar";
-                       reg = <0x25000 0x1000>;
-                       ranges = <0x0 0x25000 0x1000>;
-                       local-mac-address = [ 00 00 00 00 00 00 ];
-                       interrupts = <35 2 36 2 40 2>;
-                       interrupt-parent = <&mpic>;
-                       tbi-handle = <&tbi1>;
-                       phy-handle = <&phy1>;
-
-                       mdio@520 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               compatible = "fsl,gianfar-tbi";
-                               reg = <0x520 0x20>;
-
-                               tbi1: tbi-phy@11 {
-                                       reg = <0x11>;
-                                       device_type = "tbi-phy";
-                               };
-                       };
-               };
-
-               mpic: pic@40000 {
-                       interrupt-controller;
-                       #address-cells = <0>;
-                       #interrupt-cells = <2>;
-                       reg = <0x40000 0x40000>;
-                       compatible = "chrp,open-pic";
-                       device_type = "open-pic";
-               };
-
-               cpm@919c0 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       compatible = "fsl,mpc8560-cpm", "fsl,cpm2";
-                       reg = <0x919c0 0x30>;
-                       ranges;
-
-                       muram@80000 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               ranges = <0x0 0x80000 0x10000>;
-
-                               data@0 {
-                                       compatible = "fsl,cpm-muram-data";
-                                       reg = <0x0 0x4000 0x9000 0x2000>;
-                               };
-                       };
-
-                       brg@919f0 {
-                               compatible = "fsl,mpc8560-brg",
-                                            "fsl,cpm2-brg",
-                                            "fsl,cpm-brg";
-                               reg = <0x919f0 0x10 0x915f0 0x10>;
-                               clock-frequency = <165000000>;
-                       };
-
-                       cpmpic: pic@90c00 {
-                               interrupt-controller;
-                               #address-cells = <0>;
-                               #interrupt-cells = <2>;
-                               interrupts = <46 2>;
-                               interrupt-parent = <&mpic>;
-                               reg = <0x90c00 0x80>;
-                               compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
-                       };
-
-                       serial0: serial@91a00 {
-                               device_type = "serial";
-                               compatible = "fsl,mpc8560-scc-uart",
-                                            "fsl,cpm2-scc-uart";
-                               reg = <0x91a00 0x20 0x88000 0x100>;
-                               fsl,cpm-brg = <1>;
-                               fsl,cpm-command = <0x800000>;
-                               current-speed = <115200>;
-                               interrupts = <40 8>;
-                               interrupt-parent = <&cpmpic>;
-                       };
-
-                       serial1: serial@91a20 {
-                               device_type = "serial";
-                               compatible = "fsl,mpc8560-scc-uart",
-                                            "fsl,cpm2-scc-uart";
-                               reg = <0x91a20 0x20 0x88100 0x100>;
-                               fsl,cpm-brg = <2>;
-                               fsl,cpm-command = <0x4a00000>;
-                               current-speed = <115200>;
-                               interrupts = <41 8>;
-                               interrupt-parent = <&cpmpic>;
-                       };
-
-                       enet2: ethernet@91320 {
-                               device_type = "network";
-                               compatible = "fsl,mpc8560-fcc-enet",
-                                            "fsl,cpm2-fcc-enet";
-                               reg = <0x91320 0x20 0x88500 0x100 0x913b0 0x1>;
-                               local-mac-address = [ 00 00 00 00 00 00 ];
-                               fsl,cpm-command = <0x16200300>;
-                               interrupts = <33 8>;
-                               interrupt-parent = <&cpmpic>;
-                               phy-handle = <&phy2>;
-                       };
-
-                       enet3: ethernet@91340 {
-                               device_type = "network";
-                               compatible = "fsl,mpc8560-fcc-enet",
-                                            "fsl,cpm2-fcc-enet";
-                               reg = <0x91340 0x20 0x88600 0x100 0x913d0 0x1>;
-                               local-mac-address = [ 00 00 00 00 00 00 ];
-                               fsl,cpm-command = <0x1a400300>;
-                               interrupts = <34 8>;
-                               interrupt-parent = <&cpmpic>;
-                               phy-handle = <&phy3>;
-                       };
-               };
-       };
-
-       pci0: pci@e0008000 {
-               #interrupt-cells = <1>;
-               #size-cells = <2>;
-               #address-cells = <3>;
-               compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
-               device_type = "pci";
-               reg = <0xe0008000 0x1000>;
-               clock-frequency = <66666666>;
-               interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-               interrupt-map = <
-
-                               /* IDSEL 0x2 */
-                                0x1000 0x0 0x0 0x1 &mpic 0x1 0x1
-                                0x1000 0x0 0x0 0x2 &mpic 0x2 0x1
-                                0x1000 0x0 0x0 0x3 &mpic 0x3 0x1
-                                0x1000 0x0 0x0 0x4 &mpic 0x4 0x1
-
-                               /* IDSEL 0x3 */
-                                0x1800 0x0 0x0 0x1 &mpic 0x4 0x1
-                                0x1800 0x0 0x0 0x2 &mpic 0x1 0x1
-                                0x1800 0x0 0x0 0x3 &mpic 0x2 0x1
-                                0x1800 0x0 0x0 0x4 &mpic 0x3 0x1
-
-                               /* IDSEL 0x4 */
-                                0x2000 0x0 0x0 0x1 &mpic 0x3 0x1
-                                0x2000 0x0 0x0 0x2 &mpic 0x4 0x1
-                                0x2000 0x0 0x0 0x3 &mpic 0x1 0x1
-                                0x2000 0x0 0x0 0x4 &mpic 0x2 0x1
-
-                               /* IDSEL 0x5  */
-                                0x2800 0x0 0x0 0x1 &mpic 0x2 0x1
-                                0x2800 0x0 0x0 0x2 &mpic 0x3 0x1
-                                0x2800 0x0 0x0 0x3 &mpic 0x4 0x1
-                                0x2800 0x0 0x0 0x4 &mpic 0x1 0x1
-
-                               /* IDSEL 12 */
-                                0x6000 0x0 0x0 0x1 &mpic 0x1 0x1
-                                0x6000 0x0 0x0 0x2 &mpic 0x2 0x1
-                                0x6000 0x0 0x0 0x3 &mpic 0x3 0x1
-                                0x6000 0x0 0x0 0x4 &mpic 0x4 0x1
-
-                               /* IDSEL 13 */
-                                0x6800 0x0 0x0 0x1 &mpic 0x4 0x1
-                                0x6800 0x0 0x0 0x2 &mpic 0x1 0x1
-                                0x6800 0x0 0x0 0x3 &mpic 0x2 0x1
-                                0x6800 0x0 0x0 0x4 &mpic 0x3 0x1
-
-                               /* IDSEL 14*/
-                                0x7000 0x0 0x0 0x1 &mpic 0x3 0x1
-                                0x7000 0x0 0x0 0x2 &mpic 0x4 0x1
-                                0x7000 0x0 0x0 0x3 &mpic 0x1 0x1
-                                0x7000 0x0 0x0 0x4 &mpic 0x2 0x1
-
-                               /* IDSEL 15 */
-                                0x7800 0x0 0x0 0x1 &mpic 0x2 0x1
-                                0x7800 0x0 0x0 0x2 &mpic 0x3 0x1
-                                0x7800 0x0 0x0 0x3 &mpic 0x4 0x1
-                                0x7800 0x0 0x0 0x4 &mpic 0x1 0x1
-
-                               /* IDSEL 18 */
-                                0x9000 0x0 0x0 0x1 &mpic 0x1 0x1
-                                0x9000 0x0 0x0 0x2 &mpic 0x2 0x1
-                                0x9000 0x0 0x0 0x3 &mpic 0x3 0x1
-                                0x9000 0x0 0x0 0x4 &mpic 0x4 0x1
-
-                               /* IDSEL 19 */
-                                0x9800 0x0 0x0 0x1 &mpic 0x4 0x1
-                                0x9800 0x0 0x0 0x2 &mpic 0x1 0x1
-                                0x9800 0x0 0x0 0x3 &mpic 0x2 0x1
-                                0x9800 0x0 0x0 0x4 &mpic 0x3 0x1
-
-                               /* IDSEL 20 */
-                                0xa000 0x0 0x0 0x1 &mpic 0x3 0x1
-                                0xa000 0x0 0x0 0x2 &mpic 0x4 0x1
-                                0xa000 0x0 0x0 0x3 &mpic 0x1 0x1
-                                0xa000 0x0 0x0 0x4 &mpic 0x2 0x1
-
-                               /* IDSEL 21 */
-                                0xa800 0x0 0x0 0x1 &mpic 0x2 0x1
-                                0xa800 0x0 0x0 0x2 &mpic 0x3 0x1
-                                0xa800 0x0 0x0 0x3 &mpic 0x4 0x1
-                                0xa800 0x0 0x0 0x4 &mpic 0x1 0x1>;
-
-               interrupt-parent = <&mpic>;
-               interrupts = <24 2>;
-               bus-range = <0 0>;
-               ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-                         0x1000000 0x0 0x0 0xe2000000 0x0 0x1000000>;
-       };
-};
diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
deleted file mode 100644 (file)
index 618e03e..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-CONFIG_PPC_85xx=y
-CONFIG_SYSVIPC=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_EXPERT=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_MSDOS_PARTITION is not set
-CONFIG_MPC8540_ADS=y
-CONFIG_GEN_RTC=y
-CONFIG_BINFMT_MISC=y
-CONFIG_MATH_EMULATION=y
-# CONFIG_SECCOMP is not set
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_USER=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=32768
-CONFIG_NETDEVICES=y
-CONFIG_GIANFAR=y
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-# CONFIG_VT is not set
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_EXT2_FS=y
-CONFIG_EXT4_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEBUG_MUTEXES=y
diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
deleted file mode 100644 (file)
index 9bc6283..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-CONFIG_PPC_85xx=y
-CONFIG_SYSVIPC=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_EXPERT=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_MSDOS_PARTITION is not set
-CONFIG_MPC8560_ADS=y
-CONFIG_GEN_RTC=y
-CONFIG_BINFMT_MISC=y
-CONFIG_MATH_EMULATION=y
-# CONFIG_SECCOMP is not set
-CONFIG_PCI=y
-CONFIG_PCI_DEBUG=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
-# CONFIG_FW_LOADER is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=32768
-CONFIG_NETDEVICES=y
-CONFIG_FS_ENET=y
-# CONFIG_FS_ENET_HAS_SCC is not set
-CONFIG_GIANFAR=y
-CONFIG_E1000=y
-CONFIG_DAVICOM_PHY=y
-CONFIG_MARVELL_PHY=y
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-# CONFIG_VT is not set
-CONFIG_SERIAL_CPM=y
-CONFIG_SERIAL_CPM_CONSOLE=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT4_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEBUG_MUTEXES=y
index 85907b7..e13bcf8 100644 (file)
@@ -1,7 +1,5 @@
 CONFIG_MATH_EMULATION=y
 CONFIG_MPC8536_DS=y
-CONFIG_MPC8540_ADS=y
-CONFIG_MPC8560_ADS=y
 CONFIG_MPC85xx_CDS=y
 CONFIG_MPC85xx_DS=y
 CONFIG_MPC85xx_MDS=y
index e3d9776..4bb473c 100644 (file)
@@ -12,8 +12,6 @@ obj-y += common.o
 obj-$(CONFIG_BSC9131_RDB) += bsc913x_rdb.o
 obj-$(CONFIG_BSC9132_QDS) += bsc913x_qds.o
 obj-$(CONFIG_C293_PCIE)   += c293pcie.o
-obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o
-obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o
 obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o
 obj-$(CONFIG_MPC8536_DS)  += mpc8536_ds.o
 obj8259-$(CONFIG_PPC_I8259)   += mpc85xx_8259.o
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
deleted file mode 100644 (file)
index 7c67438..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * MPC85xx setup and early boot code plus other random bits.
- *
- * Maintained by Kumar Gala (see MAINTAINERS for contact information)
- *
- * Copyright 2005 Freescale Semiconductor Inc.
- */
-
-#include <linux/stddef.h>
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/kdev_t.h>
-#include <linux/delay.h>
-#include <linux/seq_file.h>
-#include <linux/of_platform.h>
-
-#include <asm/time.h>
-#include <asm/machdep.h>
-#include <asm/pci-bridge.h>
-#include <asm/mpic.h>
-#include <mm/mmu_decl.h>
-#include <asm/udbg.h>
-
-#include <sysdev/fsl_soc.h>
-#include <sysdev/fsl_pci.h>
-
-#ifdef CONFIG_CPM2
-#include <asm/cpm2.h>
-#include <sysdev/cpm2_pic.h>
-#endif
-
-#include "mpc85xx.h"
-
-static void __init mpc85xx_ads_pic_init(void)
-{
-       struct mpic *mpic = mpic_alloc(NULL, 0, MPIC_BIG_ENDIAN,
-                       0, 256, " OpenPIC  ");
-       BUG_ON(mpic == NULL);
-       mpic_init(mpic);
-
-       mpc85xx_cpm2_pic_init();
-}
-
-/*
- * Setup the architecture
- */
-#ifdef CONFIG_CPM2
-struct cpm_pin {
-       int port, pin, flags;
-};
-
-static const struct cpm_pin mpc8560_ads_pins[] = {
-       /* SCC1 */
-       {3, 29, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-       {3, 30, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
-       {3, 31, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-
-       /* SCC2 */
-       {2, 12, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {2, 13, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {3, 26, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-       {3, 27, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-       {3, 28, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-
-       /* FCC2 */
-       {1, 18, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {1, 19, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {1, 20, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {1, 21, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {1, 22, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-       {1, 23, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-       {1, 24, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-       {1, 25, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-       {1, 26, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {1, 27, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {1, 28, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {1, 29, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
-       {1, 30, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {1, 31, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-       {2, 18, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK14 */
-       {2, 19, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK13 */
-
-       /* FCC3 */
-       {1, 4, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-       {1, 5, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-       {1, 6, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-       {1, 8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {1, 9, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {1, 10, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {1, 11, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {1, 12, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {1, 13, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {1, 14, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-       {1, 15, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-       {1, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {1, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {2, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK16 */
-       {2, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK15 */
-       {2, 27, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-};
-
-static void __init init_ioports(void)
-{
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(mpc8560_ads_pins); i++) {
-               const struct cpm_pin *pin = &mpc8560_ads_pins[i];
-               cpm2_set_pin(pin->port, pin->pin, pin->flags);
-       }
-
-       cpm2_clk_setup(CPM_CLK_SCC1, CPM_BRG1, CPM_CLK_RX);
-       cpm2_clk_setup(CPM_CLK_SCC1, CPM_BRG1, CPM_CLK_TX);
-       cpm2_clk_setup(CPM_CLK_SCC2, CPM_BRG2, CPM_CLK_RX);
-       cpm2_clk_setup(CPM_CLK_SCC2, CPM_BRG2, CPM_CLK_TX);
-       cpm2_clk_setup(CPM_CLK_FCC2, CPM_CLK13, CPM_CLK_RX);
-       cpm2_clk_setup(CPM_CLK_FCC2, CPM_CLK14, CPM_CLK_TX);
-       cpm2_clk_setup(CPM_CLK_FCC3, CPM_CLK15, CPM_CLK_RX);
-       cpm2_clk_setup(CPM_CLK_FCC3, CPM_CLK16, CPM_CLK_TX);
-}
-#endif
-
-static void __init mpc85xx_ads_setup_arch(void)
-{
-       if (ppc_md.progress)
-               ppc_md.progress("mpc85xx_ads_setup_arch()", 0);
-
-#ifdef CONFIG_CPM2
-       cpm2_reset();
-       init_ioports();
-#endif
-
-       fsl_pci_assign_primary();
-}
-
-static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
-{
-       uint pvid, svid, phid1;
-
-       pvid = mfspr(SPRN_PVR);
-       svid = mfspr(SPRN_SVR);
-
-       seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
-       seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
-       seq_printf(m, "SVR\t\t: 0x%x\n", svid);
-
-       /* Display cpu Pll setting */
-       phid1 = mfspr(SPRN_HID1);
-       seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
-}
-
-machine_arch_initcall(mpc85xx_ads, mpc85xx_common_publish_devices);
-
-define_machine(mpc85xx_ads) {
-       .name                   = "MPC85xx ADS",
-       .compatible             = "MPC85xxADS",
-       .setup_arch             = mpc85xx_ads_setup_arch,
-       .init_IRQ               = mpc85xx_ads_pic_init,
-       .show_cpuinfo           = mpc85xx_ads_show_cpuinfo,
-       .get_irq                = mpic_get_irq,
-       .progress               = udbg_progress,
-};