]> git.baikalelectronics.ru Git - kernel.git/commit
ARM: Tegra: Harmony: Fix conflicting GPIO numbering
authorStephen Warren <swarren@nvidia.com>
Tue, 31 May 2011 21:14:07 +0000 (15:14 -0600)
committerColin Cross <ccross@android.com>
Sat, 4 Jun 2011 22:51:52 +0000 (15:51 -0700)
commitb74d8ab429a0c3638259ed0347e8825d251cde16
tree7b5650560a494b171a9b8e6a70bdbd530f6f243e
parent3b24354d6b4d6dca68bf2d843614879fde6d390a
ARM: Tegra: Harmony: Fix conflicting GPIO numbering

Currently, both the WM8903 and TPS6586x chips attempt to register with
gpiolib using the same GPIO numbers. This causes the audio driver to
fail to initialize.

To solve this, add a define to board-harmony.h for the TPS6586x, and make
board-harmony-power.c use this define, instead of directly referencing
TEGRA_NR_GPIOS.

This fixes a regression introduced by commit
acffa03aed1cb27151bdb5fc9ac0ac561db265f0.
ARM: tegra: harmony: initialize the TPS65862 PMIC

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Colin Cross <ccross@android.com>
arch/arm/mach-tegra/board-harmony-power.c
arch/arm/mach-tegra/board-harmony.h