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

[cascardo/linux.git] / arch / arm / boot / dts / ste-href-ab8505.dtsi

diff --git a/arch/arm/boot/dts/ste-href-ab8505.dtsi b/arch/arm/boot/dts/ste-href-ab8505.dtsi
index 6006d62..ccf37a9 100644 (file)
--- a/arch/arm/boot/dts/ste-href-ab8505.dtsi
+++ b/arch/arm/boot/dts/ste-href-ab8505.dtsi
@@ -35,11 +35,11 @@
                                        gpio2 {
                                                gpio2_default_mode: gpio2_default {
                                                        default_mux {
-                                                               ste,function = "gpio";
-                                                               ste,pins = "gpio2_a_1";
+                                                               function = "gpio";
+                                                               groups = "gpio2_a_1";
                                                        };
                                                        default_cfg {
-                                                               ste,pins = "GPIO2_R5";
+                                                               pins = "GPIO2_R5";
                                                                input-enable;
                                                                bias-pull-down;
                                                        };
@@ -48,11 +48,11 @@
                                        gpio10 {
                                                gpio10_default_mode: gpio10_default {
                                                        default_mux {
-                                                               ste,function = "gpio";
-                                                               ste,pins = "gpio10_d_1";
+                                                               function = "gpio";
+                                                               groups = "gpio10_d_1";
                                                        };
                                                        default_cfg {
-                                                               ste,pins = "GPIO10_B16";
+                                                               pins = "GPIO10_B16";
                                                                input-enable;
                                                                bias-pull-down;
                                                        };
@@ -61,11 +61,11 @@
                                        gpio11 {
                                                gpio11_default_mode: gpio11_default {
                                                        default_mux {
-                                                               ste,function = "gpio";
-                                                               ste,pins = "gpio11_d_1";
+                                                               function = "gpio";
+                                                               groups = "gpio11_d_1";
                                                        };
                                                        default_cfg {
-                                                               ste,pins = "GPIO11_B17";
+                                                               pins = "GPIO11_B17";
                                                                input-enable;
                                                                bias-pull-down;
                                                        };
@@ -74,11 +74,11 @@
                                        gpio13 {
                                                gpio13_default_mode: gpio13_default {
                                                        default_mux {
-                                                               ste,function = "gpio";
-                                                               ste,pins = "gpio13_d_1";
+                                                               function = "gpio";
+                                                               groups = "gpio13_d_1";
                                                        };
                                                        default_cfg {
-                                                               ste,pins = "GPIO13_D17";
+                                                               pins = "GPIO13_D17";
                                                                input-enable;
                                                                bias-disable;
                                                        };
@@ -87,11 +87,11 @@
                                        gpio34 {
                                                gpio34_default_mode: gpio34_default {
                                                        default_mux {
-                                                               ste,function = "gpio";
-                                                               ste,pins = "gpio34_a_1";
+                                                               function = "gpio";
+                                                               groups = "gpio34_a_1";
                                                        };
                                                        default_cfg {
-                                                               ste,pins = "GPIO34_H14";
+                                                               pins = "GPIO34_H14";
                                                                input-enable;
                                                                bias-pull-down;
                                                        };
@@ -100,11 +100,11 @@
                                        gpio50 {
                                                gpio50_default_mode: gpio50_default {
                                                        default_mux {
-                                                               ste,function = "gpio";
-                                                               ste,pins = "gpio50_d_1";
+                                                               function = "gpio";
+                                                               groups = "gpio50_d_1";
                                                        };
                                                        default_cfg {
-                                                               ste,pins = "GPIO50_L4";
+                                                               pins = "GPIO50_L4";
                                                                input-enable;
                                                                bias-disable;
                                                        };
@@ -114,11 +114,11 @@
                                        pwm {
                                                pwm_default_mode: pwm_default {
                                                        default_mux {
-                                                               ste,function = "pwmout";
-                                                               ste,pins = "pwmout1_d_1";
+                                                               function = "pwmout";
+                                                               groups = "pwmout1_d_1";
                                                        };
                                                        default_cfg {
-                                                               ste,pins = "GPIO14_C16";
+                                                               pins = "GPIO14_C16";
                                                                input-enable;
                                                                bias-pull-down;
                                                        };
@@ -128,11 +128,11 @@
                                        adi2 {
                                                adi2_default_mode: adi2_default {
                                                        default_mux {
-                                                               ste,function = "adi2";
-                                                               ste,pins = "adi2_d_1";
+                                                               function = "adi2";
+                                                               groups = "adi2_d_1";
                                                        };
                                                        default_cfg {
-                                                               ste,pins = "GPIO17_P2",
+                                                               pins = "GPIO17_P2",
                                                                         "GPIO18_N3",
                                                                         "GPIO19_T1",
                                                                         "GPIO20_P3";
@@ -145,11 +145,11 @@
                                        modsclsda {
                                                modsclsda_default_mode: modsclsda_default {
                                                        default_mux {
-                                                               ste,function = "modsclsda";
-                                                               ste,pins = "modsclsda_d_1";
+                                                               function = "modsclsda";
+                                                               groups = "modsclsda_d_1";
                                                        };
                                                        default_cfg {
-                                                               ste,pins = "GPIO40_J15",
+                                                               pins = "GPIO40_J15",
                                                                        "GPIO41_J14";
                                                                input-enable;
                                                                bias-pull-down;
@@ -159,11 +159,11 @@
                                        resethw {
                                                resethw_default_mode: resethw_default {
                                                        default_mux {
-                                                               ste,function = "resethw";
-                                                               ste,pins = "resethw_d_1";
+                                                               function = "resethw";
+                                                               groups = "resethw_d_1";
                                                        };
                                                        default_cfg {
-                                                               ste,pins = "GPIO52_D16";
+                                                               pins = "GPIO52_D16";
                                                                input-enable;
                                                                bias-pull-down;
                                                        };
@@ -172,11 +172,11 @@
                                        service {
                                                service_default_mode: service_default {
                                                        default_mux {
-                                                               ste,function = "service";
-                                                               ste,pins = "service_d_1";
+                                                               function = "service";
+                                                               groups = "service_d_1";
                                                        };
                                                        default_cfg {
-                                                               ste,pins = "GPIO53_D15";
+                                                               pins = "GPIO53_D15";
                                                                input-enable;
                                                                bias-pull-down;
                                                        };
@@ -188,22 +188,22 @@
                                        sysclkreq2 {
                                                sysclkreq2_default_mode: sysclkreq2_default {
                                                        default_mux {
-                                                               ste,function = "sysclkreq";
-                                                               ste,pins = "sysclkreq2_d_1";
+                                                               function = "sysclkreq";
+                                                               groups = "sysclkreq2_d_1";
                                                        };
                                                        default_cfg {
-                                                               ste,pins = "GPIO1_N4";
+                                                               pins = "GPIO1_N4";
                                                                input-enable;
                                                                bias-disable;
                                                        };
                                                };
                                                sysclkreq2_sleep_mode: sysclkreq2_sleep {
                                                        default_mux {
-                                                               ste,function = "gpio";
-                                                               ste,pins = "gpio1_a_1";
+                                                               function = "gpio";
+                                                               groups = "gpio1_a_1";
                                                        };
                                                        default_cfg {
-                                                               ste,pins = "GPIO1_N4";
+                                                               pins = "GPIO1_N4";
                                                                input-enable;
                                                                bias-pull-down;
                                                        };
@@ -212,22 +212,22 @@
                                        sysclkreq4 {
                                                sysclkreq4_default_mode: sysclkreq4_default {
                                                        default_mux {
-                                                               ste,function = "sysclkreq";
-                                                               ste,pins = "sysclkreq4_d_1";
+                                                               function = "sysclkreq";
+                                                               groups = "sysclkreq4_d_1";
                                                        };
                                                        default_cfg {
-                                                               ste,pins = "GPIO3_P5";
+                                                               pins = "GPIO3_P5";
                                                                input-enable;
                                                                bias-disable;
                                                        };
                                                };
                                                sysclkreq4_sleep_mode: sysclkreq4_sleep {
                                                        default_mux {
-                                                               ste,function = "gpio";
-                                                               ste,pins = "gpio3_a_1";
+                                                               function = "gpio";
+                                                               groups = "gpio3_a_1";
                                                        };
                                                        default_cfg {
-                                                               ste,pins = "GPIO3_P5";
+                                                               pins = "GPIO3_P5";
                                                                input-enable;
                                                                bias-pull-down;
                                                        };