ASoC updates

ASoC updates

[Mark Brown]

The following changes since commit 2e2ed79f64e935540b0d148f7e2c3ebefafe133e:
  Vladimir Barinov (1):
        ALSA: Correct Vladimir Barinov's e-mail address

are available in the git repository at:

  git://opensource.wolfsonmicro.com/linux-2.6-asoc for-tiwai

Of these only the patch from Rob is 2.6.27 material.

Arun KS (1):
      ASoC: Add destination and source port for DMA on OMAP1

Frank Mandarino (1):
      ASoC: Remove references to Endrelia ETI-B1 board

Jonas Bonn (2):
      ASoC: Add widgets before setting endpoints on GTA01
      ASoC: Drop device registration from GTA01 lm4857 driver

Rob Sims (1):
      ASoC: Set correct name for WM8753 rec mixer output

 sound/soc/at91/Kconfig             |   17 --
 sound/soc/at91/Makefile            |    5 -
 sound/soc/at91/eti_b1_wm8731.c     |  349 ------------------------------------
 sound/soc/codecs/wm8753.c          |    4 +-
 sound/soc/omap/omap-pcm.c          |    4 +-
 sound/soc/s3c24xx/neo1973_wm8753.c |   57 +-----
 6 files changed, 14 insertions(+), 422 deletions(-)
 delete mode 100644 sound/soc/at91/eti_b1_wm8731.c

Re: ASoC updates

[Takashi Iwai]

At Thu, 2 Oct 2008 11:02:00 +0100,
Mark Brown wrote:
> 
> The following changes since commit 2e2ed79f64e935540b0d148f7e2c3ebefafe133e:
>   Vladimir Barinov (1):
>         ALSA: Correct Vladimir Barinov's e-mail address
> 
> are available in the git repository at:
> 
>   git://opensource.wolfsonmicro.com/linux-2.6-asoc for-tiwai
> 
> Of these only the patch from Rob is 2.6.27 material.

OK, then I split your commits to two parts.
Rob's patch went into asoc-fixes branch for the next (possible) pull
request, and others to usual topic/asoc branch.  The topic/asoc also
merged asoc-fixes branch, so all are in there as results, too.


Thanks,

Takashi

ASoC updates

[Mark Brown]

The following changes since commit f79f27b5e79b9ae1e39d8376fd2ed956e3e02430:
  Takashi Iwai (1):
        ALSA: ASoC - clean up Kconfig for TLV320AIC2

are available in the git repository at:

  git://opensource.wolfsonmicro.com/linux-2.6-asoc for-tiwai

Jarkko Nikula (3):
      ASoC: OMAP: Add multilink support to McBSP DAI driver
      ASoC: OMAP: Add support for OMAP2430 and OMAP34xx in McBSP DAI driver
      ASoC: OMAP: Set DMA stream name at runtime in McBSP DAI driver

Mark Brown (1):
      ASoC: Make TLV320AIC26 user-visible

 sound/soc/codecs/Kconfig    |    2 +-
 sound/soc/omap/omap-mcbsp.c |  176 ++++++++++++++++++++++++++++++-------------
 sound/soc/omap/omap-mcbsp.h |   16 +++-
 3 files changed, 134 insertions(+), 60 deletions(-)

[PATCH 1/4] ASoC: Make TLV320AIC26 user-visible

[Mark Brown]

The TLV320AIC26 Kconfig option is unusual in that it supports the
OpenFirmware machine driver which doesn't have a hard binding to the
codec driver but discovers the codec via the device tree.  This makes it
meaningful to select the codec without a machine driver.

Ideally there would be a proxy entry so that this option was only
visible on OpenFirmware systems.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 sound/soc/codecs/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 11eebce..4975d85 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -68,7 +68,7 @@ config SND_SOC_TLV320AIC23
 	depends on I2C
 
 config SND_SOC_TLV320AIC26
-	tristate
+	tristate "TI TLV320AIC26 Codec support"
 	depends on SPI
 
 config SND_SOC_TLV320AIC3X
