diff options
| author | Rob Herring <robh@kernel.org> | 2019-05-16 17:55:25 -0500 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2019-05-23 16:31:38 +0800 |
| commit | efb8393cf06cede0749dc79695033117e6005621 (patch) | |
| tree | 0986181c635662b2705a22ac9c52f647953a6098 | |
| parent | 37a4bdead1097b24e2e80c1441e07e0e309fd075 (diff) | |
| download | kernel_replicant_linux-efb8393cf06cede0749dc79695033117e6005621.tar.gz kernel_replicant_linux-efb8393cf06cede0749dc79695033117e6005621.tar.bz2 kernel_replicant_linux-efb8393cf06cede0749dc79695033117e6005621.zip | |
ARM: dts: imx: Avoid colliding 'display' node and property names
While properties and child nodes with the same name are valid DT, the
practice is not encouraged. Furthermore, the collision is problematic for
YAML encoded DT. Let's just avoid the issue and rename the nodes.
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-geam.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-isiot.dtsi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6ul-geam.dts b/arch/arm/boot/dts/imx6ul-geam.dts index bc77f26a2f1d..21ddd359d3ed 100644 --- a/arch/arm/boot/dts/imx6ul-geam.dts +++ b/arch/arm/boot/dts/imx6ul-geam.dts @@ -169,7 +169,7 @@ display = <&display0>; status = "okay"; - display0: display { + display0: display0 { bits-per-pixel = <16>; bus-width = <18>; diff --git a/arch/arm/boot/dts/imx6ul-isiot.dtsi b/arch/arm/boot/dts/imx6ul-isiot.dtsi index 213e802bf35c..b26d4f57c655 100644 --- a/arch/arm/boot/dts/imx6ul-isiot.dtsi +++ b/arch/arm/boot/dts/imx6ul-isiot.dtsi @@ -161,7 +161,7 @@ display = <&display0>; status = "okay"; - display0: display { + display0: display0 { bits-per-pixel = <16>; bus-width = <18>; |