Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6qdl-nitrogen6x.dtsi

diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
index d309a4d0eb08b38c0ba551ee3652549421538eb5..4bdf29169d2a0e8193e8c41c481474d67398757f 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
@@ -197,7 +197,7 @@
                status = "okay";
        };
 
-       lcd_display: display@di0 {
+       lcd_display: disp0 {
                compatible = "fsl,imx-parallel-display";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -313,7 +313,7 @@
        pinctrl-0 = <&pinctrl_i2c1>;
        status = "okay";
 
-       codec: sgtl5000@0a {
+       codec: sgtl5000@a {
                compatible = "fsl,sgtl5000";
                reg = <0x0a>;
                clocks = <&clks IMX6QDL_CLK_CKO>;
@@ -340,7 +340,7 @@
        pinctrl-0 = <&pinctrl_i2c3>;
        status = "okay";
 
-       touchscreen@04 {
+       touchscreen@4 {
                compatible = "eeti,egalax_ts";
                reg = <0x04>;
                interrupt-parent = <&gpio1>;