diff options
| author | Sachin Nikam <snikam@nvidia.com> | 2011-09-16 14:58:26 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:48:56 -0800 |
| commit | b2df78dadbbda446e579050b7911fc41c2e35961 (patch) | |
| tree | c46c3f44d2100611027703185edde48fce76fa46 /arch/arm/mach-tegra/board-enterprise.c | |
| parent | 594005171c28bb8367a780ce818bd3d544aa5445 (diff) | |
arm: tegra: enterprise: correct gpio for atmel touch
Using the correct GPIO number for "atmel-irq" which conflits with mpu3050 irq.
Due to the double usage of gpio_request for same gpio number mpu3050 was failing
to register on i2c.
Change-Id: I08a323e56ec29383517621bd36a0995ce2d93eb2
Signed-off-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-on: http://git-master/r/52858
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Joseph Lehrer <jlehrer@nvidia.com>
Tested-by: Joseph Lehrer <jlehrer@nvidia.com>
Rebase-Id: Rcc277b7b8aaa0fe32f0a56403981c0ad59aedfef
Diffstat (limited to 'arch/arm/mach-tegra/board-enterprise.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c index 310fd97629db..a3b9f1e676cf 100644 --- a/arch/arm/mach-tegra/board-enterprise.c +++ b/arch/arm/mach-tegra/board-enterprise.c @@ -565,7 +565,7 @@ static int __init enterprise_touch_init(void) tegra_gpio_enable(TEGRA_GPIO_PF5); gpio_request(TEGRA_GPIO_PH6, "atmel-irq"); - gpio_direction_input(TEGRA_GPIO_PH4); + gpio_direction_input(TEGRA_GPIO_PH6); gpio_request(TEGRA_GPIO_PF5, "atmel-reset"); gpio_direction_output(TEGRA_GPIO_PF5, 0); |