kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ASoC: sdp3430: No need to configure pin mux for extmute

Browse source 
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>
This commit is contained in:
Peter Ujfalusi 2012-12-31 11:51:47 +01:00 committed by Mark Brown
parent 5712ded9cf
commit fff3dd4013
1 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sound/soc/omap/sdp3430.c
View file

@ -24,7 +24,6 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/i2c/twl.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/soc.h> #include <sound/soc.h>
@ -32,20 +31,12 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/gpio-omap.h>
#include <linux/platform_data/asoc-ti-mcbsp.h>
/* Register descriptions for twl4030 codec part */
#include <linux/mfd/twl4030-audio.h>
#include <linux/module.h> #include <linux/module.h>
#include "omap-mcbsp.h" #include "omap-mcbsp.h"
#include "omap-pcm.h" #include "omap-pcm.h"
/* TWL4030 PMBR1 Register */
#define TWL4030_INTBR_PMBR1 0x0D
/* TWL4030 PMBR1 Register GPIO6 mux bit */
#define TWL4030_GPIO6_PWM0_MUTE(value) (value << 2)
static struct snd_soc_card snd_soc_sdp3430; static struct snd_soc_card snd_soc_sdp3430;
static int sdp3430_hw_params(struct snd_pcm_substream *substream, static int sdp3430_hw_params(struct snd_pcm_substream *substream,
@ -212,7 +203,6 @@ static struct platform_device *sdp3430_snd_device;
static int __init sdp3430_soc_init(void) static int __init sdp3430_soc_init(void)
{ {
int ret; int ret;
u8 pin_mux;
if (!machine_is_omap_3430sdp()) if (!machine_is_omap_3430sdp())
return -ENODEV; return -ENODEV;
@ -226,14 +216,6 @@ static int __init sdp3430_soc_init(void)
platform_set_drvdata(sdp3430_snd_device, &snd_soc_sdp3430); platform_set_drvdata(sdp3430_snd_device, &snd_soc_sdp3430);
/* Set TWL4030 GPIO6 as EXTMUTE signal */
twl_i2c_read_u8(TWL4030_MODULE_INTBR, &pin_mux,
TWL4030_INTBR_PMBR1);
pin_mux &= ~TWL4030_GPIO6_PWM0_MUTE(0x03);
pin_mux |= TWL4030_GPIO6_PWM0_MUTE(0x02);
twl_i2c_write_u8(TWL4030_MODULE_INTBR, pin_mux,
TWL4030_INTBR_PMBR1);
ret = platform_device_add(sdp3430_snd_device); ret = platform_device_add(sdp3430_snd_device);
if (ret) if (ret)
goto err1; goto err1;