Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98b0606e authored by Peter Ujfalusi's avatar Peter Ujfalusi
Browse files

ARM: OMAP: zoom: Zoom2 does not have extmute functionality 



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: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
parent 7b00077a

arch/arm/mach-omap2/board-zoom-peripherals.c

+3 −8
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include "common-board-devices.h"

#include "common-board-devices.h"





#define OMAP_ZOOM_WLAN_PMENA_GPIO	(101)

#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 OMAP_ZOOM_WLAN_IRQ_GPIO		(162)





#define LCD_PANEL_ENABLE_GPIO		(7 + OMAP_MAX_GPIO_LINES)

#define LCD_PANEL_ENABLE_GPIO		(7 + OMAP_MAX_GPIO_LINES)
@@ -264,14 +264,9 @@ static int __init omap_i2c_init(void) 
			TWL_COMMON_PDATA_MADC | TWL_COMMON_PDATA_AUDIO,

			TWL_COMMON_PDATA_MADC | TWL_COMMON_PDATA_AUDIO,

			TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);

			TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);





	if (machine_is_omap_zoom2()) {

	if (machine_is_omap_zoom2())

		struct twl4030_codec_data *codec_data;

		zoom_twldata.audio->codec->ramp_delay_value = 3; /* 161 ms */

		codec_data = zoom_twldata.audio->codec;





		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_pmic_init(1, 2400, "twl5030", 7 + OMAP_INTC_START, &zoom_twldata);

	omap_register_i2c_bus(2, 400, NULL, 0);

	omap_register_i2c_bus(2, 400, NULL, 0);

	omap_register_i2c_bus(3, 400, NULL, 0);

	omap_register_i2c_bus(3, 400, NULL, 0);