arm: dts: fsl-ls1088a: syncronise fsl-mc definition with Linux

This moves the fsl-mc device tree definition under the /soc
node, as well as adding interrupt and IOMMU definitions that
were not in U-Boot before.

There are slight differences between the two bindings
as we add a "simple-mfd" compatible to function
under U-Boot's driver model.

Signed-off-by: Mathew McBride <matt@traverse.com.au>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Tested-by: Ioana Ciornei <ioana.ciornei@nxp.com> # on LS1088A-RDB

diff --git a/arch/arm/dts/fsl-ls1088a-u-boot.dtsi b/arch/arm/dts/fsl-ls1088a-u-boot.dtsi
index d9d1347b0cae385d6b1eaf2ca9a7975c9a61f03c..efcfdd96aefd5007bbbebf4acf795aa721571440 100644 (file)
--- a/arch/arm/dts/fsl-ls1088a-u-boot.dtsi
+++ b/arch/arm/dts/fsl-ls1088a-u-boot.dtsi
@@ -29,6 +29,18 @@
        compatible = "fsl,ls-mdio", "fsl,fman-memac-mdio";
 };
 
+/* DPAA2 Management Complex (MC)
+ * "simple-mfd" compatible used by U-Boot only,
+ * to allow driver model functionality.
+ */
+&fsl_mc {
+       compatible = "fsl,qoriq-mc", "simple-mfd";
+
+       dpmacs {
+               compatible = "simple-mfd";
+       };
+};
+
 &pcie1 {
        status = "okay";
 };

diff --git a/arch/arm/dts/fsl-ls1088a.dtsi b/arch/arm/dts/fsl-ls1088a.dtsi
index ee40a556546e61a063de238370f288ff28ec406a..8321b73f306fa21a294c9df719a6d793c36191af 100644 (file)
--- a/arch/arm/dts/fsl-ls1088a.dtsi
+++ b/arch/arm/dts/fsl-ls1088a.dtsi
@@ -577,6 +577,79 @@
                                reg = <3>;
                        };
                };
+
+               fsl_mc: fsl-mc@80c000000 {
+                       compatible = "fsl,qoriq-mc";
+                       reg = <0x00000008 0x0c000000 0 0x40>,    /* MC portal base */
+                             <0x00000000 0x08340000 0 0x40000>; /* MC control reg */
+                       msi-parent = <&its>;
+                       iommu-map = <0 &smmu 0 0>;      /* This is fixed-up by u-boot */
+                       dma-coherent;
+                       #address-cells = <3>;
+                       #size-cells = <1>;
+
+                       /*
+                        * Region type 0x0 - MC portals
+                        * Region type 0x1 - QBMAN portals
+                        */
+                       ranges = <0x0 0x0 0x0 0x8 0x0c000000 0x4000000
+                                 0x1 0x0 0x0 0x8 0x18000000 0x8000000>;
+
+                       dpmacs {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               dpmac1: ethernet@1 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <1>;
+                               };
+
+                               dpmac2: ethernet@2 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <2>;
+                               };
+
+                               dpmac3: ethernet@3 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <3>;
+                               };
+
+                               dpmac4: ethernet@4 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <4>;
+                               };
+
+                               dpmac5: ethernet@5 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <5>;
+                               };
+
+                               dpmac6: ethernet@6 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <6>;
+                               };
+
+                               dpmac7: ethernet@7 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <7>;
+                               };
+
+                               dpmac8: ethernet@8 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <8>;
+                               };
+
+                               dpmac9: ethernet@9 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <9>;
+                               };
+
+                               dpmac10: ethernet@a {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <0xa>;
+                               };
+                       };
+               };
        };
 
        dspi: dspi@2100000 {
@@ -664,85 +737,4 @@
                compatible = "arm,psci-0.2";
                method = "smc";
        };
-
-       fsl_mc: fsl-mc@80c000000 {
-               compatible = "fsl,qoriq-mc", "simple-mfd";
-               reg = <0x00000008 0x0c000000 0 0x40>,    /* MC portal base */
-                     <0x00000000 0x08340000 0 0x40000>; /* MC control reg */
-               #address-cells = <3>;
-               #size-cells = <1>;
-
-               /*
-                * Region type 0x0 - MC portals
-                * Region type 0x1 - QBMAN portals
-                */
-               ranges = <0x0 0x0 0x0 0x8 0x0c000000 0x4000000
-                         0x1 0x0 0x0 0x8 0x18000000 0x8000000>;
-
-               dpmacs {
-                       compatible = "simple-mfd";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       dpmac1: dpmac@1 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <0x1>;
-                               status = "disabled";
-                       };
-
-                       dpmac2: dpmac@2 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <0x2>;
-                               status = "disabled";
-                       };
-
-                       dpmac3: dpmac@3 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <0x3>;
-                               status = "disabled";
-                       };
-
-                       dpmac4: dpmac@4 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <0x4>;
-                               status = "disabled";
-                       };
-
-                       dpmac5: dpmac@5 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <0x5>;
-                               status = "disabled";
-                       };
-
-                       dpmac6: dpmac@6 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <0x6>;
-                               status = "disabled";
-                       };
-
-                       dpmac7: dpmac@7 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <0x7>;
-                               status = "disabled";
-                       };
-
-                       dpmac8: dpmac@8 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <0x8>;
-                               status = "disabled";
-                       };
-
-                       dpmac9: dpmac@9 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <0x9>;
-                               status = "disabled";
-                       };
-
-                       dpmac10: dpmac@a {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <0xa>;
-                               status = "disabled";
-                       };
-               };
-       };
 };