shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

[ARM] tegra: stingray: CHG_DISABLE is connected to PS7 on P2

Browse Source 
On P2 hardware, PS7 is now connected to CHG_DISABLE.  HS_DET_EN has not
been connected (or needed) since M1, so audio should not be controlling
PS7.

Change-Id: I19b96295cb956bffdd1f4b0e7ba48b1a0bec3242
Signed-off-by: Greg Meiste <w30289@motorola.com>
This commit is contained in:
Greg Meiste
2010-08-31 11:56:55 -05:00
committed by Colin Cross
parent c4f99cbeb9
commit d6f7c9b3c7
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm/mach-tegra/board-stingray.c
View File

@@ -258,7 +258,7 @@ static struct cpcap_audio_platform_data cpcap_audio_pdata = {
.regulator = "vaudio",
.state = &stingray_cpcap_audio_state,
.speaker_gpio = TEGRA_GPIO_PR3,
.headset_gpio = TEGRA_GPIO_PS7,
.headset_gpio = -1,
};
static struct platform_device cpcap_audio_device = {
@@ -942,10 +942,17 @@ static void __init tegra_stingray_init(void)
gpio_direction_input(TEGRA_GPIO_PD1);
gpio_export(TEGRA_GPIO_PD1, false);
tegra_gpio_enable(TEGRA_GPIO_PI4);
gpio_request(TEGRA_GPIO_PI4, "chg_disable");
gpio_direction_output(TEGRA_GPIO_PI4, 0);
gpio_export(TEGRA_GPIO_PI4, false);
if (stingray_revision() >= STINGRAY_REVISION_P2) {
tegra_gpio_enable(TEGRA_GPIO_PS7);
gpio_request(TEGRA_GPIO_PS7, "chg_disable");
gpio_direction_output(TEGRA_GPIO_PS7, 0);
gpio_export(TEGRA_GPIO_PS7, false);
} else {
tegra_gpio_enable(TEGRA_GPIO_PI4);
gpio_request(TEGRA_GPIO_PI4, "chg_disable");
gpio_direction_output(TEGRA_GPIO_PI4, 0);
gpio_export(TEGRA_GPIO_PI4, false);
}
}
/* Enable charge LEDs */