diff options
| author |   Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-12-03 09:39:08 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-03 17:51:59 +0900 |
| commit | 5f02ee568031fb4f0d0ac1dc9c776c34d4683c67 (patch) | |
| tree | 95c650f3605f0c752d6b7be905351d867d6a58c6 /sound/soc/omap | |
| parent | ASoC: omap-abe-twl6040: Use "ti,jack-detection" DT property as boolean (diff) | |
| download | linux-dev-5f02ee568031fb4f0d0ac1dc9c776c34d4683c67.tar.xz linux-dev-5f02ee568031fb4f0d0ac1dc9c776c34d4683c67.zip | |
ASoC: zoom2: Remove HS mux GPIO handling to avoid kernel crash due to BUG_ON()
The machine driver try to use GPIO15 of twl4030 for HS MUX which supposed to
select between TWL's HSOL/R and tlv320aic3254's HPL/R.
The TWL's GPIO allocated dynamically so the (OMAP_MAX_GPIO_LINES + 15) is no
longer valid GPIO number causing a kernel crash due to BUG_ON()
Also the current machine driver supports only TWL audio currently: there is
no need to control the GPIO.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/zoom2.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c index 1ff6bb9ade5c..771bff27ac3e 100644 --- a/sound/soc/omap/zoom2.c +++ b/sound/soc/omap/zoom2.c @@ -37,8 +37,6 @@ #include "omap-mcbsp.h" #include "omap-pcm.h" -#define ZOOM2_HEADSET_MUX_GPIO (OMAP_MAX_GPIO_LINES + 15) - static int zoom2_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -187,9 +185,6 @@ static int __init zoom2_soc_init(void) if (ret) goto err1; - BUG_ON(gpio_request(ZOOM2_HEADSET_MUX_GPIO, "hs_mux") < 0); - gpio_direction_output(ZOOM2_HEADSET_MUX_GPIO, 0); - return 0; err1: @@ -202,8 +197,6 @@ module_init(zoom2_soc_init); static void __exit zoom2_soc_exit(void) { - gpio_free(ZOOM2_HEADSET_MUX_GPIO); - platform_device_unregister(zoom2_snd_device); } module_exit(zoom2_soc_exit); |