powerpc/4xx: Complete removal of MSI support

Finish the work by removing all references to the PPC4xx_MSI config
and the associated device nodes in the DTs.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/e92f2bb3-b5e1-c870-8151-3917a789a640@kaod.org

diff --git a/arch/powerpc/boot/dts/bluestone.dts b/arch/powerpc/boot/dts/bluestone.dts
index aa1ae94cd776a7ed1ce4abde7258c20b00a6887b..6971595319c1ecf68f885709b7b5c35baf3407e7 100644 (file)
--- a/arch/powerpc/boot/dts/bluestone.dts
+++ b/arch/powerpc/boot/dts/bluestone.dts
@@ -366,30 +366,5 @@
                                0x0 0x0 0x0 0x3 &UIC3 0xe 0x4 /* swizzled int C */
                                0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>;
                };
-
-               MSI: ppc4xx-msi@C10000000 {
-                       compatible = "amcc,ppc4xx-msi", "ppc4xx-msi";
-                       reg = < 0xC 0x10000000 0x100
-                               0xC 0x10000000 0x100>;
-                       sdr-base = <0x36C>;
-                       msi-data = <0x00004440>;
-                       msi-mask = <0x0000ffe0>;
-                       interrupts =<0 1 2 3 4 5 6 7>;
-                       interrupt-parent = <&MSI>;
-                       #interrupt-cells = <1>;
-                       #address-cells = <0>;
-                       #size-cells = <0>;
-                       msi-available-ranges = <0x0 0x100>;
-                       interrupt-map = <
-                               0 &UIC3 0x18 1
-                               1 &UIC3 0x19 1
-                               2 &UIC3 0x1A 1
-                               3 &UIC3 0x1B 1
-                               4 &UIC3 0x1C 1
-                               5 &UIC3 0x1D 1
-                               6 &UIC3 0x1E 1
-                               7 &UIC3 0x1F 1
-                       >;
-               };
        };
 };

diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts
index c5fbb08e0a6e144f35b48e5a6cb84112cb8b9848..5db1bff6b23df43ad7d5055ba356aeb5fc03441d 100644 (file)
--- a/arch/powerpc/boot/dts/canyonlands.dts
+++ b/arch/powerpc/boot/dts/canyonlands.dts
@@ -544,23 +544,5 @@
                                0x0 0x0 0x0 0x3 &UIC3 0x12 0x4 /* swizzled int C */
                                0x0 0x0 0x0 0x4 &UIC3 0x13 0x4 /* swizzled int D */>;
                };
-
-               MSI: ppc4xx-msi@C10000000 {
-                       compatible = "amcc,ppc4xx-msi", "ppc4xx-msi";
-                       reg = < 0xC 0x10000000 0x100>;
-                       sdr-base = <0x36C>;
-                       msi-data = <0x00000000>;
-                       msi-mask = <0x44440000>;
-                       interrupt-count = <3>;
-                       interrupts = <0 1 2 3>;
-                       interrupt-parent = <&UIC3>;
-                       #interrupt-cells = <1>;
-                       #address-cells = <0>;
-                       #size-cells = <0>;
-                       interrupt-map = <0 &UIC3 0x18 1
-                                       1 &UIC3 0x19 1
-                                       2 &UIC3 0x1A 1
-                                       3 &UIC3 0x1B 1>;
-               };
        };
 };

diff --git a/arch/powerpc/boot/dts/katmai.dts b/arch/powerpc/boot/dts/katmai.dts
index a8f353229fb7e372ef9f7106eea737f2808ad67a..4262b2bbd6deb49c04afcd0ddf4c57bc020c4621 100644 (file)
--- a/arch/powerpc/boot/dts/katmai.dts
+++ b/arch/powerpc/boot/dts/katmai.dts
@@ -442,24 +442,6 @@
                                0x0 0x0 0x0 0x4 &UIC3 0xb 0x4 /* swizzled int D */>;
                };
 
-               MSI: ppc4xx-msi@400300000 {
-                               compatible = "amcc,ppc4xx-msi", "ppc4xx-msi";
-                               reg = < 0x4 0x00300000 0x100>;
-                               sdr-base = <0x3B0>;
-                               msi-data = <0x00000000>;
-                               msi-mask = <0x44440000>;
-                               interrupt-count = <3>;
-                               interrupts =<0 1 2 3>;
-                               interrupt-parent = <&UIC0>;
-                               #interrupt-cells = <1>;
-                               #address-cells = <0>;
-                               #size-cells = <0>;
-                               interrupt-map = <0 &UIC0 0xC 1
-                                       1 &UIC0 0x0D 1
-                                       2 &UIC0 0x0E 1
-                                       3 &UIC0 0x0F 1>;
-               };
-
                I2O: i2o@400100000 {
                        compatible = "ibm,i2o-440spe";
                        reg = <0x00000004 0x00100000 0x100>;

diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts
index a709fb47a180d60d619d18b60b118d9f373ee679..c07a7525a72ce7724d4de525ab7fc24153dd5df8 100644 (file)
--- a/arch/powerpc/boot/dts/kilauea.dts
+++ b/arch/powerpc/boot/dts/kilauea.dts
@@ -403,33 +403,5 @@
                                0x0 0x0 0x0 0x3 &UIC2 0xd 0x4 /* swizzled int C */
                                0x0 0x0 0x0 0x4 &UIC2 0xe 0x4 /* swizzled int D */>;
                };
