Skip to content

Commit d1e9c50

Browse files
kylehendrydevNoltari
authored andcommitted
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 <[email protected]> [add bcm636/bcm6368 and fix commit title] Signed-off-by: Álvaro Fernández Rojas <[email protected]>
1 parent a25809a commit d1e9c50

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

target/linux/bmips/dts/bcm63268.dtsi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@
245245

246246
pinctrl_nand: nand-pins {
247247
function = "nand";
248-
group = "nand_grp";
248+
pins = "nand_grp";
249249
};
250250

251251
pinctrl_gpio35_alt: gpio35_alt-pins {
@@ -255,37 +255,37 @@
255255

256256
pinctrl_dectpd: dectpd-pins {
257257
function = "dectpd";
258-
group = "dectpd_grp";
258+
pins = "dectpd_grp";
259259
};
260260

261261
pinctrl_vdsl_phy_override_0: vdsl_phy_override_0-pins {
262262
function = "vdsl_phy_override_0";
263-
group = "vdsl_phy_override_0_grp";
263+
pins = "vdsl_phy_override_0_grp";
264264
};
265265

266266
pinctrl_vdsl_phy_override_1: vdsl_phy_override_1-pins {
267267
function = "vdsl_phy_override_1";
268-
group = "vdsl_phy_override_1_grp";
268+
pins = "vdsl_phy_override_1_grp";
269269
};
270270

271271
pinctrl_vdsl_phy_override_2: vdsl_phy_override_2-pins {
272272
function = "vdsl_phy_override_2";
273-
group = "vdsl_phy_override_2_grp";
273+
pins = "vdsl_phy_override_2_grp";
274274
};
275275

276276
pinctrl_vdsl_phy_override_3: vdsl_phy_override_3-pins {
277277
function = "vdsl_phy_override_3";
278-
group = "vdsl_phy_override_3_grp";
278+
pins = "vdsl_phy_override_3_grp";
279279
};
280280

281281
pinctrl_dsl_gpio8: dsl_gpio8-pins {
282282
function = "dsl_gpio8";
283-
group = "dsl_gpio8";
283+
pins = "dsl_gpio8";
284284
};
285285

286286
pinctrl_dsl_gpio9: dsl_gpio9-pins {
287287
function = "dsl_gpio9";
288-
group = "dsl_gpio9";
288+
pins = "dsl_gpio9";
289289
};
290290
};
291291
};

target/linux/bmips/dts/bcm6362.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@
320320

321321
pinctrl_nand: nand-pins {
322322
function = "nand";
323-
group = "nand_grp";
323+
pins = "nand_grp";
324324
};
325325
};
326326
};

target/linux/bmips/dts/bcm6368.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334

335335
pinctrl_uart1: uart1-pins {
336336
function = "uart1";
337-
group = "uart1_grp";
337+
pins = "uart1_grp";
338338
};
339339
};
340340
};

0 commit comments

Comments
 (0)