-- 
1.5.6.5

[PATCH 2/4] ASoC: OMAP: Add multilink support to McBSP DAI driver

[Mark Brown]

From: Jarkko Nikula <jarkko.nikula@nokia.com>

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 sound/soc/omap/omap-mcbsp.c |   72 +++++++++++++++++++++++++------------------
 sound/soc/omap/omap-mcbsp.h |   16 ++++++---
 2 files changed, 53 insertions(+), 35 deletions(-)

diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index fb920e1..d32eb47 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -381,37 +381,49 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
 	return err;
 }
 
-struct snd_soc_dai omap_mcbsp_dai[NUM_LINKS] = {
-{
-	.name = "omap-mcbsp-dai",
-	.id = 0,
-	.type = SND_SOC_DAI_I2S,
-	.playback = {
-		.channels_min = 2,
-		.channels_max = 2,
-		.rates = OMAP_MCBSP_RATES,
-		.formats = SNDRV_PCM_FMTBIT_S16_LE,
-	},
-	.capture = {
-		.channels_min = 2,
-		.channels_max = 2,
-		.rates = OMAP_MCBSP_RATES,
-		.formats = SNDRV_PCM_FMTBIT_S16_LE,
-	},
-	.ops = {
-		.startup = omap_mcbsp_dai_startup,
-		.shutdown = omap_mcbsp_dai_shutdown,
-		.trigger = omap_mcbsp_dai_trigger,
-		.hw_params = omap_mcbsp_dai_hw_params,
-	},
-	.dai_ops = {
-		.set_fmt = omap_mcbsp_dai_set_dai_fmt,
-		.set_clkdiv = omap_mcbsp_dai_set_clkdiv,
-		.set_sysclk = omap_mcbsp_dai_set_dai_sysclk,
-	},
-	.private_data = &mcbsp_data[0].bus_id,
-},
+#define OMAP_MCBSP_DAI_BUILDER(link_id)				\
+{								\
+	.name = "omap-mcbsp-dai-(link_id)",			\
+	.id = (link_id),					\
+	.type = SND_SOC_DAI_I2S,				\
+	.playback = {						\
+		.channels_min = 2,				\
+		.channels_max = 2,				\
+		.rates = OMAP_MCBSP_RATES,			\
+		.formats = SNDRV_PCM_FMTBIT_S16_LE,		\
+	},							\
+	.capture = {						\
+		.channels_min = 2,				\
+		.channels_max = 2,				\
+		.rates = OMAP_MCBSP_RATES,			\
+		.formats = SNDRV_PCM_FMTBIT_S16_LE,		\
+	},							\
+	.ops = {						\
+		.startup = omap_mcbsp_dai_startup,		\
+		.shutdown = omap_mcbsp_dai_shutdown,		\
+		.trigger = omap_mcbsp_dai_trigger,		\
+		.hw_params = omap_mcbsp_dai_hw_params,		\
+	},							\
+	.dai_ops = {						\
+		.set_fmt = omap_mcbsp_dai_set_dai_fmt,		\
+		.set_clkdiv = omap_mcbsp_dai_set_clkdiv,	\
+		.set_sysclk = omap_mcbsp_dai_set_dai_sysclk,	\
+	},							\
+	.private_data = &mcbsp_data[(link_id)].bus_id,		\
+}
+
+struct snd_soc_dai omap_mcbsp_dai[] = {
+	OMAP_MCBSP_DAI_BUILDER(0),
+	OMAP_MCBSP_DAI_BUILDER(1),
+#if NUM_LINKS >= 3
+	OMAP_MCBSP_DAI_BUILDER(2),
+#endif
+#if NUM_LINKS == 5
+	OMAP_MCBSP_DAI_BUILDER(3),
+	OMAP_MCBSP_DAI_BUILDER(4),
+#endif
 };
+
 EXPORT_SYMBOL_GPL(omap_mcbsp_dai);
 
 MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>");
diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h
index ed8afb5..df7ad13 100644
--- a/sound/soc/omap/omap-mcbsp.h
+++ b/sound/soc/omap/omap-mcbsp.h
@@ -38,11 +38,17 @@ enum omap_mcbsp_div {
 	OMAP_MCBSP_CLKGDV,		/* Sample rate generator divider */
 };
 
-/*
- * REVISIT: Preparation for the ASoC v2. Let the number of available links to
- * be same than number of McBSP ports found in OMAP(s) we are compiling for.
- */
-#define NUM_LINKS	1
+#if defined(CONFIG_ARCH_OMAP2420)
+#define NUM_LINKS	2
+#endif
+#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX)
+#undef  NUM_LINKS
+#define NUM_LINKS	3
+#endif
+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX)
+#undef  NUM_LINKS
+#define NUM_LINKS	5
+#endif
 
 extern struct snd_soc_dai omap_mcbsp_dai[NUM_LINKS];
 
