From 22441900f485acb029e317e57f7ba2dcf3e69f52 Mon Sep 17 00:00:00 2001 From: Bibek Basu Date: Tue, 9 Sep 2014 14:48:12 +0530 Subject: [PATCH] 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 Reviewed-on: http://git-master/r/496827 (cherry picked from commit 418c027e40353a4b99fe7fcfbc0743de7e07d15c) Reviewed-on: http://git-master/r/498329 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Venkat Moganty Reviewed-by: Matthew Pedro --- drivers/pinctrl/pinctrl-tegra.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/pinctrl-tegra.c b/drivers/pinctrl/pinctrl-tegra.c index 5f3a11016d8..04132e02654 100644 --- a/drivers/pinctrl/pinctrl-tegra.c +++ b/drivers/pinctrl/pinctrl-tegra.c @@ -373,13 +373,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); if (ret < 0) dev_err(pctldev->dev, @@ -495,10 +495,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; } -- 2.39.2