[openwrt/openwrt] bmips: dts: fix pinctrl error

LEDE Commits lede-commits at lists.infradead.org
Tue Dec 24 02:24:21 PST 2024


noltari pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/d1e9c50d06a8cb618cb85ab489cbcccaec220636

commit d1e9c50d06a8cb618cb85ab489cbcccaec220636
Author: Kyle Hendry <kylehendrydev at gmail.com>
AuthorDate: Sat Nov 16 18:16:31 2024 -0800

    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 at gmail.com>
    [add bcm636/bcm6368 and fix commit title]
    Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
---
 target/linux/bmips/dts/bcm63268.dtsi | 16 ++++++++--------
 target/linux/bmips/dts/bcm6362.dtsi  |  2 +-
 target/linux/bmips/dts/bcm6368.dtsi  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/target/linux/bmips/dts/bcm63268.dtsi b/target/linux/bmips/dts/bcm63268.dtsi
index d1aed29018..5a8cb7193f 100644
--- 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 1089d89350..5722f6e30c 100644
--- 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 e50f7a1b0c..a855ab340a 100644
--- 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";
 				};
 			};
 		};




More information about the lede-commits mailing list