diff options
| author | Sumit Bhattacharya <sumitb@nvidia.com> | 2011-03-10 04:26:41 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-03-17 21:38:00 -0800 |
| commit | 6eacb310350b0a42ef23b9e982411f066707938e (patch) | |
| tree | f6657d656df93c55531ff79443cd2d7d82a35ee1 /arch | |
| parent | 00a42778170bb81624a675725e5c8f5f686a172c (diff) | |
[ARM] Tegra:Handle DAP tristate properly
We should not tristate CDEV1 pinmux from dap driver. We should tristate
all the DAP pinmuxes while not in use.
Change-Id: I7865d96011a7fb03b4dacee2c7bba03ee36c0b7d
Reviewed-on: http://git-master/r/22329
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>
Reviewed-by: Vijay Mali <vmali@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/tegra_das.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/tegra_das.c b/arch/arm/mach-tegra/tegra_das.c index 66dfc1da7597..ace8d301bae8 100644 --- a/arch/arm/mach-tegra/tegra_das.c +++ b/arch/arm/mach-tegra/tegra_das.c @@ -250,10 +250,12 @@ static int das_set_pin_state(bool normal) /* Enable the DAP outputs */ tegra_pinmux_set_tristate(TEGRA_PINGROUP_DAP1, TEGRA_TRI_NORMAL); - tegra_pinmux_set_tristate(TEGRA_PINGROUP_CDEV1, - TEGRA_TRI_NORMAL); - tegra_pinmux_set_tristate(TEGRA_PINGROUP_CDEV2, - TEGRA_TRI_NORMAL); + tegra_pinmux_set_tristate(TEGRA_PINGROUP_DAP2, + TEGRA_TRI_NORMAL); + tegra_pinmux_set_tristate(TEGRA_PINGROUP_DAP3, + TEGRA_TRI_NORMAL); + tegra_pinmux_set_tristate(TEGRA_PINGROUP_DAP4, + TEGRA_TRI_NORMAL); } das_drv_data->tristate_count++; } else { @@ -262,9 +264,11 @@ static int das_set_pin_state(bool normal) if (das_drv_data->tristate_count == 0) { tegra_pinmux_set_tristate(TEGRA_PINGROUP_DAP1, TEGRA_TRI_TRISTATE); - tegra_pinmux_set_tristate(TEGRA_PINGROUP_CDEV1, + tegra_pinmux_set_tristate(TEGRA_PINGROUP_DAP2, + TEGRA_TRI_TRISTATE); + tegra_pinmux_set_tristate(TEGRA_PINGROUP_DAP3, TEGRA_TRI_TRISTATE); - tegra_pinmux_set_tristate(TEGRA_PINGROUP_CDEV2, + tegra_pinmux_set_tristate(TEGRA_PINGROUP_DAP4, TEGRA_TRI_TRISTATE); } } |