Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Richard Zhu and committed by
Shawn Guo
63651ef2 6c418328

+10 -12
+3 -4
arch/arm/boot/dts/imx6qdl.dtsi
··· 264 264 }; 265 265 266 266 pcie: pcie@1ffc000 { 267 - compatible = "fsl,imx6q-pcie", "snps,dw-pcie"; 267 + compatible = "fsl,imx6q-pcie"; 268 268 reg = <0x01ffc000 0x04000>, 269 269 <0x01f00000 0x80000>; 270 270 reg-names = "dbi", "config"; ··· 272 272 #size-cells = <2>; 273 273 device_type = "pci"; 274 274 bus-range = <0x00 0xff>; 275 - ranges = <0x81000000 0 0 0x01f80000 0 0x00010000 /* downstream I/O */ 276 - 0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */ 275 + ranges = <0x81000000 0 0 0x01f80000 0 0x00010000>, /* downstream I/O */ 276 + <0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */ 277 277 num-lanes = <1>; 278 - num-viewport = <4>; 279 278 interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; 280 279 interrupt-names = "msi"; 281 280 #interrupt-cells = <1>;
+1 -1
arch/arm/boot/dts/imx6qp.dtsi
··· 110 110 }; 111 111 112 112 &pcie { 113 - compatible = "fsl,imx6qp-pcie", "snps,dw-pcie"; 113 + compatible = "fsl,imx6qp-pcie"; 114 114 };
+3 -3
arch/arm/boot/dts/imx6sx.dtsi
··· 1395 1395 }; 1396 1396 1397 1397 pcie: pcie@8ffc000 { 1398 - compatible = "fsl,imx6sx-pcie", "snps,dw-pcie"; 1398 + compatible = "fsl,imx6sx-pcie"; 1399 1399 reg = <0x08ffc000 0x04000>, <0x08f00000 0x80000>; 1400 1400 reg-names = "dbi", "config"; 1401 1401 #address-cells = <3>; 1402 1402 #size-cells = <2>; 1403 1403 device_type = "pci"; 1404 1404 bus-range = <0x00 0xff>; 1405 - ranges = <0x81000000 0 0 0x08f80000 0 0x00010000 /* downstream I/O */ 1406 - 0x82000000 0 0x08000000 0x08000000 0 0x00f00000>; /* non-prefetchable memory */ 1405 + ranges = <0x81000000 0 0 0x08f80000 0 0x00010000>, /* downstream I/O */ 1406 + <0x82000000 0 0x08000000 0x08000000 0 0x00f00000>; /* non-prefetchable memory */ 1407 1407 num-lanes = <1>; 1408 1408 interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; 1409 1409 interrupt-names = "msi";
+3 -4
arch/arm/boot/dts/imx7d.dtsi
··· 164 164 }; 165 165 166 166 pcie: pcie@33800000 { 167 - compatible = "fsl,imx7d-pcie", "snps,dw-pcie"; 167 + compatible = "fsl,imx7d-pcie"; 168 168 reg = <0x33800000 0x4000>, 169 169 <0x4ff00000 0x80000>; 170 170 reg-names = "dbi", "config"; ··· 172 172 #size-cells = <2>; 173 173 device_type = "pci"; 174 174 bus-range = <0x00 0xff>; 175 - ranges = <0x81000000 0 0 0x4ff80000 0 0x00010000 /* downstream I/O */ 176 - 0x82000000 0 0x40000000 0x40000000 0 0x0ff00000>; /* non-prefetchable memory */ 175 + ranges = <0x81000000 0 0 0x4ff80000 0 0x00010000>, /* downstream I/O */ 176 + <0x82000000 0 0x40000000 0x40000000 0 0x0ff00000>; /* non-prefetchable memory */ 177 177 num-lanes = <1>; 178 - num-viewport = <4>; 179 178 interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>; 180 179 interrupt-names = "msi"; 181 180 #interrupt-cells = <1>;