| Message ID | 1630046580-19282-4-git-send-email-hongxing.zhu@nxp.com |
|---|---|
| State | Accepted |
| Commit | c179ee1e2c2ee49f1d3bc968000aaaac8e6d57d1 |
| Headers | show |
| Series | dt-bindings: PCI: imx6: convert the imx pcie | expand |
Hi Shawn: Can you help to merge the following patch? Since the first one of this patch-set had been applied by Rob Herring. https://patchwork.ozlabs.org/project/devicetree-bindings/patch/1630046580-19282-2-git-send-email-hongxing.zhu@nxp.com/ Thanks in advanced. Best Regards Richard Zhu > -----Original Message----- > From: Richard Zhu <hongxing.zhu@nxp.com> > Sent: Friday, August 27, 2021 2:43 PM > To: robh@kernel.org; l.stach@pengutronix.de; galak@kernel.crashing.org; > shawnguo@kernel.org > Cc: devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org; > linux-kernel@vger.kernel.org; dl-linux-imx <linux-imx@nxp.com>; > kernel@pengutronix.de; Richard Zhu <hongxing.zhu@nxp.com> > Subject: [PATCH v2 3/3] arm64: dts: imx8mq: fix the schema check errors > > No functional changes, but the ranges should be grouped by region. > Otherwise, schema dtbs_check would report the following errors. > > "/linux-imx/arch/arm64/boot/dts/freescale/imx8mq-evk.dt.yaml: > pcie@33800000: ranges: 'oneOf' conditional failed, one must be fixed: > /linux-imx/arch/arm64/boot/dts/freescale/imx8mq-evk.dt.yaml: > pcie@33800000: ranges: 'oneOf' conditional failed, one must be fixed: > [[2164260864, 0, 0, 536346624, 0, 65536, 2181038080, 0, > 402653184, 402653184, 0, 133169152]] is not of type 'boolean' > True was expected > [[2164260864, 0, 0, 536346624, 0, 65536, 2181038080, 0, > 402653184, 402653184, 0, 133169152]] is not of type 'null' > [2164260864, 0, 0, 536346624, 0, 65536, 2181038080, 0, > 402653184, 402653184, 0, 133169152] 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. > > Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> > Reviewed-by: Lucas Stach <l.stach@pengutronix.de> > --- > arch/arm64/boot/dts/freescale/imx8mq.dtsi | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi > b/arch/arm64/boot/dts/freescale/imx8mq.dtsi > index 91df9c5350ae..c6dba9b92edd 100644 > --- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi > +++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi > @@ -1364,10 +1364,9 @@ pcie0: pcie@33800000 { > #size-cells = <2>; > device_type = "pci"; > bus-range = <0x00 0xff>; > - ranges = <0x81000000 0 0x00000000 0x1ff80000 0 > 0x00010000 /* downstream I/O 64KB */ > - 0x82000000 0 0x18000000 0x18000000 0 > 0x07f00000>; /* non-prefetchable memory */ > + ranges = <0x81000000 0 0x00000000 0x1ff80000 0 > 0x00010000>, /* downstream I/O 64KB */ > + <0x82000000 0 0x18000000 0x18000000 0 0x07f00000>; > /* non-prefetchable memory */ > num-lanes = <1>; > - num-viewport = <4>; > interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>; > interrupt-names = "msi"; > #interrupt-cells = <1>; > @@ -1402,10 +1401,9 @@ pcie1: pcie@33c00000 { > #address-cells = <3>; > #size-cells = <2>; > device_type = "pci"; > - ranges = <0x81000000 0 0x00000000 0x27f80000 0 > 0x00010000 /* downstream I/O 64KB */ > - 0x82000000 0 0x20000000 0x20000000 0 > 0x07f00000>; /* non-prefetchable memory */ > + ranges = <0x81000000 0 0x00000000 0x27f80000 0 > 0x00010000>, /* downstream I/O 64KB */ > + <0x82000000 0 0x20000000 0x20000000 0 > 0x07f00000>; /* non-prefetchable memory */ > num-lanes = <1>; > - num-viewport = <4>; > interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; > interrupt-names = "msi"; > #interrupt-cells = <1>; > -- > 2.25.1
On Fri, Aug 27, 2021 at 02:43:00PM +0800, Richard Zhu wrote: > No functional changes, but the ranges should be grouped by region. > Otherwise, schema dtbs_check would report the following errors. > > "/linux-imx/arch/arm64/boot/dts/freescale/imx8mq-evk.dt.yaml: pcie@33800000: ranges: 'oneOf' conditional failed, one must be fixed: > /linux-imx/arch/arm64/boot/dts/freescale/imx8mq-evk.dt.yaml: pcie@33800000: ranges: 'oneOf' conditional failed, one must be fixed: > [[2164260864, 0, 0, 536346624, 0, 65536, 2181038080, 0, 402653184, 402653184, 0, 133169152]] is not of type 'boolean' > True was expected > [[2164260864, 0, 0, 536346624, 0, 65536, 2181038080, 0, 402653184, 402653184, 0, 133169152]] is not of type 'null' > [2164260864, 0, 0, 536346624, 0, 65536, 2181038080, 0, 402653184, 402653184, 0, 133169152] 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. > > Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> > Reviewed-by: Lucas Stach <l.stach@pengutronix.de> Applied, thanks!
diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi index 91df9c5350ae..c6dba9b92edd 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi @@ -1364,10 +1364,9 @@ pcie0: pcie@33800000 { #size-cells = <2>; device_type = "pci"; bus-range = <0x00 0xff>; - ranges = <0x81000000 0 0x00000000 0x1ff80000 0 0x00010000 /* downstream I/O 64KB */ - 0x82000000 0 0x18000000 0x18000000 0 0x07f00000>; /* non-prefetchable memory */ + ranges = <0x81000000 0 0x00000000 0x1ff80000 0 0x00010000>, /* downstream I/O 64KB */ + <0x82000000 0 0x18000000 0x18000000 0 0x07f00000>; /* non-prefetchable memory */ num-lanes = <1>; - num-viewport = <4>; interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi"; #interrupt-cells = <1>; @@ -1402,10 +1401,9 @@ pcie1: pcie@33c00000 { #address-cells = <3>; #size-cells = <2>; device_type = "pci"; - ranges = <0x81000000 0 0x00000000 0x27f80000 0 0x00010000 /* downstream I/O 64KB */ - 0x82000000 0 0x20000000 0x20000000 0 0x07f00000>; /* non-prefetchable memory */ + ranges = <0x81000000 0 0x00000000 0x27f80000 0 0x00010000>, /* downstream I/O 64KB */ + <0x82000000 0 0x20000000 0x20000000 0 0x07f00000>; /* non-prefetchable memory */ num-lanes = <1>; - num-viewport = <4>; interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi"; #interrupt-cells = <1>;
No functional changes, but the ranges should be grouped by region. Otherwise, schema dtbs_check would report the following errors. "/linux-imx/arch/arm64/boot/dts/freescale/imx8mq-evk.dt.yaml: pcie@33800000: ranges: 'oneOf' conditional failed, one must be fixed: /linux-imx/arch/arm64/boot/dts/freescale/imx8mq-evk.dt.yaml: pcie@33800000: ranges: 'oneOf' conditional failed, one must be fixed: [[2164260864, 0, 0, 536346624, 0, 65536, 2181038080, 0, 402653184, 402653184, 0, 133169152]] is not of type 'boolean' True was expected [[2164260864, 0, 0, 536346624, 0, 65536, 2181038080, 0, 402653184, 402653184, 0, 133169152]] is not of type 'null' [2164260864, 0, 0, 536346624, 0, 65536, 2181038080, 0, 402653184, 402653184, 0, 133169152] 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. Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> Reviewed-by: Lucas Stach <l.stach@pengutronix.de> --- arch/arm64/boot/dts/freescale/imx8mq.dtsi | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)