]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: sun8i: A23/A33: Fix pinctrl node names
authorMaxime Ripard <maxime.ripard@bootlin.com>
Mon, 25 Mar 2019 13:52:48 +0000 (14:52 +0100)
committerMaxime Ripard <maxime.ripard@bootlin.com>
Mon, 25 Mar 2019 20:28:16 +0000 (21:28 +0100)
The NAND pinctrl nodes names don't follow the pattern we've used and
enforced for some time. Make sure they do.

Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
arch/arm/boot/dts/sun8i-a23-a33.dtsi

index 9be25db7a2759ecd622c57fa01b9145ff9f8ad9b..6d43e06d8cc52b170601507d47549915bbf8513d 100644 (file)
@@ -170,7 +170,7 @@ nfc: nand@1c03000 {
                        resets = <&ccu RST_BUS_NAND>;
                        reset-names = "ahb";
                        pinctrl-names = "default";
-                       pinctrl-0 = <&nand_pins &nand_pins_cs0 &nand_pins_rb0>;
+                       pinctrl-0 = <&nand_pins &nand_cs0_pin &nand_rb0_pin>;
                        status = "disabled";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -394,25 +394,25 @@ nand_pins: nand-pins {
                                function = "nand0";
                        };
 
-                       nand_pins_cs0: nand-pins-cs0 {
+                       nand_cs0_pin: nand-cs0-pin {
                                pins = "PC4";
                                function = "nand0";
                                bias-pull-up;
                        };
 
-                       nand_pins_cs1: nand-pins-cs1 {
+                       nand_cs1_pin: nand-cs1-pin {
                                pins = "PC3";
                                function = "nand0";
                                bias-pull-up;
                        };
 
-                       nand_pins_rb0: nand-pins-rb0 {
+                       nand_rb0_pin: nand-rb0-pin {
                                pins = "PC6";
                                function = "nand0";
                                bias-pull-up;
                        };
 
-                       nand_pins_rb1: nand-pins-rb1 {
+                       nand_rb1_pin: nand-rb1-pin {
                                pins = "PC7";
                                function = "nand0";
                                bias-pull-up;