[patch 0/6] kirkwood openrd client audio support - v4

[patch 0/6] kirkwood openrd client audio support - v4

[apatard at mandriva.com]

Hi,

This patchset is an other try to get merged openrd audio support mainline.
The main change is going back to using kirkwood instead of orion, as the 
only orion having i2s is not merged mainline (if I got it right).
I've also fixed the lastests comments on the cs42l51 codec patch.

Arnaud

Changes :
- changed back from orion to kirkwood
- removed cs42l51 adc input register initialisation
- moved the DAPM event macro to soc-dapm
- fixed cs42l51_set_dai_fmt() master/slave check
- removed cs42l51 startup message
- use snd_soc_update_bits() in cs42l51_pdn_event()

[patch 1/6] orion/kirkwood: add audio functions.

[apatard at mandriva.com]

An embedded and charset-unspecified text was scrubbed...
Name: kirkwood_add_audio_dev.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100527/86aa58b8/attachment.el>

[patch 1/6] orion/kirkwood: add audio functions.

[Nicolas Pitre]

On Thu, 27 May 2010, apatard at mandriva.com wrote:

> This patch add audio related definitions and functions
> 
> 
> Signed-off-by: Arnaud Patard <apatard@mandriva.com>

Acked-by: Nicolas Pitre <nico@fluxnic.net>



> 
> Index: sound-2.6/arch/arm/mach-kirkwood/common.c
> ===================================================================
> --- sound-2.6.orig/arch/arm/mach-kirkwood/common.c	2010-05-27 14:09:33.244174174 +0200
> +++ sound-2.6/arch/arm/mach-kirkwood/common.c	2010-05-27 14:09:35.840194356 +0200
> @@ -25,6 +25,7 @@
>  #include <asm/mach/time.h>
>  #include <mach/kirkwood.h>
>  #include <mach/bridge-regs.h>
> +#include <plat/audio.h>
>  #include <plat/cache-feroceon-l2.h>
>  #include <plat/ehci-orion.h>
>  #include <plat/mvsdio.h>
> @@ -855,6 +856,42 @@ struct sys_timer kirkwood_timer = {
>  	.init = kirkwood_timer_init,
>  };
>  
> +/*****************************************************************************
> + * Audio
> + ****************************************************************************/
> +static struct resource kirkwood_i2s_resources[] = {
> +	[0] = {
> +		.start  = AUDIO_PHYS_BASE,
> +		.end    = AUDIO_PHYS_BASE + SZ_16K - 1,
> +		.flags  = IORESOURCE_MEM,
> +	},
> +	[1] = {
> +		.start  = IRQ_KIRKWOOD_I2S,
> +		.end    = IRQ_KIRKWOOD_I2S,
> +		.flags  = IORESOURCE_IRQ,
> +	},
> +};
> +
> +static struct kirkwood_asoc_platform_data kirkwood_i2s_data = {
> +	.dram        = &kirkwood_mbus_dram_info,
> +	.burst       = 128,
> +};
> +
> +static struct platform_device kirkwood_i2s_device = {
> +	.name		= "kirkwood-i2s",
> +	.id		= -1,
> +	.num_resources	= ARRAY_SIZE(kirkwood_i2s_resources),
> +	.resource	= kirkwood_i2s_resources,
> +	.dev		= {
> +		.platform_data	= &kirkwood_i2s_data,
> +	},
> +};
> +
> +void __init kirkwood_audio_init(void)
> +{
> +	kirkwood_clk_ctrl |= CGC_AUDIO;
> +	platform_device_register(&kirkwood_i2s_device);
> +}
>  
>  /*****************************************************************************
>   * General
> @@ -914,6 +951,7 @@ void __init kirkwood_init(void)
>  	kirkwood_spi_plat_data.tclk = kirkwood_tclk;
>  	kirkwood_uart0_data[0].uartclk = kirkwood_tclk;
>  	kirkwood_uart1_data[0].uartclk = kirkwood_tclk;
> +	kirkwood_i2s_data.tclk = kirkwood_tclk;
>  
>  	/*
>  	 * Disable propagation of mbus errors to the CPU local bus,
> Index: sound-2.6/arch/arm/mach-kirkwood/common.h
> ===================================================================
> --- sound-2.6.orig/arch/arm/mach-kirkwood/common.h	2010-05-27 14:09:33.204173835 +0200
> +++ sound-2.6/arch/arm/mach-kirkwood/common.h	2010-05-27 14:09:35.883694381 +0200
> @@ -16,6 +16,7 @@ struct mv643xx_eth_platform_data;
>  struct mv_sata_platform_data;
>  struct mvsdio_platform_data;
>  struct mtd_partition;
> +struct kirkwood_asoc_platform_data;
>  
>  /*
>   * Basic Kirkwood init functions used early by machine-setup.
> @@ -41,6 +42,7 @@ void kirkwood_i2c_init(void);
>  void kirkwood_uart0_init(void);
>  void kirkwood_uart1_init(void);
>  void kirkwood_nand_init(struct mtd_partition *parts, int nr_parts, int delay);
> +void kirkwood_audio_init(void);
>  
>  extern int kirkwood_tclk;
>  extern struct sys_timer kirkwood_timer;
> Index: sound-2.6/arch/arm/mach-kirkwood/include/mach/kirkwood.h
> ===================================================================
> --- sound-2.6.orig/arch/arm/mach-kirkwood/include/mach/kirkwood.h	2010-05-27 14:09:33.188174747 +0200
> +++ sound-2.6/arch/arm/mach-kirkwood/include/mach/kirkwood.h	2010-05-27 14:09:35.895694344 +0200
> @@ -96,6 +96,9 @@
>  
>  #define SDIO_PHYS_BASE		(KIRKWOOD_REGS_PHYS_BASE | 0x90000)
>  
> +#define AUDIO_PHYS_BASE		(KIRKWOOD_REGS_PHYS_BASE | 0xA0000)
> +#define AUDIO_VIRT_BASE		(KIRKWOOD_REGS_VIRT_BASE | 0xA0000)
> +
>  /*
>   * Supported devices and revisions.
>   */
> Index: sound-2.6/arch/arm/plat-orion/include/plat/audio.h
> ===================================================================
> --- /dev/null	1970-01-01 00:00:00.000000000 +0000
> +++ sound-2.6/arch/arm/plat-orion/include/plat/audio.h	2010-05-27 14:09:35.895694344 +0200
> @@ -0,0 +1,11 @@
> +#ifndef __PLAT_AUDIO_H
> +#define __PLAT_AUDIO_H
> +
> +#include <linux/mbus.h>
> +
> +struct kirkwood_asoc_platform_data {
> +	u32 tclk;
> +	struct mbus_dram_target_info *dram;
> +	int burst;
> +};
> +#endif
> 

