[alsa-devel] ASoC update for 2.6.29
The following changes since commit 397d5aeeb5a2c9ca6108899a04b35a51cd904503: Jarkko Nikula (1): ASoC: WM8990: Fix kcontrol's private value use in put callback
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.29
Lopez Cruz, Misael (1): ASoC: Update SDP3430 machine driver for snd_soc_card
sound/soc/omap/sdp3430.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
The following changes since commit 44dd2b9168350b82a671ce71666b99208ab2d973: Philipp Zabel (1): ASoC: pxa2xx-i2s: remove I2S pin setup
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.30
Jarkko Nikula (2): ASoC: TLV320AIC3X: Fix volume ranges ASoC: TLV320AIC3X: Add TLV information for volume controls
Lopez Cruz, Misael (1): ASoC: Update SDP3430 machine driver for snd_soc_card
Mark Brown (1): Merge branch 'for-2.6.29' into for-2.6.30
sound/soc/codecs/tlv320aic3x.c | 114 +++++++++++++++++++++++++-------------- sound/soc/omap/sdp3430.c | 4 +- 2 files changed, 75 insertions(+), 43 deletions(-)
At Tue, 10 Feb 2009 21:52:47 +0000, Mark Brown wrote:
The following changes since commit 397d5aeeb5a2c9ca6108899a04b35a51cd904503: Jarkko Nikula (1): ASoC: WM8990: Fix kcontrol's private value use in put callback
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.29
Pulled both branches. Thanks.
Takashi
Lopez Cruz, Misael (1): ASoC: Update SDP3430 machine driver for snd_soc_card
sound/soc/omap/sdp3430.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
At Tue, 10 Feb 2009 22:12:10 +0000, Mark Brown wrote:
The following changes since commit 44dd2b9168350b82a671ce71666b99208ab2d973: Philipp Zabel (1): ASoC: pxa2xx-i2s: remove I2S pin setup
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.30
BTW, I found some build errors and fixed with the patch below. topic/asoc branch includes this.
Takashi
===
From 9e30d7718bb7402c7bdee631ad2aae2658c324f0 Mon Sep 17 00:00:00 2001 From: Takashi Iwai tiwai@suse.de Date: Wed, 11 Feb 2009 08:28:04 +0100 Subject: [PATCH] ASoC: Fix forgotten replacements of socdev->codec
The snd_soc_codec was moved into socdev->card, but this change wasn't applied in some places. Fixed now.
Signed-off-by: Takashi Iwai tiwai@suse.de --- sound/soc/omap/n810.c | 2 +- sound/soc/pxa/corgi.c | 2 +- sound/soc/pxa/palm27x.c | 2 +- sound/soc/pxa/poodle.c | 2 +- sound/soc/pxa/spitz.c | 2 +- sound/soc/pxa/tosa.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 25593fe..9f037cd 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -72,7 +72,7 @@ static int n810_startup(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_codec *codec = rtd->socdev->codec; + struct snd_soc_codec *codec = rtd->socdev->card->codec;
snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_CHANNELS, 2, 2); diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index 1ba25a5..0d41be3 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c @@ -100,7 +100,7 @@ static void corgi_ext_control(struct snd_soc_codec *codec) static int corgi_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_codec *codec = rtd->socdev->codec; + struct snd_soc_codec *codec = rtd->socdev->card->codec;
/* check the jack status at stream startup */ corgi_ext_control(codec); diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c index 4a9cf30..29958cd 100644 --- a/sound/soc/pxa/palm27x.c +++ b/sound/soc/pxa/palm27x.c @@ -55,7 +55,7 @@ static void palm27x_ext_control(struct snd_soc_codec *codec) static int palm27x_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_codec *codec = rtd->socdev->codec; + struct snd_soc_codec *codec = rtd->socdev->card->codec;
/* check the jack status at stream startup */ palm27x_ext_control(codec); diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index 6e98271..3a62d43 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c @@ -77,7 +77,7 @@ static void poodle_ext_control(struct snd_soc_codec *codec) static int poodle_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_codec *codec = rtd->socdev->codec; + struct snd_soc_codec *codec = rtd->socdev->card->codec;
/* check the jack status at stream startup */ poodle_ext_control(codec); diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index a3b9e6b..1aafd8c 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -109,7 +109,7 @@ static void spitz_ext_control(struct snd_soc_codec *codec) static int spitz_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_codec *codec = rtd->socdev->codec; + struct snd_soc_codec *codec = rtd->socdev->card->codec;
/* check the jack status at stream startup */ spitz_ext_control(codec); diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index c77194f..09b5bad 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c @@ -82,7 +82,7 @@ static void tosa_ext_control(struct snd_soc_codec *codec) static int tosa_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_codec *codec = rtd->socdev->codec; + struct snd_soc_codec *codec = rtd->socdev->card->codec;
/* check the jack status at stream startup */ tosa_ext_control(codec);
participants (3)
-
Mark Brown -
Mark Brown -
Takashi Iwai