Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block

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

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
index a30249e..343ecf0 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -66,7 +66,7 @@
                };
        };
 
-       sysclk: clock-sysclk {
+       sysclk: sysclk {
                compatible = "fixed-clock";
                #clock-cells = <0>;
                clock-frequency = <100000000>;
@@ -88,7 +88,7 @@
        };
 
        firmware {
-               optee {
+               optee: optee  {
                        compatible = "linaro,optee-tz";
                        method = "smc";
                        status = "disabled";
@@ -617,8 +617,8 @@
 
                pcie1: pcie@3400000 {
                        compatible = "fsl,ls1028a-pcie";
-                       reg = <0x00 0x03400000 0x0 0x00100000   /* controller registers */
-                              0x80 0x00000000 0x0 0x00002000>; /* configuration space */
+                       reg = <0x00 0x03400000 0x0 0x00100000>, /* controller registers */
+                             <0x80 0x00000000 0x0 0x00002000>; /* configuration space */
                        reg-names = "regs", "config";
                        interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>, /* PME interrupt */
                                     <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>; /* aer interrupt */
@@ -644,8 +644,8 @@
 
                pcie2: pcie@3500000 {
                        compatible = "fsl,ls1028a-pcie";
-                       reg = <0x00 0x03500000 0x0 0x00100000   /* controller registers */
-                              0x88 0x00000000 0x0 0x00002000>; /* configuration space */
+                       reg = <0x00 0x03500000 0x0 0x00100000>, /* controller registers */
+                             <0x88 0x00000000 0x0 0x00002000>; /* configuration space */
                        reg-names = "regs", "config";
                        interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
@@ -990,19 +990,19 @@
                        msi-map = <0 &its 0x17 0xe>;
                        iommu-map = <0 &smmu 0x17 0xe>;
                                  /* PF0-6 BAR0 - non-prefetchable memory */
-                       ranges = <0x82000000 0x0 0x00000000  0x1 0xf8000000  0x0 0x160000
+                       ranges = <0x82000000 0x1 0xf8000000  0x1 0xf8000000  0x0 0x160000
                                  /* PF0-6 BAR2 - prefetchable memory */
-                                 0xc2000000 0x0 0x00000000  0x1 0xf8160000  0x0 0x070000
+                                 0xc2000000 0x1 0xf8160000  0x1 0xf8160000  0x0 0x070000
                                  /* PF0: VF0-1 BAR0 - non-prefetchable memory */
-                                 0x82000000 0x0 0x00000000  0x1 0xf81d0000  0x0 0x020000
+                                 0x82000000 0x1 0xf81d0000  0x1 0xf81d0000  0x0 0x020000
                                  /* PF0: VF0-1 BAR2 - prefetchable memory */
-                                 0xc2000000 0x0 0x00000000  0x1 0xf81f0000  0x0 0x020000
+                                 0xc2000000 0x1 0xf81f0000  0x1 0xf81f0000  0x0 0x020000
                                  /* PF1: VF0-1 BAR0 - non-prefetchable memory */
-                                 0x82000000 0x0 0x00000000  0x1 0xf8210000  0x0 0x020000
+                                 0x82000000 0x1 0xf8210000  0x1 0xf8210000  0x0 0x020000
                                  /* PF1: VF0-1 BAR2 - prefetchable memory */
-                                 0xc2000000 0x0 0x00000000  0x1 0xf8230000  0x0 0x020000
+                                 0xc2000000 0x1 0xf8230000  0x1 0xf8230000  0x0 0x020000
                                  /* BAR4 (PF5) - non-prefetchable memory */
-                                 0x82000000 0x0 0x00000000  0x1 0xfc000000  0x0 0x400000>;
+                                 0x82000000 0x1 0xfc000000  0x1 0xfc000000  0x0 0x400000>;
 
                        enetc_port0: ethernet@0,0 {
                                compatible = "fsl,enetc";