[patch 1/6] orion/kirkwood: add audio functions.

[Mark Brown]

On Thu, May 27, 2010 at 02:57:38PM +0200, apatard at mandriva.com wrote:
> This patch add audio related definitions and functions
> 
> 
> Signed-off-by: Arnaud Patard <apatard@mandriva.com>

I'm not sure which tree this patch was generated against but it won't
apply to either 2.6.35-rc1 or my old for-2.6.35 branch.  Please
regenerate against my for-2.6.36 branch.  The patches look fine but I'm
not able to apply them.

[patch 0/4] Re: [patch 1/6] orion/kirkwood: add audio functions.

[apatard at mandriva.com]

> I'm not sure which tree this patch was generated against but it won't
> apply to either 2.6.35-rc1 or my old for-2.6.35 branch.  Please
> regenerate against my for-2.6.36 branch.  The patches look fine but I'm
> not able to apply them.

oh, ok. Sorry. It was based on a previous for-2.6.36 branch and the newer one conflicts
due to the mtd RnB patch.

This new serie is based on your for-2.6.36 branch with HEAD 72ed5a8c9b057aeb779d161ac6fab1e98f091697


Arnaud

[patch 1/4] orion/kirkwood: add audio functions.

[apatard at mandriva.com]

An embedded and charset-unspecified text was scrubbed...
Name: kirkwood_add_audio_dev.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100531/6758ab30/attachment.el>

[patch 1/4] orion/kirkwood: add audio functions.

[Mark Brown]

On Mon, May 31, 2010 at 01:49:12PM +0200, apatard at mandriva.com wrote:
> This patch add audio related definitions and functions

Applied, thanks.

[patch 2/4] openrd-client: initialise audio

[apatard at mandriva.com]

An embedded and charset-unspecified text was scrubbed...
Name: openrd_init_audio_dev.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100531/556de3c2/attachment.el>

[patch 3/4] kirkwood: Add i2s support

[apatard at mandriva.com]