-
-               MSI: ppc4xx-msi@C10000000 {
-                       compatible = "amcc,ppc4xx-msi", "ppc4xx-msi";
-                       reg = <0xEF620000 0x100>;
-                       sdr-base = <0x4B0>;
-                       msi-data = <0x00000000>;
-                       msi-mask = <0x44440000>;
-                       interrupt-count = <12>;
-                       interrupts = <0 1 2 3 4 5 6 7 8 9 0xA 0xB 0xC 0xD>;
-                       interrupt-parent = <&UIC2>;
-                       #interrupt-cells = <1>;
-                       #address-cells = <0>;
-                       #size-cells = <0>;
-                       interrupt-map = <0 &UIC2 0x10 1
-                                       1 &UIC2 0x11 1
-                                       2 &UIC2 0x12 1
-                                       2 &UIC2 0x13 1
-                                       2 &UIC2 0x14 1
-                                       2 &UIC2 0x15 1
-                                       2 &UIC2 0x16 1
-                                       2 &UIC2 0x17 1
-                                       2 &UIC2 0x18 1
-                                       2 &UIC2 0x19 1
-                                       2 &UIC2 0x1A 1
-                                       2 &UIC2 0x1B 1
-                                       2 &UIC2 0x1C 1
-                                       3 &UIC2 0x1D 1>;
-               };
        };
 };

diff --git a/arch/powerpc/boot/dts/redwood.dts b/arch/powerpc/boot/dts/redwood.dts
index f38035a1f4a15b350e605975a35b72f392ec8568..3c849e23e5f32bf4fb77ea207cb9b5e7e30dc4d1 100644 (file)
--- a/arch/powerpc/boot/dts/redwood.dts
+++ b/arch/powerpc/boot/dts/redwood.dts
@@ -358,25 +358,6 @@
                                0x0 0x0 0x0 0x4 &UIC3 0xb 0x4 /* swizzled int D */>;
                };
 
-               MSI: ppc4xx-msi@400300000 {
-                               compatible = "amcc,ppc4xx-msi", "ppc4xx-msi";
-                               reg = < 0x4 0x00300000 0x100
-                                       0x4 0x00300000 0x100>;
-                               sdr-base = <0x3B0>;
-                               msi-data = <0x00000000>;
-                               msi-mask = <0x44440000>;
-                               interrupt-count = <3>;
-                               interrupts =<0 1 2 3>;
-                               interrupt-parent = <&UIC0>;
-                               #interrupt-cells = <1>;
-                               #address-cells = <0>;
-                               #size-cells = <0>;
-                               interrupt-map = <0 &UIC0 0xC 1
-                                       1 &UIC0 0x0D 1
-                                       2 &UIC0 0x0E 1
-                                       3 &UIC0 0x0F 1>;
-               };
-
        };
 
 

diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index e3e5217c9822278f17c1171ee1ece14a8182e1b6..614ea6dc994c03bbc65c4df91dc48cdc9fb50cba 100644 (file)
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -23,7 +23,6 @@ config KILAUEA
        select PPC4xx_PCI_EXPRESS
        select FORCE_PCI
        select PCI_MSI
-       select PPC4xx_MSI
        help
          This option enables support for the AMCC PPC405EX evaluation board.
 

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 83975ef50975e738309708f61729880a3befad51..25b80cd558f8d16c3f6bccd8a30ccdd0181e4c97 100644 (file)
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -23,7 +23,6 @@ config BLUESTONE
        select APM821xx
        select FORCE_PCI
        select PCI_MSI
-       select PPC4xx_MSI
        select PPC4xx_PCI_EXPRESS
        select IBM_EMAC_RGMII if IBM_EMAC
        help
@@ -73,7 +72,6 @@ config KATMAI
        select FORCE_PCI
        select PPC4xx_PCI_EXPRESS
        select PCI_MSI
-       select PPC4xx_MSI
        help
          This option enables support for the AMCC PPC440SPe evaluation board.
 
@@ -115,7 +113,6 @@ config CANYONLANDS
        select FORCE_PCI
        select PPC4xx_PCI_EXPRESS
        select PCI_MSI
-       select PPC4xx_MSI
        select IBM_EMAC_RGMII if IBM_EMAC
        select IBM_EMAC_ZMII if IBM_EMAC
        help
@@ -141,7 +138,6 @@ config REDWOOD
        select FORCE_PCI
        select PPC4xx_PCI_EXPRESS
        select PCI_MSI
-       select PPC4xx_MSI
        help
          This option enables support for the AMCC PPC460SX Redwood board.