aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Jiejing <jiejing.zhang@freescale.com>2011-04-15 10:02:33 +0800
committerRichard Zhao <richard.zhao@freescale.com>2011-04-19 15:03:53 +0800
commit1d317c12c5bbb06608e29a6fc7874c6ec8b4b9a8 (patch)
tree09452b5d3b4cf41ea31240f90a374750a343a643
parentc5fa556f761bfb6682dabcc04f776c5c66ac76a8 (diff)
downloadlinux-linaro-natty-1d317c12c5bbb06608e29a6fc7874c6ec8b4b9a8.tar.gz
ENGR00137340-2 MX53_SMD: add headphone detection support.
add headphone gpio in imx sound card platform data. delete old method of headphone detection codec. Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com> Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
-rw-r--r--arch/arm/mach-mx5/board-mx53_smd.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-mx5/board-mx53_smd.c b/arch/arm/mach-mx5/board-mx53_smd.c
index 281320b48e36..4780d4898db3 100644
--- a/arch/arm/mach-mx5/board-mx53_smd.c
+++ b/arch/arm/mach-mx5/board-mx53_smd.c
@@ -580,10 +580,6 @@ static int smd_sgtl5000_init(void)
{
smd_audio_data.sysclk = 22579200;
- /* headphone_det_b */
- gpio_request(MX53_SMD_HEADPHONE_DEC, "headphone-dec");
- gpio_direction_input(MX53_SMD_HEADPHONE_DEC);
-
/* Enable OSC_CKIH1_EN for audio */
gpio_request(MX53_SMD_OSC_CKIH1_EN, "osc-en");
gpio_direction_output(MX53_SMD_OSC_CKIH1_EN, 1);
@@ -595,6 +591,8 @@ static struct mxc_audio_platform_data smd_audio_data = {
.src_port = 2,
.ext_port = 5,
.init = smd_sgtl5000_init,
+ .hp_gpio = MX53_SMD_HEADPHONE_DEC,
+ .hp_active_low = 1,
};
static struct platform_device smd_audio_device = {