diff options
| author | NeilBrown <neilb@suse.de> | 2012-12-02 14:57:40 +1100 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-03-09 15:36:22 +0100 |
| commit | 5bb1585e1e4535261ef280b90a1ec87f92473d76 (patch) | |
| tree | f6c123d13c9cd8651cf9d1a1f6629b96621c76d6 | |
| parent | 11d773076fb5d0d6b8b2a497e103d756384caccb (diff) | |
| download | kernel_goldelico_gta04-5bb1585e1e4535261ef280b90a1ec87f92473d76.zip kernel_goldelico_gta04-5bb1585e1e4535261ef280b90a1ec87f92473d76.tar.gz kernel_goldelico_gta04-5bb1585e1e4535261ef280b90a1ec87f92473d76.tar.bz2 | |
Update codecs for 3.7
Changes to include files and some other magic.
Signed-off-by: NeilBrown <neilb@suse.de>
| -rw-r--r-- | sound/soc/omap/gta04-audio.c | 1 | ||||
| -rw-r--r-- | sound/soc/omap/gta04-voice.c | 20 |
2 files changed, 0 insertions, 21 deletions
diff --git a/sound/soc/omap/gta04-audio.c b/sound/soc/omap/gta04-audio.c index 67867f0..d998aae 100644 --- a/sound/soc/omap/gta04-audio.c +++ b/sound/soc/omap/gta04-audio.c @@ -31,7 +31,6 @@ #include <asm/mach-types.h> #include <mach/hardware.h> #include <mach/gpio.h> -#include <plat/mcbsp.h> #include "omap-mcbsp.h" #include "omap-pcm.h" diff --git a/sound/soc/omap/gta04-voice.c b/sound/soc/omap/gta04-voice.c index 40e672e..c2c7619 100644 --- a/sound/soc/omap/gta04-voice.c +++ b/sound/soc/omap/gta04-voice.c @@ -56,26 +56,6 @@ static int gta04_voice_hw_params(struct snd_pcm_substream *substream, return ret; } -#if 0 // for testing we switch to output - don't use on a board with GTM601 installed!!! - ret = snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_SYSCLK_CLK, 26000000, - SND_SOC_CLOCK_OUT); - // set divider... -#else - ret = snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_SYSCLK_CLKX_EXT, 0, - SND_SOC_CLOCK_IN); - if(cpu_dai == 0) { - /* - * could be necessary if we connect to McBSP1 - but we are on McBSP4 - * see http://mailman.alsa-project.org/pipermail/alsa-devel/2009-August/020771.html - */ - if(ret >= 0) - ret = snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_CLKR_SRC_CLKX, 0, - SND_SOC_CLOCK_IN); - if(ret >= 0) - ret = snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_FSR_SRC_FSX, 0, - SND_SOC_CLOCK_IN); - } -#endif if (ret < 0) { printk(KERN_ERR "can't set cpu system clock\n"); return ret; |