ARM: dts: imx: fix the schema check errors

- ranges property should be grouped by region, with no functional
  changes. Otherwise, schema dtbs_check would report the following errors.
"linux-imx/arch/arm/boot/dts/imx6qp-vicutp.dt.yaml: pcie@1ffc000: ranges: 'oneOf' conditional failed, one must be fixed:
        linux-imx/arch/arm/boot/dts/imx6qp-vicutp.dt.yaml: pcie@1ffc000: ranges: 'oneOf' conditional failed, one must be fixed:
                [[2164260864, 0, 0, 33030144, 0, 65536, 2181038080, 0, 16777216, 16777216, 0, 15728640]] is not of type 'boolean'
                True was expected
                [[2164260864, 0, 0, 33030144, 0, 65536, 2181038080, 0, 16777216, 16777216, 0, 15728640]] is not of type 'null'
        [2164260864, 0, 0, 33030144, 0, 65536, 2181038080, 0, 16777216, 16777216, 0, 15728640] is too long
        From schema: linux-imx/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml"
- refer to commit 281f1f99cf3a ("PCI: dwc: Detect number of iATU windows").
  The num-viewport is not required anymore, remove them totally.
- dt_binding_check complains "compatible: ['fsl,imx6qp-pcie', 'snps,dw-pcie']
  is too long", remove "snps,dw-pcie" from the compatible string.

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 89c342f3a7c2f75ff13940f51adf3ac487cd273f..f5de5def876d851bfb7f5bd8a349ba66cf2efbc7 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -264,7 +264,7 @@
                };
 
                pcie: pcie@1ffc000 {
-                       compatible = "fsl,imx6q-pcie", "snps,dw-pcie";
+                       compatible = "fsl,imx6q-pcie";
                        reg = <0x01ffc000 0x04000>,
                              <0x01f00000 0x80000>;
                        reg-names = "dbi", "config";
@@ -272,10 +272,9 @@
                        #size-cells = <2>;
                        device_type = "pci";
                        bus-range = <0x00 0xff>;
-                       ranges = <0x81000000 0 0          0x01f80000 0 0x00010000 /* downstream I/O */
-                                 0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */
+                       ranges = <0x81000000 0 0          0x01f80000 0 0x00010000>, /* downstream I/O */
+                                <0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */
                        num-lanes = <1>;
-                       num-viewport = <4>;
                        interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "msi";
                        #interrupt-cells = <1>;

diff --git a/arch/arm/boot/dts/imx6qp.dtsi b/arch/arm/boot/dts/imx6qp.dtsi
index b310f13a53f22eb6c59ab2d3ca21b2803b5d7921..050365513836356a0f132c9ffc78020c546a5b6d 100644 (file)
--- a/arch/arm/boot/dts/imx6qp.dtsi
+++ b/arch/arm/boot/dts/imx6qp.dtsi
@@ -110,5 +110,5 @@
 };
 
 &pcie {
-       compatible = "fsl,imx6qp-pcie", "snps,dw-pcie";
+       compatible = "fsl,imx6qp-pcie";
 };

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 8516730778df82a0fa1076e8ae4fc8300b795d01..fc6334336b3d071c4fe13e5920b6dff16aa6dc16 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -1395,15 +1395,15 @@
                };
 
                pcie: pcie@8ffc000 {
-                       compatible = "fsl,imx6sx-pcie", "snps,dw-pcie";
+                       compatible = "fsl,imx6sx-pcie";
                        reg = <0x08ffc000 0x04000>, <0x08f00000 0x80000>;
                        reg-names = "dbi", "config";
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
                        bus-range = <0x00 0xff>;
-                       ranges = <0x81000000 0 0          0x08f80000 0 0x00010000 /* downstream I/O */
-                                 0x82000000 0 0x08000000 0x08000000 0 0x00f00000>; /* non-prefetchable memory */
+                       ranges = <0x81000000 0 0          0x08f80000 0 0x00010000>, /* downstream I/O */
+                                <0x82000000 0 0x08000000 0x08000000 0 0x00f00000>; /* non-prefetchable memory */
                        num-lanes = <1>;
                        interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "msi";

diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi
index b0bcfa9094a308093508f36283da16e1a9368d85..b7735979b7e4cbe769f6ab37990bf5abe45a897f 100644 (file)
--- a/arch/arm/boot/dts/imx7d.dtsi
+++ b/arch/arm/boot/dts/imx7d.dtsi
@@ -164,7 +164,7 @@
        };
 
        pcie: pcie@33800000 {
-               compatible = "fsl,imx7d-pcie", "snps,dw-pcie";
+               compatible = "fsl,imx7d-pcie";
                reg = <0x33800000 0x4000>,
                      <0x4ff00000 0x80000>;
                reg-names = "dbi", "config";
@@ -172,10 +172,9 @@
                #size-cells = <2>;
                device_type = "pci";
                bus-range = <0x00 0xff>;
-               ranges = <0x81000000 0 0          0x4ff80000 0 0x00010000   /* downstream I/O */
-                         0x82000000 0 0x40000000 0x40000000 0 0x0ff00000>; /* non-prefetchable memory */
+               ranges = <0x81000000 0 0          0x4ff80000 0 0x00010000>, /* downstream I/O */
+                        <0x82000000 0 0x40000000 0x40000000 0 0x0ff00000>; /* non-prefetchable memory */
                num-lanes = <1>;
-               num-viewport = <4>;
                interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;
                interrupt-names = "msi";
                #interrupt-cells = <1>;