diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2013-11-13 09:56:55 +0530 |
|---|---|---|
| committer | Laxman Dewangan <ldewangan@nvidia.com> | 2013-11-13 00:33:24 -0800 |
| commit | b5ea21e356a03614d3544bbc56acc0dcf3fa942a (patch) | |
| tree | 8584f22e0d85221cfa38a8a2b37ffaeaf3c5f74f /drivers/pinctrl | |
| parent | 0c6ac4b6c0ceba564df356aaea7973db31647bd5 (diff) | |
pinctrl: tegra: correct pincontrol driver group name for soc table.
Correct the pincontrol driver group name of Tegra114 and Tegra124 on
soc specific initialisation table.
Change-Id: I3af8028aae3edfaade727a41f8c7c94ca4e859f2
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/329990
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/pinctrl-tegra.h | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/pinctrl-tegra114.c | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/pinctrl-tegra124.c | 30 |
3 files changed, 17 insertions, 17 deletions
diff --git a/drivers/pinctrl/pinctrl-tegra.h b/drivers/pinctrl/pinctrl-tegra.h index 69699f64e8ad..53eb32c58d1e 100644 --- a/drivers/pinctrl/pinctrl-tegra.h +++ b/drivers/pinctrl/pinctrl-tegra.h @@ -197,7 +197,7 @@ void tegra_pinctrl_writel(u32 val, u32 bank, u32 reg); _pulldn_drive, _pullup_drive, _pulldn_slew, _pullup_slew, \ _drive_type) \ { \ - .name = _name, \ + .name = "drive_"#_name, \ .high_speed_mode = _hsm, \ .schmitt = _schmitt, \ .low_power_mode = _drive, \ diff --git a/drivers/pinctrl/pinctrl-tegra114.c b/drivers/pinctrl/pinctrl-tegra114.c index a5d8d48f9b71..4113189053ff 100644 --- a/drivers/pinctrl/pinctrl-tegra114.c +++ b/drivers/pinctrl/pinctrl-tegra114.c @@ -2800,7 +2800,7 @@ static const struct tegra_pingroup tegra114_groups[] = { }; static struct tegra_pinctrl_group_config_data t114_pin_drive_group_soc_data[] = { - TEGRA_PINCTRL_SET_DRIVE("at2", 0, 0, 0, 48, 55, 0, 0, 0), + TEGRA_PINCTRL_SET_DRIVE(at2, 0, 0, 0, 48, 55, 0, 0, 0), }; static const struct tegra_pinctrl_soc_data tegra114_pinctrl = { diff --git a/drivers/pinctrl/pinctrl-tegra124.c b/drivers/pinctrl/pinctrl-tegra124.c index f5ae9f6a00e9..a92897f7114d 100644 --- a/drivers/pinctrl/pinctrl-tegra124.c +++ b/drivers/pinctrl/pinctrl-tegra124.c @@ -3166,21 +3166,21 @@ static void tegra124_pinctrl_resume(u32 *pg_data) } static struct tegra_pinctrl_group_config_data t124_pin_drv_group_soc_data[] = { - TEGRA_PINCTRL_SET_DRIVE("dap2", 0, 1, 3, 5, 6, 0, 0, 0), - TEGRA_PINCTRL_SET_DRIVE("dap1", 0, 1, 3, 5, 6, 0, 0, 0), - TEGRA_PINCTRL_SET_DRIVE("dap3", 0, 1, 3, 5, 6, 0, 0, 0), - TEGRA_PINCTRL_SET_DRIVE("dap4", 0, 1, 3, 5, 6, 0, 0, 0), - TEGRA_PINCTRL_SET_DRIVE("dap5", 0, 1, 3, 5, 6, 0, 0, 0), - TEGRA_PINCTRL_SET_DRIVE("dbg", 1, 1, 0, 5, 5, 0, 0, 0), - TEGRA_PINCTRL_SET_DRIVE("at5", 1, 1, 0, 5, 5, 0, 0, 0), - TEGRA_PINCTRL_SET_DRIVE("gme", 1, 1, 0, 5, 5, 0, 0, 0), - TEGRA_PINCTRL_SET_DRIVE("ddc", 1, 1, 0, 5, 5, 0, 0, 0), - TEGRA_PINCTRL_SET_DRIVE("ao1", 1, 1, 0, 5, 5, 0, 0, 0), - TEGRA_PINCTRL_SET_DRIVE("uart2", 0, 0, 3, 0, 0, 3, 3, 0), - TEGRA_PINCTRL_SET_DRIVE("uart3", 0, 0, 3, 0, 0, 3, 3, 0), - TEGRA_PINCTRL_SET_DRIVE("at2", 0, 0, 0, 55, 63, 0, 0, 0), - TEGRA_PINCTRL_SET_DRIVE("uda", 0, 0, 0, 23, 23, 3, 3, 0), - TEGRA_PINCTRL_SET_DRIVE("uaa", 0, 0, 0, 23, 23, 3, 3, 0), + TEGRA_PINCTRL_SET_DRIVE(dap2, 0, 1, 3, 5, 6, 0, 0, 0), + TEGRA_PINCTRL_SET_DRIVE(dap1, 0, 1, 3, 5, 6, 0, 0, 0), + TEGRA_PINCTRL_SET_DRIVE(dap3, 0, 1, 3, 5, 6, 0, 0, 0), + TEGRA_PINCTRL_SET_DRIVE(dap4, 0, 1, 3, 5, 6, 0, 0, 0), + TEGRA_PINCTRL_SET_DRIVE(dap5, 0, 1, 3, 5, 6, 0, 0, 0), + TEGRA_PINCTRL_SET_DRIVE(dbg, 1, 1, 0, 5, 5, 0, 0, 0), + TEGRA_PINCTRL_SET_DRIVE(at5, 1, 1, 0, 5, 5, 0, 0, 0), + TEGRA_PINCTRL_SET_DRIVE(gme, 1, 1, 0, 5, 5, 0, 0, 0), + TEGRA_PINCTRL_SET_DRIVE(ddc, 1, 1, 0, 5, 5, 0, 0, 0), + TEGRA_PINCTRL_SET_DRIVE(ao1, 1, 1, 0, 5, 5, 0, 0, 0), + TEGRA_PINCTRL_SET_DRIVE(uart2, 0, 0, 3, 0, 0, 3, 3, 0), + TEGRA_PINCTRL_SET_DRIVE(uart3, 0, 0, 3, 0, 0, 3, 3, 0), + TEGRA_PINCTRL_SET_DRIVE(at2, 0, 0, 0, 55, 63, 0, 0, 0), + TEGRA_PINCTRL_SET_DRIVE(uda, 0, 0, 0, 23, 23, 3, 3, 0), + TEGRA_PINCTRL_SET_DRIVE(uaa, 0, 0, 0, 23, 23, 3, 3, 0), }; static const struct tegra_pinctrl_soc_data tegra124_pinctrl = { |