diff options
| author | Sumit Bhattacharya <sumitb@nvidia.com> | 2011-11-21 18:42:52 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:50:14 -0800 |
| commit | 8413a501cfde39be20e5adadcb26d16b307a75df (patch) | |
| tree | 6d3ce1e279c6758ac3bbaf29935788bafe1e47ff /arch/arm | |
| parent | 4e6da2b12221784e83b4f4e078ef284d8b613d32 (diff) | |
arm: tegra: whistler: Remove wrong spkr_en gpio entry
WM8753 spkr_en gpio entry was added mistakenly. Whistler-WM8753 audio
module does not have any gpio for enabling speaker.
Bug 872652
Change-Id: I4c5032f0b9224275ba4f4b4aba5b94e80ec7f99d
Signed-off-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-on: http://git-master/r/66092
Reviewed-by: Scott Peterson <speterson@nvidia.com>
Rebase-Id: R1c3602f38712e8d3d43c1175f06596e4e2d2eece
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler-pinmux.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler.h | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/board-whistler-pinmux.c b/arch/arm/mach-tegra/board-whistler-pinmux.c index 5dc8b7910d3f..12e9975061ca 100644 --- a/arch/arm/mach-tegra/board-whistler-pinmux.c +++ b/arch/arm/mach-tegra/board-whistler-pinmux.c @@ -164,7 +164,6 @@ static __initdata struct tegra_pingroup_config whistler_pinmux[] = { static struct tegra_gpio_table gpio_table[] = { { .gpio = TEGRA_GPIO_HP_DET, .enable = true }, - { .gpio = TEGRA_GPIO_SPKR_EN, .enable = true }, }; int __init whistler_pinmux_init(void) diff --git a/arch/arm/mach-tegra/board-whistler.c b/arch/arm/mach-tegra/board-whistler.c index 503800abf48b..91e39ebdbe66 100644 --- a/arch/arm/mach-tegra/board-whistler.c +++ b/arch/arm/mach-tegra/board-whistler.c @@ -372,7 +372,7 @@ static struct platform_device tegra_camera = { }; static struct tegra_wm8753_platform_data whistler_audio_pdata = { - .gpio_spkr_en = TEGRA_GPIO_SPKR_EN, + .gpio_spkr_en = -1, .gpio_hp_det = TEGRA_GPIO_HP_DET, .gpio_hp_mute = -1, .gpio_int_mic_en = -1, diff --git a/arch/arm/mach-tegra/board-whistler.h b/arch/arm/mach-tegra/board-whistler.h index 69d4dd21a558..8ceb5dd53f8d 100644 --- a/arch/arm/mach-tegra/board-whistler.h +++ b/arch/arm/mach-tegra/board-whistler.h @@ -31,8 +31,6 @@ int whistler_emc_init(void); #define MAX8907C_INT_END (MAX8907C_INT_BASE + 31) /* Audio-related GPIOs */ -#define WHISTLER_GPIO_WM8753(_x_) (MAX8907C_INT_END + 1 + (_x_)) -#define TEGRA_GPIO_SPKR_EN WHISTLER_GPIO_WM8753(2) #define TEGRA_GPIO_HP_DET TEGRA_GPIO_PW3 #endif |