Merge tag 'imx-dt-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...

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

diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
index 4bab60aa4e4f7cb2331c9b0bc6f8bbcf760eefd9..40942d6b94b366737b2c66177617a2f993ef9956 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
@@ -315,7 +315,7 @@
        pinctrl-0 = <&pinctrl_i2c1>;
        status = "okay";
 
-       codec: sgtl5000@0a {
+       codec: sgtl5000@a {
                compatible = "fsl,sgtl5000";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_sgtl5000>;
@@ -347,7 +347,7 @@
        pinctrl-0 = <&pinctrl_i2c3>;
        status = "okay";
 
-       touchscreen@04 {
+       touchscreen@4 {
                compatible = "eeti,egalax_ts";
                reg = <0x04>;
                interrupt-parent = <&gpio1>;