Skip to contentSkip to conversation

pinctrl: single: set function name when adding function

PATCH Superseded Drew Fustini 1 participant 1 message Jan 25, 2021

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pinctrl: single: set function name when adding function

pcs_add_function() fails to set the function name in struct pcs_function when adding a new function. As a result this line in pcs_set_mux():

        dev_dbg(pcs->dev, "enabling %s function%i\n",
                func->name, fselector);

prints "(null)" for the function:

pinctrl-single 44e10800.pinmux: enabling (null) function0 pinctrl-single 44e10800.pinmux: enabling (null) function1 pinctrl-single 44e10800.pinmux: enabling (null) function2 pinctrl-single 44e10800.pinmux: enabling (null) function3

With this fix, the output is now:

pinctrl-single 44e10800.pinmux: enabling pinmux-uart0-pins function0 pinctrl-single 44e10800.pinmux: enabling pinmux-mmc0-pins function1 pinctrl-single 44e10800.pinmux: enabling pinmux-i2c0-pins function2 pinctrl-single 44e10800.pinmux: enabling pinmux-mmc0-pins function3

Cc Jason Kridner <[email protected]>
Cc Robert Nelson <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Tony Lindgren <[email protected]>
---
 drivers/pinctrl/pinctrl-single.c | 1 +
 1 file changed, 1 insertion(+)
drivers/pinctrl/pinctrl-single.c +1 -0
index 0271a13a535d..e7f3ddbbd515 100644
@@ -790,6 +790,7 @@ static int pcs_add_function(struct pcs_device *pcs,
 
 	function->vals = vals;
 	function->nvals = nvals;
+	function->name = name;
 
 	pr_warn("DEBUG pcs_add_function(): name=%s nvals=%d pgnames[0]=%s npgnames=%d vals[0].val=0x%x vals[0].mask=0x%x vals[0].offset=0x%x", 
 		                   	   name,   nvals,   pgnames[0],   npgnames,   vals[0].val,     vals[0].mask,     vals[0].offset);
Signature · 1 line
2.25.1