-- 
1.5.6.5

[PATCH 3/4] ASoC: OMAP: Add support for OMAP2430 and OMAP34xx in McBSP DAI driver

[Mark Brown]

From: Jarkko Nikula <jarkko.nikula@nokia.com>

Thanks to Arun KS <arunks@mistralsolutions.com> for fixing one typo in
original version of this patch.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 sound/soc/omap/omap-mcbsp.c |   95 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index d32eb47..e97e6b2 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -84,11 +84,22 @@ static const unsigned long omap1_mcbsp_port[][2] = {
 static const int omap1_dma_reqs[][2] = {};
 static const unsigned long omap1_mcbsp_port[][2] = {};
 #endif
-#if defined(CONFIG_ARCH_OMAP2420)
-static const int omap2420_dma_reqs[][2] = {
+
+#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
+static const int omap24xx_dma_reqs[][2] = {
 	{ OMAP24XX_DMA_MCBSP1_TX, OMAP24XX_DMA_MCBSP1_RX },
 	{ OMAP24XX_DMA_MCBSP2_TX, OMAP24XX_DMA_MCBSP2_RX },
+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX)
+	{ OMAP24XX_DMA_MCBSP3_TX, OMAP24XX_DMA_MCBSP3_RX },
+	{ OMAP24XX_DMA_MCBSP4_TX, OMAP24XX_DMA_MCBSP4_RX },
+	{ OMAP24XX_DMA_MCBSP5_TX, OMAP24XX_DMA_MCBSP5_RX },
+#endif
 };
+#else
+static const int omap24xx_dma_reqs[][2] = {};
+#endif
+
+#if defined(CONFIG_ARCH_OMAP2420)
 static const unsigned long omap2420_mcbsp_port[][2] = {
 	{ OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1,
 	  OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1 },
@@ -96,10 +107,43 @@ static const unsigned long omap2420_mcbsp_port[][2] = {
 	  OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR1 },
 };
 #else
-static const int omap2420_dma_reqs[][2] = {};
 static const unsigned long omap2420_mcbsp_port[][2] = {};
 #endif
 
+#if defined(CONFIG_ARCH_OMAP2430)
+static const unsigned long omap2430_mcbsp_port[][2] = {
+	{ OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR,
+	  OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR },
+	{ OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR,
+	  OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR },
+	{ OMAP2430_MCBSP3_BASE + OMAP_MCBSP_REG_DXR,
+	  OMAP2430_MCBSP3_BASE + OMAP_MCBSP_REG_DRR },
+	{ OMAP2430_MCBSP4_BASE + OMAP_MCBSP_REG_DXR,
+	  OMAP2430_MCBSP4_BASE + OMAP_MCBSP_REG_DRR },
+	{ OMAP2430_MCBSP5_BASE + OMAP_MCBSP_REG_DXR,
+	  OMAP2430_MCBSP5_BASE + OMAP_MCBSP_REG_DRR },
+};
+#else
+static const unsigned long omap2430_mcbsp_port[][2] = {};
+#endif
+
+#if defined(CONFIG_ARCH_OMAP34XX)
+static const unsigned long omap34xx_mcbsp_port[][2] = {
+	{ OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR,
+	  OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR },
+	{ OMAP34XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR,
+	  OMAP34XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR },
+	{ OMAP34XX_MCBSP3_BASE + OMAP_MCBSP_REG_DXR,
+	  OMAP34XX_MCBSP3_BASE + OMAP_MCBSP_REG_DRR },
+	{ OMAP34XX_MCBSP4_BASE + OMAP_MCBSP_REG_DXR,
+	  OMAP34XX_MCBSP4_BASE + OMAP_MCBSP_REG_DRR },
+	{ OMAP34XX_MCBSP5_BASE + OMAP_MCBSP_REG_DXR,
+	  OMAP34XX_MCBSP5_BASE + OMAP_MCBSP_REG_DRR },
+};
+#else
+static const unsigned long omap34xx_mcbsp_port[][2] = {};
+#endif
+
 static int omap_mcbsp_dai_startup(struct snd_pcm_substream *substream)
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -167,12 +211,15 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
 		dma = omap1_dma_reqs[bus_id][substream->stream];
 		port = omap1_mcbsp_port[bus_id][substream->stream];
 	} else if (cpu_is_omap2420()) {
-		dma = omap2420_dma_reqs[bus_id][substream->stream];
+		dma = omap24xx_dma_reqs[bus_id][substream->stream];
 		port = omap2420_mcbsp_port[bus_id][substream->stream];
+	} else if (cpu_is_omap2430()) {
+		dma = omap24xx_dma_reqs[bus_id][substream->stream];
+		port = omap2430_mcbsp_port[bus_id][substream->stream];
+	} else if (cpu_is_omap343x()) {
+		dma = omap24xx_dma_reqs[bus_id][substream->stream];
+		port = omap34xx_mcbsp_port[bus_id][substream->stream];
 	} else {
-		/*
-		 * TODO: Add support for 2430 and 3430
-		 */
 		return -ENODEV;
 	}
 	omap_mcbsp_dai_dma_params[id][substream->stream].dma_req = dma;
