pinctrl: tegra: fix pinconfig_group_set

Prepare config using param parameter to generate the right
value for pinmux register

Bug 200033491

Change-Id: I973cc449e8cf89cb3b6f5b5da1021d21d193b47d
Signed-off-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-on: http://git-master/r/496827
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

diff --git a/drivers/pinctrl/pinctrl-tegra.c b/drivers/pinctrl/pinctrl-tegra.c
index 5c091098e51a90be448c8b6a1ebc701d6dafbb5c..c922b4ba8e2bb687e24c510aecf9f59e7d79227e 100644 (file)
--- a/drivers/pinctrl/pinctrl-tegra.c
+++ b/drivers/pinctrl/pinctrl-tegra.c
@@ -378,13 +378,13 @@ static int tegra_pinctrl_get_func_groups(struct pinctrl_dev *pctldev,
        return 0;
 }
 
-static int tegra_pinconfig_froup_set(struct pinctrl_dev *pctldev,
+static int tegra_pinconfig_group_set(struct pinctrl_dev *pctldev,
                unsigned group, unsigned long param, unsigned long arg)
 {
        unsigned long config;
        int ret;
 
-       config = TEGRA_PINCONF_PACK(TEGRA_PINCONF_PARAM_TRISTATE, arg);
+       config = TEGRA_PINCONF_PACK(param, arg);
        ret = tegra_pinconf_group_set(pctldev, group, &config, 1);
        if (ret < 0)
                dev_err(pctldev->dev,
@@ -412,10 +412,10 @@ static int tegra_pinctrl_enable(struct pinctrl_dev *pctldev, unsigned req_functi
        switch (req_function) {
        case TEGRA_PINMUX_SPECIAL_UNUSED:
                /* Set tristate =1 and input = 0 for unused pins */
-               ret = tegra_pinconfig_froup_set(pctldev, group,
+               ret = tegra_pinconfig_group_set(pctldev, group,
                                        TEGRA_PINCONF_PARAM_TRISTATE, 1);
                if (!ret)
-                       ret = tegra_pinconfig_froup_set(pctldev, group,
+                       ret = tegra_pinconfig_group_set(pctldev, group,
                                        TEGRA_PINCONF_PARAM_ENABLE_INPUT, 0);
                return ret;
 
@@ -486,10 +486,10 @@ static int tegra_pinctrl_gpio_set_direction (struct pinctrl_dev *pctldev,
         * tristate = 0 for output direction.
         */
        if (input)
-               ret = tegra_pinconfig_froup_set(pctldev, group,
+               ret = tegra_pinconfig_group_set(pctldev, group,
                                        TEGRA_PINCONF_PARAM_ENABLE_INPUT, 1);
        else
-               ret = tegra_pinconfig_froup_set(pctldev, group,
+               ret = tegra_pinconfig_group_set(pctldev, group,
                                        TEGRA_PINCONF_PARAM_TRISTATE, 0);
        return ret;
 }