bmips: dts: fix pinctrl error

The kernel logs the error "bcm6368_nand 10000200.nand: there is not valid
maps for state default" on boot and all nand pins show as UNCLAIMED in
sysfs pinmux-pins.

bcm6362.dtsi, bcm6368.dtsi and bcm63268.dtsi use the undocumented property
group which the driver doesn't understand. This has been documented upstream
in commit caf963efd4b0b9ff42ca12e52b8efe277264d35b.

Replacing group with pins allows the nand pins to be properly configured.

Signed-off-by: Kyle Hendry <kylehendrydev@gmail.com>
[add bcm636/bcm6368 and fix commit title]
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

diff --git a/target/linux/bmips/dts/bcm63268.dtsi b/target/linux/bmips/dts/bcm63268.dtsi
index d1aed29018e3a05378abe8d53c39f8ba6cf10aaf..5a8cb7193f913ff8973126c53268334932c4e402 100644 (file)
--- a/target/linux/bmips/dts/bcm63268.dtsi
+++ b/target/linux/bmips/dts/bcm63268.dtsi
@@ -245,7 +245,7 @@
 
                                pinctrl_nand: nand-pins {
                                        function = "nand";
-                                       group = "nand_grp";
+                                       pins = "nand_grp";
                                };
 
                                pinctrl_gpio35_alt: gpio35_alt-pins {
@@ -255,37 +255,37 @@
 
                                pinctrl_dectpd: dectpd-pins {
                                        function = "dectpd";
-                                       group = "dectpd_grp";
+                                       pins = "dectpd_grp";
                                };
 
                                pinctrl_vdsl_phy_override_0: vdsl_phy_override_0-pins {
                                        function = "vdsl_phy_override_0";
-                                       group = "vdsl_phy_override_0_grp";
+                                       pins = "vdsl_phy_override_0_grp";
                                };
 
                                pinctrl_vdsl_phy_override_1: vdsl_phy_override_1-pins {
                                        function = "vdsl_phy_override_1";
-                                       group = "vdsl_phy_override_1_grp";
+                                       pins = "vdsl_phy_override_1_grp";
                                };
 
                                pinctrl_vdsl_phy_override_2: vdsl_phy_override_2-pins {
                                        function = "vdsl_phy_override_2";
-                                       group = "vdsl_phy_override_2_grp";
+                                       pins = "vdsl_phy_override_2_grp";
                                };
 
                                pinctrl_vdsl_phy_override_3: vdsl_phy_override_3-pins {
                                        function = "vdsl_phy_override_3";
-                                       group = "vdsl_phy_override_3_grp";
+                                       pins = "vdsl_phy_override_3_grp";
                                };
 
                                pinctrl_dsl_gpio8: dsl_gpio8-pins {
                                        function = "dsl_gpio8";
-                                       group = "dsl_gpio8";
+                                       pins = "dsl_gpio8";
                                };
 
                                pinctrl_dsl_gpio9: dsl_gpio9-pins {
                                        function = "dsl_gpio9";
-                                       group = "dsl_gpio9";
+                                       pins = "dsl_gpio9";
                                };
                        };
                };

diff --git a/target/linux/bmips/dts/bcm6362.dtsi b/target/linux/bmips/dts/bcm6362.dtsi
index 1089d89350baa52bdfb33ceca948eb637a16149d..5722f6e30c2ebf7e45397740fe95f4bbc665fd42 100644 (file)
--- a/target/linux/bmips/dts/bcm6362.dtsi
+++ b/target/linux/bmips/dts/bcm6362.dtsi
@@ -320,7 +320,7 @@
 
                                pinctrl_nand: nand-pins {
                                        function = "nand";
-                                       group = "nand_grp";
+                                       pins = "nand_grp";
                                };
                        };
                };

diff --git a/target/linux/bmips/dts/bcm6368.dtsi b/target/linux/bmips/dts/bcm6368.dtsi
index e50f7a1b0c64aa3670729e1220fd6a8ab2a6ab96..a855ab340ac43be38ad0b9310cb621d993b14f9f 100644 (file)
--- a/target/linux/bmips/dts/bcm6368.dtsi
+++ b/target/linux/bmips/dts/bcm6368.dtsi
@@ -334,7 +334,7 @@
 
                                pinctrl_uart1: uart1-pins {
                                        function = "uart1";
-                                       group = "uart1_grp";
+                                       pins = "uart1_grp";
                                };
                        };
                };