diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-12-31 05:51:47 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-02 08:04:25 -0500 |
commit | fff3dd40132d6106d4d2a61e70e782f82394fd17 (patch) | |
tree | 9c4f006bd8c62cf2913098585d1ee18a7d3c861b | |
parent | 5712ded9cf0b6981825af3c86e0059be93e5e17c (diff) |
ASoC: sdp3430: No need to configure pin mux for extmute
The codec driver takes care of this.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/omap/sdp3430.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c index f2e26512d2a0..216cbdd569e7 100644 --- a/sound/soc/omap/sdp3430.c +++ b/sound/soc/omap/sdp3430.c | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | #include <linux/clk.h> | 25 | #include <linux/clk.h> |
26 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
27 | #include <linux/i2c/twl.h> | ||
28 | #include <sound/core.h> | 27 | #include <sound/core.h> |
29 | #include <sound/pcm.h> | 28 | #include <sound/pcm.h> |
30 | #include <sound/soc.h> | 29 | #include <sound/soc.h> |
@@ -32,20 +31,12 @@ | |||
32 | 31 | ||
33 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
34 | #include <linux/platform_data/gpio-omap.h> | 33 | #include <linux/platform_data/gpio-omap.h> |
35 | #include <linux/platform_data/asoc-ti-mcbsp.h> | ||
36 | 34 | ||
37 | /* Register descriptions for twl4030 codec part */ | ||
38 | #include <linux/mfd/twl4030-audio.h> | ||
39 | #include <linux/module.h> | 35 | #include <linux/module.h> |
40 | 36 | ||
41 | #include "omap-mcbsp.h" | 37 | #include "omap-mcbsp.h" |
42 | #include "omap-pcm.h" | 38 | #include "omap-pcm.h" |
43 | 39 | ||
44 | /* TWL4030 PMBR1 Register */ | ||
45 | #define TWL4030_INTBR_PMBR1 0x0D | ||
46 | /* TWL4030 PMBR1 Register GPIO6 mux bit */ | ||
47 | #define TWL4030_GPIO6_PWM0_MUTE(value) (value << 2) | ||
48 | |||
49 | static struct snd_soc_card snd_soc_sdp3430; | 40 | static struct snd_soc_card snd_soc_sdp3430; |
50 | 41 | ||
51 | static int sdp3430_hw_params(struct snd_pcm_substream *substream, | 42 | static int sdp3430_hw_params(struct snd_pcm_substream *substream, |
@@ -212,7 +203,6 @@ static struct platform_device *sdp3430_snd_device; | |||
212 | static int __init sdp3430_soc_init(void) | 203 | static int __init sdp3430_soc_init(void) |
213 | { | 204 | { |
214 | int ret; | 205 | int ret; |
215 | u8 pin_mux; | ||
216 | 206 | ||
217 | if (!machine_is_omap_3430sdp()) | 207 | if (!machine_is_omap_3430sdp()) |
218 | return -ENODEV; | 208 | return -ENODEV; |
@@ -226,14 +216,6 @@ static int __init sdp3430_soc_init(void) | |||
226 | 216 | ||
227 | platform_set_drvdata(sdp3430_snd_device, &snd_soc_sdp3430); | 217 | platform_set_drvdata(sdp3430_snd_device, &snd_soc_sdp3430); |
228 | 218 | ||
229 | /* Set TWL4030 GPIO6 as EXTMUTE signal */ | ||
230 | twl_i2c_read_u8(TWL4030_MODULE_INTBR, &pin_mux, | ||
231 | TWL4030_INTBR_PMBR1); | ||
232 | pin_mux &= ~TWL4030_GPIO6_PWM0_MUTE(0x03); | ||
233 | pin_mux |= TWL4030_GPIO6_PWM0_MUTE(0x02); | ||
234 | twl_i2c_write_u8(TWL4030_MODULE_INTBR, pin_mux, | ||
235 | TWL4030_INTBR_PMBR1); | ||
236 | |||
237 | ret = platform_device_add(sdp3430_snd_device); | 219 | ret = platform_device_add(sdp3430_snd_device); |
238 | if (ret) | 220 | if (ret) |
239 | goto err1; | 221 | goto err1; |