ARM: sun8i: a83t: Rename pinmux setting names

The pinmux setting nodes all have an address element in their node
names, however the pinctrl node does not have #address-cells.

Rename the existing pinmux setting nodes and labels in sun8i-a83t.dtsi,
dropping identifiers for functions that only have one possible setting,
and using the pingroup name if the function is identically available on
different pingroups.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

diff --git a/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts b/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts
index 342e1d33fa1c37df6e473e63dc45732d51689883..aecdeeb368ed85e0c5e59c47f7aeebcd5cbf9a70 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts
+++ b/arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts
@@ -59,6 +59,6 @@ chosen {
 
 &uart0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&uart0_pins_b>;
+       pinctrl-0 = <&uart0_pb_pins>;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts b/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
index 88b1e0970b8d89c94ba6822bc34f03eeb3c0477c..d2614f101ecc736841861dc7d1fad8918952f984 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
+++ b/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
@@ -60,6 +60,6 @@ chosen {
 
 &uart0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&uart0_pins_b>;
+       pinctrl-0 = <&uart0_pb_pins>;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi
index 913aacafe8d519e71ff2f16ce4a4fc78a7e6c7b1..5f5c10c04dd3a7693483e6cdfe1291a53044cbe6 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a83t.dtsi
+++ b/arch/arm/boot/dts/sun8i-a83t.dtsi
@@ -174,7 +174,7 @@ pio: pinctrl@01c20800 {
                        #interrupt-cells = <3>;
                        #gpio-cells = <3>;
 
-                       mmc0_pins_a: mmc0@0 {
+                       mmc0_pins: mmc0_pins {
                                pins = "PF0", "PF1", "PF2",
                                       "PF3", "PF4", "PF5";
                                function = "mmc0";
@@ -182,13 +182,13 @@ mmc0_pins_a: mmc0@0 {
                                bias-pull-up;
                        };
 
-                       uart0_pins_a: uart0@0 {
-                               pins = "PF2", "PF4";
+                       uart0_pb_pins: uart0_pb_pins {
+                               pins = "PB9", "PB10";
                                function = "uart0";
                        };
 
-                       uart0_pins_b: uart0@1 {
-                               pins = "PB9", "PB10";
+                       uart0_pf_pins: uart0_pf_pins {
+                               pins = "PF2", "PF4";
                                function = "uart0";
                        };
                };