@@ -315,7 +362,7 @@ static int omap_mcbsp_dai_set_clks_src(struct omap_mcbsp_data *mcbsp_data,
 				       int clk_id)
 {
 	int sel_bit;
-	u16 reg;
+	u16 reg, reg_devconf1 = OMAP243X_CONTROL_DEVCONF1;
 
 	if (cpu_class_is_omap1()) {
 		/* OMAP1's can use only external source clock */
@@ -325,6 +372,12 @@ static int omap_mcbsp_dai_set_clks_src(struct omap_mcbsp_data *mcbsp_data,
 			return 0;
 	}
 
+	if (cpu_is_omap2420() && mcbsp_data->bus_id > 1)
+		return -EINVAL;
+
+	if (cpu_is_omap343x())
+		reg_devconf1 = OMAP343X_CONTROL_DEVCONF1;
+
 	switch (mcbsp_data->bus_id) {
 	case 0:
 		reg = OMAP2_CONTROL_DEVCONF0;
@@ -334,20 +387,26 @@ static int omap_mcbsp_dai_set_clks_src(struct omap_mcbsp_data *mcbsp_data,
 		reg = OMAP2_CONTROL_DEVCONF0;
 		sel_bit = 6;
 		break;
-	/* TODO: Support for ports 3 - 5 in OMAP2430 and OMAP34xx */
+	case 2:
+		reg = reg_devconf1;
+		sel_bit = 0;
+		break;
+	case 3:
+		reg = reg_devconf1;
+		sel_bit = 2;
+		break;
+	case 4:
+		reg = reg_devconf1;
+		sel_bit = 4;
+		break;
 	default:
 		return -EINVAL;
 	}
 
-	if (cpu_class_is_omap2()) {
-		if (clk_id == OMAP_MCBSP_SYSCLK_CLKS_FCLK) {
-			omap_ctrl_writel(omap_ctrl_readl(reg) &
-					 ~(1 << sel_bit), reg);
-		} else {
-			omap_ctrl_writel(omap_ctrl_readl(reg) |
-					 (1 << sel_bit), reg);
-		}
-	}
+	if (clk_id == OMAP_MCBSP_SYSCLK_CLKS_FCLK)
+		omap_ctrl_writel(omap_ctrl_readl(reg) & ~(1 << sel_bit), reg);
+	else
+		omap_ctrl_writel(omap_ctrl_readl(reg) | (1 << sel_bit), reg);
 
 	return 0;
 }
-- 
1.5.6.5

[PATCH 4/4] ASoC: OMAP: Set DMA stream name at runtime in McBSP DAI driver

[Mark Brown]

From: Jarkko Nikula <jarkko.nikula@nokia.com>

This suits better when adding support for multiple links and different
link formats.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 sound/soc/omap/omap-mcbsp.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index e97e6b2..0a063a9 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -59,12 +59,7 @@ static struct omap_mcbsp_data mcbsp_data[NUM_LINKS];
  * Stream DMA parameters. DMA request line and port address are set runtime
  * since they are different between OMAP1 and later OMAPs
  */
-static struct omap_pcm_dma_data omap_mcbsp_dai_dma_params[NUM_LINKS][2] = {
-{
-	{ .name		= "I2S PCM Stereo out", },
-	{ .name		= "I2S PCM Stereo in", },
-},
-};
+static struct omap_pcm_dma_data omap_mcbsp_dai_dma_params[NUM_LINKS][2];
 
 #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX)
 static const int omap1_dma_reqs[][2] = {
@@ -222,6 +217,8 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
 	} else {
 		return -ENODEV;
 	}
+	omap_mcbsp_dai_dma_params[id][substream->stream].name =
+		substream->stream ? "Audio Capture" : "Audio Playback";
 	omap_mcbsp_dai_dma_params[id][substream->stream].dma_req = dma;
 	omap_mcbsp_dai_dma_params[id][substream->stream].port_addr = port;
 	cpu_dai->dma_data = &omap_mcbsp_dai_dma_params[id][substream->stream];
-- 
1.5.6.5

Re: ASoC updates

[Takashi Iwai]

At Fri, 10 Oct 2008 15:51:27 +0100,
Mark Brown wrote:
> 
> The following changes since commit f79f27b5e79b9ae1e39d8376fd2ed956e3e02430:
>   Takashi Iwai (1):
>         ALSA: ASoC - clean up Kconfig for TLV320AIC2
> 
> are available in the git repository at:
> 
>   git://opensource.wolfsonmicro.com/linux-2.6-asoc for-tiwai

Thanks, pulled now.
There was a power cut yesterday ant it took over a day to recover,
and I finally can work again.

BTW, my git tree will be likely totally rebased.  But still it's
better to merge patches right now so that they won't go away.


thanks,

Takashi

ASoC updates

[Mark Brown]

The following changes since commit 70043058a6968917c00c8d4cff5bfc0e095831ec:
  Takashi Iwai (1):
        Merge branch 'fix/asoc' into topic/asoc

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 for-tiwai

Troy Kisky (8):
      ALSA: ASoC: DaVinci: davinvi-evm, make requests explicit
      ALSA: ASoC: DaVinci: davinci-i2s add comments to explain polarity
      ALSA: ASoC: DaVinci: davinci-i2s clean up
      ALSA: ASoC: DaVinci: davinci-i2s clean up
      ALSA: ASoC: DaVinci: document I2S limitations
      ALSA: ASoC: tlv320aic3x add dsp_a
      ALSA: ASoC: DaVinci: i2s, evm, pass same value to codec and cpu_dai
      ALSA: ASoc: DaVinci: davinci-evm use dsp_b mode

 sound/soc/codecs/tlv320aic3x.c  |    4 +
 sound/soc/codecs/tlv320aic3x.h  |    2 +
 sound/soc/davinci/davinci-evm.c |    8 +-
 sound/soc/davinci/davinci-i2s.c |  158 ++++++++++++++++++++++++--------------
 4 files changed, 110 insertions(+), 62 deletions(-)

Re: ASoC updates

[SUBHRANIL CHOUDHURY]

Dear all,
I am new to ALSA  programming.
Suppose if i have to add some hardware specific feature in the ALSA sound
driver and expose to the application via the ALSA library, how can do that?

Please reply if you have some inputs.
Anything is welcome.
Thanks in advance.

Regards,
Subhranil

Re: ASoC updates

[Sean McNamara]

Hi,

On Sat, Dec 20, 2008 at 9:11 AM, SUBHRANIL CHOUDHURY <subhra85@gmail.com> wrote:
> Dear all,
> I am new to ALSA  programming.
> Suppose if i have to add some hardware specific feature in the ALSA sound
> driver and expose to the application via the ALSA library, how can do that?

The generic interface to do that would be hwdep... in userspace, you
would have to modify libasound2 (alsa-lib) to correctly use the hwdep
interface, as documented here:
http://www.alsa-project.org/alsa-doc/alsa-lib/group___hw_dep.html

>
> Please reply if you have some inputs.

Please look through the documentation for 5 minutes first before
posting to the ML... the updated documentation for 1.0.18 is
maintained at
http://www.alsa-project.org/alsa-doc/alsa-lib/index.html

Thanks,

Sean

> Anything is welcome.
> Thanks in advance.
>
> Regards,
> Subhranil
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>

Re: ASoC updates

[Takashi Iwai]

At Sat, 20 Dec 2008 13:51:32 +0000,
Mark Brown wrote:
> 
> The following changes since commit 70043058a6968917c00c8d4cff5bfc0e095831ec:
>   Takashi Iwai (1):
>         Merge branch 'fix/asoc' into topic/asoc
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 for-tiwai

Thanks, pulled now.


BTW, I'll be off from Dec. 23 for a week.  Since it's not sure whether
I'll have an internet access there, please let me know until the next
Monday if you have urgent updates for 2.6.29.


Takashi

> 
> Troy Kisky (8):
>       ALSA: ASoC: DaVinci: davinvi-evm, make requests explicit
>       ALSA: ASoC: DaVinci: davinci-i2s add comments to explain polarity
>       ALSA: ASoC: DaVinci: davinci-i2s clean up
>       ALSA: ASoC: DaVinci: davinci-i2s clean up
>       ALSA: ASoC: DaVinci: document I2S limitations
>       ALSA: ASoC: tlv320aic3x add dsp_a
>       ALSA: ASoC: DaVinci: i2s, evm, pass same value to codec and cpu_dai
>       ALSA: ASoc: DaVinci: davinci-evm use dsp_b mode
> 
>  sound/soc/codecs/tlv320aic3x.c  |    4 +
>  sound/soc/codecs/tlv320aic3x.h  |    2 +
>  sound/soc/davinci/davinci-evm.c |    8 +-
>  sound/soc/davinci/davinci-i2s.c |  158 ++++++++++++++++++++++++--------------
>  4 files changed, 110 insertions(+), 62 deletions(-)
> 

ASoC updates

[Mark Brown]

The following changes since commit cad9d90ec3f6c497dce2b163046436b6ab5cf6b6:
  Takashi Iwai (1):
        Merge branch 'fixes' of git://git.kernel.org/.../broonie/sound-2.6 into topic/asoc

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-tiwai

David Brownell (1):
      ASoC: Clocking fixes for davinci-evm.c

Dmitry Baryshkov (1):
      pxa2xx-ac97: switch AC unit to correct state before probing

Grazvydas Ignotas (1):
      ASoC: Mark non-connected TWL4030 pins for pandora

Jarkko Nikula (1):
      ASoC: OMAP: Select OMAP pin multiplexing when using Nokia N810 ASoC drivers

Peter Ujfalusi (2):
      ASoC: New enum type: value_enum
      ASoC: TWL4030: Convert the bitfield enums to VALUE_ENUM type

 include/sound/soc-dapm.h        |   15 +++
 include/sound/soc.h             |   30 ++++++
 sound/arm/pxa2xx-ac97-lib.c     |   25 +++--
 sound/soc/codecs/twl4030.c      |  118 +++++++++++-------------
 sound/soc/davinci/davinci-evm.c |   19 +++-
 sound/soc/omap/Kconfig          |    1 +
 sound/soc/omap/omap3pandora.c   |   13 +++
 sound/soc/soc-core.c            |  107 +++++++++++++++++++++
 sound/soc/soc-dapm.c            |  197 ++++++++++++++++++++++++++++++++++++++-
 9 files changed, 447 insertions(+), 78 deletions(-)

Re: ASoC updates

[Takashi Iwai]

At Mon, 5 Jan 2009 17:56:34 +0000,
Mark Brown wrote:
> 
> The following changes since commit cad9d90ec3f6c497dce2b163046436b6ab5cf6b6:
>   Takashi Iwai (1):
>         Merge branch 'fixes' of git://git.kernel.org/.../broonie/sound-2.6 into topic/asoc
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-tiwai

Are all these 2.6.30 material or for 2.6.29?
For 2.6.30, I'll create another branch.  It won't be included in
linux-next, too, until rc1 is reached (Stephen requested so), but we
can keep it in our main branch, of course.


thanks,

Takashi


> David Brownell (1):
>       ASoC: Clocking fixes for davinci-evm.c
> 
> Dmitry Baryshkov (1):
>       pxa2xx-ac97: switch AC unit to correct state before probing
> 
> Grazvydas Ignotas (1):
>       ASoC: Mark non-connected TWL4030 pins for pandora
> 
> Jarkko Nikula (1):
>       ASoC: OMAP: Select OMAP pin multiplexing when using Nokia N810 ASoC drivers
> 
> Peter Ujfalusi (2):
>       ASoC: New enum type: value_enum
>       ASoC: TWL4030: Convert the bitfield enums to VALUE_ENUM type
> 
>  include/sound/soc-dapm.h        |   15 +++
>  include/sound/soc.h             |   30 ++++++
>  sound/arm/pxa2xx-ac97-lib.c     |   25 +++--
>  sound/soc/codecs/twl4030.c      |  118 +++++++++++-------------
>  sound/soc/davinci/davinci-evm.c |   19 +++-
>  sound/soc/omap/Kconfig          |    1 +
>  sound/soc/omap/omap3pandora.c   |   13 +++
>  sound/soc/soc-core.c            |  107 +++++++++++++++++++++
>  sound/soc/soc-dapm.c            |  197 ++++++++++++++++++++++++++++++++++++++-
>  9 files changed, 447 insertions(+), 78 deletions(-)
> 

Re: ASoC updates

[Mark Brown]

On Mon, Jan 05, 2009 at 09:53:21PM +0100, Takashi Iwai wrote:

> Are all these 2.6.30 material or for 2.6.29?

They're a bit on the edge, I'd expect them to be safe for 2.6.29 but the
conservative thing would be to punt to 2.6.30.  None of them are
critical.

> For 2.6.30, I'll create another branch.  It won't be included in
> linux-next, too, until rc1 is reached (Stephen requested so), but we
> can keep it in our main branch, of course.

How about branching off a fixes branch for 2.6.29 rather than a -next
branch?  That way we can keep using the same branch for further fixes
through the -rc series.  Doesn't make much difference either way,
though.

Re: ASoC updates

[Takashi Iwai]

At Mon, 5 Jan 2009 21:09:18 +0000,
Mark Brown wrote:
> 
> On Mon, Jan 05, 2009 at 09:53:21PM +0100, Takashi Iwai wrote:
> 
> > Are all these 2.6.30 material or for 2.6.29?
> 
> They're a bit on the edge, I'd expect them to be safe for 2.6.29 but the
> conservative thing would be to punt to 2.6.30.  None of them are
> critical.

OK, I'll include them in the next 2.6.29 pull request, which will
be sent today.

> > For 2.6.30, I'll create another branch.  It won't be included in
> > linux-next, too, until rc1 is reached (Stephen requested so), but we
> > can keep it in our main branch, of course.
> 
> How about branching off a fixes branch for 2.6.29 rather than a -next
> branch?  That way we can keep using the same branch for further fixes
> through the -rc series.  Doesn't make much difference either way,
> though.

Usually I make a fix-branch off like "fix/asoc" after rc1 or rc2,
i.e. the linux-next tree starts accepting the next-kernel stuff.
Until then, topic/* will keep the 2.6.29 stuff.

So my plan is to create next/asoc branch, switch to topic/asoc after
the merge window, and use fix/asoc branch for further fixing.


thanks,

Takashi

ASoC updates

[Mark Brown]

The following changes since commit 070504ade7a95a0f4395673717f3bb7d41793ca8:
  Mark Brown (1):
        ASoC: Fix L3 bus handling in Kconfig

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

Mark Brown (1):
      ASoC: Push the codec runtime storage into the card structure

Peter Ujfalusi (5):
      ASoC: TWL4030: Syncronize the reg_cache for ANAMICL after the offset cancelation
      ASoC: TWL4030: Code clean up for codec power up and down
      ASoC: TWL4030: Enable Headset Left anti-pop/bias ramp only if the Headset Left is in use
      ASoC: TWL4030: Physical ADC and amplifier power switch change
      ASoC: TWL4030: Move the twl4030_power_up and _power_down function

Timur Tabi (1):
      ASoC: improve I2C initialization code in CS4270 driver

 include/sound/soc.h            |    3 +-
 sound/soc/codecs/ac97.c        |   20 ++--
 sound/soc/codecs/ad1980.c      |   12 +-
 sound/soc/codecs/ad73311.c     |    8 +-
 sound/soc/codecs/ak4535.c      |   14 +-
 sound/soc/codecs/cs4270.c      |  254 ++++++++++++++++++----------------------
 sound/soc/codecs/pcm3008.c     |   12 +-
 sound/soc/codecs/ssm2602.c     |   20 ++--
 sound/soc/codecs/tlv320aic23.c |   18 ++--
 sound/soc/codecs/tlv320aic26.c |    4 +-
 sound/soc/codecs/tlv320aic3x.c |   14 +-
 sound/soc/codecs/twl4030.c     |  224 +++++++++++++++++++-----------------
 sound/soc/codecs/uda134x.c     |   18 ++--
 sound/soc/codecs/uda1380.c     |   18 ++--
 sound/soc/codecs/wm8350.c      |   10 +-
 sound/soc/codecs/wm8510.c      |   16 ++--
 sound/soc/codecs/wm8580.c      |   10 +-
 sound/soc/codecs/wm8728.c      |   16 ++--
 sound/soc/codecs/wm8731.c      |   20 ++--
 sound/soc/codecs/wm8750.c      |   16 ++--
 sound/soc/codecs/wm8753.c      |   18 ++--
 sound/soc/codecs/wm8900.c      |    8 +-
 sound/soc/codecs/wm8903.c      |   18 ++--
 sound/soc/codecs/wm8971.c      |   14 +-
 sound/soc/codecs/wm8990.c      |   14 +-
 sound/soc/codecs/wm9705.c      |   15 ++-
 sound/soc/codecs/wm9712.c      |   21 ++--
 sound/soc/codecs/wm9713.c      |   17 ++--
 sound/soc/soc-core.c           |   37 +++---
 sound/soc/soc-dapm.c           |    6 +-
 sound/soc/soc-jack.c           |    4 +-
 31 files changed, 443 insertions(+), 456 deletions(-)

Re: ASoC updates

[Takashi Iwai]

At Tue, 27 Jan 2009 20:03:11 +0000,
Mark Brown wrote:
> 
> The following changes since commit 070504ade7a95a0f4395673717f3bb7d41793ca8:
>   Mark Brown (1):
>         ASoC: Fix L3 bus handling in Kconfig
> 
> 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

Pulled now.  Thanks!


Takashi