pinctrl: single: set function name when adding function
authorDrew Fustini <drew@beagleboard.org>
Mon, 25 Jan 2021 20:35:43 +0000 (12:35 -0800)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 12 Feb 2021 12:44:26 +0000 (13:44 +0100)
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 <jkridner@beagleboard.org>
Cc: Robert Nelson <robertcnelson@beagleboard.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Drew Fustini <drew@beagleboard.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Link: https://lore.kernel.org/r/20210125203542.51513-1-drew@beagleboard.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-single.c

index f3cd7e2967126afc798ed60880a07a2e7f8bb141..7771316dfffab78acf41e601415e9cc2b531d83d 100644 (file)
@@ -777,6 +777,7 @@ static int pcs_add_function(struct pcs_device *pcs,
 
        function->vals = vals;
        function->nvals = nvals;
+       function->name = name;
 
        selector = pinmux_generic_add_function(pcs->pctl, name,
                                               pgnames, npgnames,