summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCristina Ciocan <cristina-mihaela.ciocan@nxp.com>2017-06-22 17:46:59 +0300
committerCristina Ciocan <cristina-mihaela.ciocan@nxp.com>2017-07-19 14:02:57 +0300
commit2426847f9ea60dfa83158906bbcbb99a1219a1f6 (patch)
tree83f6eb486d891efb5622a1c2dd0b5ff7eecaedef
parent3d5245b0a71b1bec488d349bdaa098ae59a6ab90 (diff)
MLK-15125: arm: dts: imx6sx: Fix duplicate name in lcdif
lcdif2 node has a property called "display" and a subnode that is also called "display", leading to an OF duplicate warning at boot time. Fix this by changing the subnode's name to "display@1". Signed-off-by: Cristina Ciocan <cristina-mihaela.ciocan@nxp.com> (cherry picked from commit 7aa2c6011a8a074b880330a7f3989ea9f23e03b3)
-rw-r--r--arch/arm/boot/dts/imx6sx-sabreauto.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts
index d5daefec83dc..9b01adf3c687 100644
--- a/arch/arm/boot/dts/imx6sx-sabreauto.dts
+++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts
@@ -488,7 +488,7 @@
disp-dev = "ldb";
status = "okay";
- display1: display {
+ display1: display@1 {
bits-per-pixel = <16>;
bus-width = <18>;
};