Merge tag 'timers-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / freescale / fsl-ls1088a.dtsi

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
index 692d8f4..6403455 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
@@ -420,7 +420,7 @@
                        status = "disabled";
                };
 
-               usb0: usb3@3100000 {
+               usb0: usb@3100000 {
                        compatible = "snps,dwc3";
                        reg = <0x0 0x3100000 0x0 0x10000>;
                        interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;
@@ -431,7 +431,7 @@
                        status = "disabled";
                };
 
-               usb1: usb3@3110000 {
+               usb1: usb@3110000 {
                        compatible = "snps,dwc3";
                        reg = <0x0 0x3110000 0x0 0x10000>;
                        interrupts = <0 81 IRQ_TYPE_LEVEL_HIGH>;
@@ -517,6 +517,17 @@
                        status = "disabled";
                };
 
+               pcie_ep1: pcie-ep@3400000 {
+                       compatible = "fsl,ls1088a-pcie-ep", "fsl,ls-pcie-ep";
+                       reg = <0x00 0x03400000 0x0 0x00100000
+                              0x20 0x00000000 0x8 0x00000000>;
+                       reg-names = "regs", "addr_space";
+                       num-ib-windows = <24>;
+                       num-ob-windows = <256>;
+                       max-functions = /bits/ 8 <2>;
+                       status = "disabled";
+               };
+
                pcie2: pcie@3500000 {
                        compatible = "fsl,ls1088a-pcie";
                        reg = <0x00 0x03500000 0x0 0x00100000   /* controller registers */
@@ -543,6 +554,16 @@
                        status = "disabled";
                };
 
+               pcie_ep2: pcie-ep@3500000 {
+                       compatible = "fsl,ls1088a-pcie-ep", "fsl,ls-pcie-ep";
+                       reg = <0x00 0x03500000 0x0 0x00100000
+                              0x28 0x00000000 0x8 0x00000000>;
+                       reg-names = "regs", "addr_space";
+                       num-ib-windows = <6>;
+                       num-ob-windows = <6>;
+                       status = "disabled";
+               };
+
                pcie3: pcie@3600000 {
                        compatible = "fsl,ls1088a-pcie";
                        reg = <0x00 0x03600000 0x0 0x00100000   /* controller registers */
@@ -569,6 +590,16 @@
                        status = "disabled";
                };
 
+               pcie_ep3: pcie-ep@3600000 {
+                       compatible = "fsl,ls1088a-pcie-ep", "fsl,ls-pcie-ep";
+                       reg = <0x00 0x03600000 0x0 0x00100000
+                              0x30 0x00000000 0x8 0x00000000>;
+                       reg-names = "regs", "addr_space";
+                       num-ib-windows = <6>;
+                       num-ob-windows = <6>;
+                       status = "disabled";
+               };
+
                smmu: iommu@5000000 {
                        compatible = "arm,mmu-500";
                        reg = <0 0x5000000 0 0x800000>;
@@ -672,6 +703,87 @@
                        fsl,extts-fifo;
                };
 
+               emdio1: mdio@8b96000 {
+                       compatible = "fsl,fman-memac-mdio";
+                       reg = <0x0 0x8b96000 0x0 0x1000>;
+                       little-endian;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
+               emdio2: mdio@8b97000 {
+                       compatible = "fsl,fman-memac-mdio";
+                       reg = <0x0 0x8b97000 0x0 0x1000>;
+                       little-endian;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
+               pcs_mdio2: mdio@8c0b000 {
+                       compatible = "fsl,fman-memac-mdio";
+                       reg = <0x0 0x8c0b000 0x0 0x1000>;
+                       little-endian;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+
+                       pcs2: ethernet-phy@0 {
+                               reg = <0>;
+                       };
+               };
+
+               pcs_mdio3: mdio@8c0f000 {
+                       compatible = "fsl,fman-memac-mdio";
+                       reg = <0x0 0x8c0f000 0x0 0x1000>;
+                       little-endian;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+
+                       pcs3_0: ethernet-phy@0 {
+                               reg = <0>;
+                       };
+
+                       pcs3_1: ethernet-phy@1 {
+                               reg = <1>;
+                       };
+
+                       pcs3_2: ethernet-phy@2 {
+                               reg = <2>;
+                       };
+
+                       pcs3_3: ethernet-phy@3 {
+                               reg = <3>;
+                       };
+               };
+
+               pcs_mdio7: mdio@8c1f000 {
+                       compatible = "fsl,fman-memac-mdio";
+                       reg = <0x0 0x8c1f000 0x0 0x1000>;
+                       little-endian;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+
+                       pcs7_0: ethernet-phy@0 {
+                               reg = <0>;
+                       };
+
+                       pcs7_1: ethernet-phy@1 {
+                               reg = <1>;
+                       };
+
+                       pcs7_2: ethernet-phy@2 {
+                               reg = <2>;
+                       };
+
+                       pcs7_3: ethernet-phy@3 {
+                               reg = <3>;
+                       };
+               };
+
                cluster1_core0_watchdog: wdt@c000000 {
                        compatible = "arm,sp805-wdt", "arm,primecell";
                        reg = <0x0 0xc000000 0x0 0x1000>;
@@ -749,52 +861,52 @@
                                #address-cells = <1>;
                                #size-cells = <0>;
 
-                               dpmac1: dpmac@1 {
+                               dpmac1: ethernet@1 {
                                        compatible = "fsl,qoriq-mc-dpmac";
                                        reg = <1>;
                                };
 
-                               dpmac2: dpmac@2 {
+                               dpmac2: ethernet@2 {
                                        compatible = "fsl,qoriq-mc-dpmac";
                                        reg = <2>;
                                };
 
-                               dpmac3: dpmac@3 {
+                               dpmac3: ethernet@3 {
                                        compatible = "fsl,qoriq-mc-dpmac";
                                        reg = <3>;
                                };
 
-                               dpmac4: dpmac@4 {
+                               dpmac4: ethernet@4 {
                                        compatible = "fsl,qoriq-mc-dpmac";
                                        reg = <4>;
                                };
 
-                               dpmac5: dpmac@5 {
+                               dpmac5: ethernet@5 {
                                        compatible = "fsl,qoriq-mc-dpmac";
                                        reg = <5>;
                                };
 
-                               dpmac6: dpmac@6 {
+                               dpmac6: ethernet@6 {
                                        compatible = "fsl,qoriq-mc-dpmac";
                                        reg = <6>;
                                };
 
-                               dpmac7: dpmac@7 {
+                               dpmac7: ethernet@7 {
                                        compatible = "fsl,qoriq-mc-dpmac";
                                        reg = <7>;
                                };
 
-                               dpmac8: dpmac@8 {
+                               dpmac8: ethernet@8 {
                                        compatible = "fsl,qoriq-mc-dpmac";
                                        reg = <8>;
                                };
 
-                               dpmac9: dpmac@9 {
+                               dpmac9: ethernet@9 {
                                        compatible = "fsl,qoriq-mc-dpmac";
                                        reg = <9>;
                                };
 
-                               dpmac10: dpmac@a {
+                               dpmac10: ethernet@a {
                                        compatible = "fsl,qoriq-mc-dpmac";
                                        reg = <0xa>;
                                };