Skip to content

Commit

Permalink
ARM: OMAP: zoom: Zoom2 does not have extmute functionality
Browse files Browse the repository at this point in the history
The HS extmute is not used on Zoom2 boards. Furthermore the GPIO153 is used
as IRQ for the TSC2004 touchscreen controller - for which we do not have
driver upstream, yet.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
  • Loading branch information
Peter Ujfalusi committed Jan 22, 2013
1 parent 7b00077 commit 98b0606
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions arch/arm/mach-omap2/board-zoom-peripherals.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "common-board-devices.h"

#define OMAP_ZOOM_WLAN_PMENA_GPIO (101)
#define ZOOM2_HEADSET_EXTMUTE_GPIO (153)
#define OMAP_ZOOM_TSC2004_IRQ_GPIO (153)
#define OMAP_ZOOM_WLAN_IRQ_GPIO (162)

#define LCD_PANEL_ENABLE_GPIO (7 + OMAP_MAX_GPIO_LINES)
Expand Down Expand Up @@ -264,14 +264,9 @@ static int __init omap_i2c_init(void)
TWL_COMMON_PDATA_MADC | TWL_COMMON_PDATA_AUDIO,
TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);

if (machine_is_omap_zoom2()) {
struct twl4030_codec_data *codec_data;
codec_data = zoom_twldata.audio->codec;
if (machine_is_omap_zoom2())
zoom_twldata.audio->codec->ramp_delay_value = 3; /* 161 ms */

codec_data->ramp_delay_value = 3; /* 161 ms */
codec_data->hs_extmute = 1;
codec_data->hs_extmute_gpio = ZOOM2_HEADSET_EXTMUTE_GPIO;
}
omap_pmic_init(1, 2400, "twl5030", 7 + OMAP_INTC_START, &zoom_twldata);
omap_register_i2c_bus(2, 400, NULL, 0);
omap_register_i2c_bus(3, 400, NULL, 0);
Expand Down

0 comments on commit 98b0606

Please sign in to comment.