An embedded and charset-unspecified text was scrubbed...
Name: kirkwood_i2s.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100531/306733e6/attachment.el>

[patch 4/4] kirkwood: Add audio support to openrd client platforms

[apatard at mandriva.com]

An embedded and charset-unspecified text was scrubbed...
Name: openrd_audio.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100531/cfaaacc9/attachment.el>

[patch 2/6] openrd-client: initialise audio

[apatard at mandriva.com]

An embedded and charset-unspecified text was scrubbed...
Name: openrd_init_audio_dev.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100527/e036f32d/attachment.el>

[patch 3/6] soc-dapm.h: add SND_SOC_DAPM_PRE_POST_PMD event

[apatard at mandriva.com]

An embedded and charset-unspecified text was scrubbed...
Name: add_dapm_pre_port_pmd.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100527/ed9cb853/attachment.el>

[patch 3/6] soc-dapm.h: add SND_SOC_DAPM_PRE_POST_PMD event

[Mark Brown]

On Thu, May 27, 2010 at 02:57:40PM +0200, apatard at mandriva.com wrote:
> Some systems codecs need to configure some registers before and after powering down
> some of their part. As a convenience, I'm adding a macro for that.
> 
> Signed-off-by: Arnaud Patard <apatard@mandriva.com>

Applied with modified changelog, thanks.

Please put an appropriate prefix on patches you submit ("ASoC: " for
ASoC) - this makes it easier to apply.

[patch 4/6] cs42l51: add asoc driver

[apatard at mandriva.com]

An embedded and charset-unspecified text was scrubbed...
Name: cs42l51_support.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100527/2a0cd5a1/attachment.el>

[patch 4/6] cs42l51: add asoc driver

[Mark Brown]

On Thu, May 27, 2010 at 02:57:41PM +0200, apatard at mandriva.com wrote:
> This patch is adding a ASoC driver for the cs42l51 from Cirrus Logic.
> Master mode and spi mode are not supported.
> 
> Signed-off-by: Arnaud Patard <apatard@mandriva.com>

Applied, thanks.

[patch 5/6] kirkwood: Add i2s support

[apatard at mandriva.com]

An embedded and charset-unspecified text was scrubbed...
Name: kirkwood_i2s.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100527/e0e3feaa/attachment.el>

[patch 6/6] kirkwood: Add audio support to openrd client platforms

[apatard at mandriva.com]

An embedded and charset-unspecified text was scrubbed...
Name: openrd_audio.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100527/5e9e49eb/attachment.el>

[patch 0/6] kirkwood openrd client audio support - v4

[Nicolas Pitre]

On Thu, 27 May 2010, apatard at mandriva.com wrote:

> 
> Hi,
> 
> This patchset is an other try to get merged openrd audio support mainline.
> The main change is going back to using kirkwood instead of orion, as the 
> only orion having i2s is not merged mainline (if I got it right).

Right.

> I've also fixed the lastests comments on the cs42l51 codec patch.
> 
> Arnaud
> 
> Changes :
> - changed back from orion to kirkwood
> - removed cs42l51 adc input register initialisation
> - moved the DAPM event macro to soc-dapm
> - fixed cs42l51_set_dai_fmt() master/slave check
> - removed cs42l51 startup message
> - use snd_soc_update_bits() in cs42l51_pdn_event()

I acked the first patch which touches directly the directory I normally 
handle patches for.  Given the series is mostly about ASOC stuff, I 
think it is best if the whole series, including the first patch, is 
pushed through the ASOC tree (if Mark agrees with the rest that is of 
course).


Nicolas

[alsa-devel] [patch 0/6] kirkwood openrd client audio support - v4

[Liam Girdwood]

On Thu, 2010-05-27 at 14:57 +0200, apatard at mandriva.com wrote:
> Hi,
> 
> This patchset is an other try to get merged openrd audio support mainline.
> The main change is going back to using kirkwood instead of orion, as the 
> only orion having i2s is not merged mainline (if I got it right).
> I've also fixed the lastests comments on the cs42l51 codec patch.
> 
> Arnaud
> 
> Changes :
> - changed back from orion to kirkwood
> - removed cs42l51 adc input register initialisation
> - moved the DAPM event macro to soc-dapm
> - fixed cs42l51_set_dai_fmt() master/slave check
> - removed cs42l51 startup message
> - use snd_soc_update_bits() in cs42l51_pdn_event()

Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk