ARM: dts: sunxi: h3-h5: rename mmc0_pins_a and mmc1_pins_a

There is only one pinctrl configuration for mmc0 and mmc1 so let's
drop the _a suffix from both of them.

Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>

diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
index 73978853bb4cf5bd3e55c83949fe7acf2c50a79b..f868cf197c8eb9ec76c87d6b23fc1c2b28b72464 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
@@ -134,7 +134,7 @@ xr819: sdio_wifi@1 {
        };
 };
 
-&mmc1_pins_a {
+&mmc1_pins {
        bias-pull-up;
 };
 

diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
index b4a4b3cb6c4ec3b1babfca6008df9bacfd75d3a8..7741166d34d8359ec70e884ffacd0bb99803badf 100644 (file)
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
@@ -142,7 +142,7 @@ mmc0: mmc@1c0f000 {
                        /* compatible and clocks are in per SoC .dtsi file */
                        reg = <0x01c0f000 0x1000>;
                        pinctrl-names = "default";
-                       pinctrl-0 = <&mmc0_pins_a>;
+                       pinctrl-0 = <&mmc0_pins>;
                        resets = <&ccu RST_BUS_MMC0>;
                        reset-names = "ahb";
                        interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
@@ -155,7 +155,7 @@ mmc1: mmc@1c10000 {
                        /* compatible and clocks are in per SoC .dtsi file */
                        reg = <0x01c10000 0x1000>;
                        pinctrl-names = "default";
-                       pinctrl-0 = <&mmc1_pins_a>;
+                       pinctrl-0 = <&mmc1_pins>;
                        resets = <&ccu RST_BUS_MMC1>;
                        reset-names = "ahb";
                        interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
@@ -352,7 +352,7 @@ i2c2_pins: i2c2 {
                                function = "i2c2";
                        };
 
-                       mmc0_pins_a: mmc0 {
+                       mmc0_pins: mmc0 {
                                pins = "PF0", "PF1", "PF2", "PF3",
                                       "PF4", "PF5";
                                function = "mmc0";
@@ -360,7 +360,7 @@ mmc0_pins_a: mmc0 {
                                bias-pull-up;
                        };
 
-                       mmc1_pins_a: mmc1 {
+                       mmc1_pins: mmc1 {
                                pins = "PG0", "PG1", "PG2", "PG3",
                                       "PG4", "PG5";
                                function = "mmc1";