Merge tag 'please-pull-einj-mmcfg' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / ste-nomadik-s8815.dts

diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts
index e411ff7769fee3fb2481bd89a0d7585d4eb1703e..85d3b95dfdba55b543aa0f66733df936d5074abc 100644 (file)
--- a/arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts
@@ -30,12 +30,12 @@
                        cd_default_mode: cd_default {
                                cd_default_cfg1 {
                                        /* CD input GPIO */
-                                       ste,pins = "GPIO111_H21";
+                                       pins = "GPIO111_H21";
                                        ste,input = <0>;
                                };
                                cd_default_cfg2 {
                                        /* CD GPIO biasing */
-                                       ste,pins = "GPIO112_J21";
+                                       pins = "GPIO112_J21";
                                        ste,output = <0>;
                                };
                        };
@@ -43,7 +43,7 @@
                gpioi2c {
                        gpioi2c_default_mode: gpioi2c_default {
                                gpioi2c_default_cfg {
-                                       ste,pins = "GPIO73_C21", "GPIO74_C20";
+                                       pins = "GPIO73_C21", "GPIO74_C20";
                                        ste,input = <0>;
                                };
                        };
@@ -51,7 +51,7 @@
                user-led {
                        user_led_default_mode: user_led_default {
                                user_led_default_cfg {
-                                       ste,pins = "GPIO2_C5";
+                                       pins = "GPIO2_C5";
                                        ste,output = <1>;
                                };
                        };
@@ -59,7 +59,7 @@
                user-button {
                        user_button_default_mode: user_button_default {
                                user_button_default_cfg {
-                                       ste,pins = "GPIO3_A4";
+                                       pins = "GPIO3_A4";
                                        ste,input = <0>;
                                };
                        };