Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Kevin Hilman <khilman@deeprootsystems.com>
To: Chaithrika U S <chaithrika@ti.com>
Cc: davinci-linux-open-source@linux.davincidsp.com,
	broonie@opensource.wolfsonmicro.com, alsa-devel@alsa-project.org
Subject: Re: [PATCH] ARM: DaVinci: Audio support for DA850/OMAP-L138 EVM
Date: Wed, 12 Aug 2009 11:32:05 -0700	[thread overview]
Message-ID: <8763csubmi.fsf@deeprootsystems.com> (raw)
In-Reply-To: <1250024605-27215-1-git-send-email-chaithrika@ti.com> (Chaithrika U. S.'s message of "Tue\, 11 Aug 2009 17\:03\:25 -0400")

Chaithrika U S <chaithrika@ti.com> writes:

> Define resources for McASP used on DA850/OMAP-L138 EVM, add platform
> device defintion and Pin Mux configurations.
>
> Signed-off-by: Chaithrika U S <chaithrika@ti.com>
> ---
> Applies on DaVinci GIT tree.
> This patch is dependent on the following patch which I have
> submitted earlier:
> 	[PATCH v2] ARM: DaVinci: Audio support for DA830 EVM

Pushed both to davinci git, and will queue for linux-next.

Kevin

>  arch/arm/mach-davinci/board-da850-evm.c  |   29 ++++++++++++++++++++++
>  arch/arm/mach-davinci/da850.c            |   39 ++++++++++++++++++++++++++++++
>  arch/arm/mach-davinci/devices-da8xx.c    |   34 +++++++++++++++++++++++++-
>  arch/arm/mach-davinci/include/mach/asp.h |    7 +++++
>  arch/arm/mach-davinci/include/mach/mux.h |   25 +++++++++++++++++++
>  5 files changed, 133 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
> index d989346..52bfe4c 100644
> --- a/arch/arm/mach-davinci/board-da850-evm.c
> +++ b/arch/arm/mach-davinci/board-da850-evm.c
> @@ -38,6 +38,28 @@ static struct davinci_uart_config da850_evm_uart_config __initdata = {
>  	.enabled_uarts = 0x7,
>  };
>  
> +/* davinci da850 evm audio machine driver */
> +static u8 da850_iis_serializer_direction[] = {
> +	INACTIVE_MODE,	INACTIVE_MODE,	INACTIVE_MODE,	INACTIVE_MODE,
> +	INACTIVE_MODE,	INACTIVE_MODE,	INACTIVE_MODE,	INACTIVE_MODE,
> +	INACTIVE_MODE,	INACTIVE_MODE,	INACTIVE_MODE,	TX_MODE,
> +	RX_MODE,	INACTIVE_MODE,	INACTIVE_MODE,	INACTIVE_MODE,
> +};
> +
> +static struct snd_platform_data da850_evm_snd_data = {
> +	.tx_dma_offset	= 0x2000,
> +	.rx_dma_offset	= 0x2000,
> +	.op_mode	= DAVINCI_MCASP_IIS_MODE,
> +	.num_serializer	= ARRAY_SIZE(da850_iis_serializer_direction),
> +	.tdm_slots	= 2,
> +	.serial_dir	= da850_iis_serializer_direction,
> +	.eventq_no	= EVENTQ_1,
> +	.version	= MCASP_VERSION_2,
> +	.txnumevt	= 1,
> +	.rxnumevt	= 1,
> +};
> +
> +
>  static __init void da850_evm_init(void)
>  {
>  	struct davinci_soc_info *soc_info = &davinci_soc_info;
> @@ -86,6 +108,13 @@ static __init void da850_evm_init(void)
>  	 */
>  	__raw_writel(0, IO_ADDRESS(DA8XX_UART1_BASE) + 0x30);
>  	__raw_writel(0, IO_ADDRESS(DA8XX_UART0_BASE) + 0x30);
> +
> +	ret = da8xx_pinmux_setup(da850_mcasp_pins);
> +	if (ret)
> +		pr_warning("da850_evm_init: mcasp mux setup failed: %d\n",
> +				ret);
> +
> +	da8xx_init_mcasp(0, &da850_evm_snd_data);
>  }
>  
>  #ifdef CONFIG_SERIAL_8250_CONSOLE
> diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
> index 4a43ae2..e33b226 100644
> --- a/arch/arm/mach-davinci/da850.c
> +++ b/arch/arm/mach-davinci/da850.c
> @@ -289,6 +289,13 @@ static struct clk emac_clk = {
>  	.lpsc		= DA8XX_LPSC1_CPGMAC,
>  };
>  
> +static struct clk mcasp_clk = {
> +	.name		= "mcasp",
> +	.parent		= &pll0_sysclk2,
> +	.lpsc		= DA8XX_LPSC1_McASP0,
> +	.psc_ctlr	= 1,
> +};
> +
>  static struct davinci_clk da850_clks[] = {
>  	CLK(NULL,		"ref",		&ref_clk),
>  	CLK(NULL,		"pll0",		&pll0_clk),
> @@ -326,6 +333,7 @@ static struct davinci_clk da850_clks[] = {
>  	CLK(NULL,		"arm",		&arm_clk),
>  	CLK(NULL,		"rmii",		&rmii_clk),
>  	CLK("davinci_emac.1",	NULL,		&emac_clk),
> +	CLK("davinci-mcasp.0",	NULL,		&mcasp_clk),
>  	CLK(NULL,		NULL,		NULL),
>  };
>  
> @@ -370,6 +378,30 @@ static const struct mux_config da850_pins[] = {
>  	MUX_CFG(DA850, MII_RXD_2,	3,	20,	15,	8,	false)
>  	MUX_CFG(DA850, MII_RXD_1,	3,	24,	15,	8,	false)
>  	MUX_CFG(DA850, MII_RXD_0,	3,	28,	15,	8,	false)
> +	/* McASP function */
> +	MUX_CFG(DA850,	ACLKR,		0,	0,	15,	1,	false)
> +	MUX_CFG(DA850,	ACLKX,		0,	4,	15,	1,	false)
> +	MUX_CFG(DA850,	AFSR,		0,	8,	15,	1,	false)
> +	MUX_CFG(DA850,	AFSX,		0,	12,	15,	1,	false)
> +	MUX_CFG(DA850,	AHCLKR,		0,	16,	15,	1,	false)
> +	MUX_CFG(DA850,	AHCLKX,		0,	20,	15,	1,	false)
> +	MUX_CFG(DA850,	AMUTE,		0,	24,	15,	1,	false)
> +	MUX_CFG(DA850,	AXR_15,		1,	0,	15,	1,	false)
> +	MUX_CFG(DA850,	AXR_14,		1,	4,	15,	1,	false)
> +	MUX_CFG(DA850,	AXR_13,		1,	8,	15,	1,	false)
> +	MUX_CFG(DA850,	AXR_12,		1,	12,	15,	1,	false)
> +	MUX_CFG(DA850,	AXR_11,		1,	16,	15,	1,	false)
> +	MUX_CFG(DA850,	AXR_10,		1,	20,	15,	1,	false)
> +	MUX_CFG(DA850,	AXR_9,		1,	24,	15,	1,	false)
> +	MUX_CFG(DA850,	AXR_8,		1,	28,	15,	1,	false)
> +	MUX_CFG(DA850,	AXR_7,		2,	0,	15,	1,	false)
> +	MUX_CFG(DA850,	AXR_6,		2,	4,	15,	1,	false)
> +	MUX_CFG(DA850,	AXR_5,		2,	8,	15,	1,	false)
> +	MUX_CFG(DA850,	AXR_4,		2,	12,	15,	1,	false)
> +	MUX_CFG(DA850,	AXR_3,		2,	16,	15,	1,	false)
> +	MUX_CFG(DA850,	AXR_2,		2,	20,	15,	1,	false)
> +	MUX_CFG(DA850,	AXR_1,		2,	24,	15,	1,	false)
> +	MUX_CFG(DA850,	AXR_0,		2,	28,	15,	1,	false)
>  #endif
>  };
>  
> @@ -406,6 +438,13 @@ const short da850_cpgmac_pins[] __initdata = {
>  	-1
>  };
>  
> +const short da850_mcasp_pins[] __initdata = {
> +	DA850_AHCLKX, DA850_ACLKX, DA850_AFSX,
> +	DA850_AHCLKR, DA850_ACLKR, DA850_AFSR, DA850_AMUTE,
> +	DA850_AXR_11, DA850_AXR_12,
> +	-1
> +};
> +
>  /* FIQ are pri 0-1; otherwise 2-7, with 7 lowest priority */
>  static u8 da850_default_priorities[DA850_N_CP_INTC_IRQ] = {
>  	[IRQ_DA8XX_COMMTX]		= 7,
> diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
> index fe0baaf..1882eef 100644
> --- a/arch/arm/mach-davinci/devices-da8xx.c
> +++ b/arch/arm/mach-davinci/devices-da8xx.c
> @@ -309,6 +309,34 @@ static struct platform_device da830_mcasp1_device = {
>  	.resource	= da830_mcasp1_resources,
>  };
>  
> +static struct resource da850_mcasp_resources[] = {
> +	{
> +		.name	= "mcasp",
> +		.start	= DAVINCI_DA8XX_MCASP0_REG_BASE,
> +		.end	= DAVINCI_DA8XX_MCASP0_REG_BASE + (SZ_1K * 12) - 1,
> +		.flags	= IORESOURCE_MEM,
> +	},
> +	/* TX event */
> +	{
> +		.start	= DAVINCI_DA8XX_DMA_MCASP0_AXEVT,
> +		.end	= DAVINCI_DA8XX_DMA_MCASP0_AXEVT,
> +		.flags	= IORESOURCE_DMA,
> +	},
> +	/* RX event */
> +	{
> +		.start	= DAVINCI_DA8XX_DMA_MCASP0_AREVT,
> +		.end	= DAVINCI_DA8XX_DMA_MCASP0_AREVT,
> +		.flags	= IORESOURCE_DMA,
> +	},
> +};
> +
> +static struct platform_device da850_mcasp_device = {
> +	.name		= "davinci-mcasp",
> +	.id		= 0,
> +	.num_resources	= ARRAY_SIZE(da850_mcasp_resources),
> +	.resource	= da850_mcasp_resources,
> +};
> +
>  int __init da8xx_register_emac(void)
>  {
>  	return platform_device_register(&da8xx_emac_device);
> @@ -316,8 +344,12 @@ int __init da8xx_register_emac(void)
>  
>  void __init da8xx_init_mcasp(int id, struct snd_platform_data *pdata)
>  {
> -	if (id == 1) { /* DA830/OMAP-L137 has 3 instances of McASP */
> +	/* DA830/OMAP-L137 has 3 instances of McASP */
> +	if (cpu_is_davinci_da830() && id == 1) {
>  		da830_mcasp1_device.dev.platform_data = pdata;
>  		platform_device_register(&da830_mcasp1_device);
> +	} else if (cpu_is_davinci_da850()) {
> +		da850_mcasp_device.dev.platform_data = pdata;
> +		platform_device_register(&da850_mcasp_device);
>  	}
>  }
> diff --git a/arch/arm/mach-davinci/include/mach/asp.h b/arch/arm/mach-davinci/include/mach/asp.h
> index f3c97ac..18e4ce3 100644
> --- a/arch/arm/mach-davinci/include/mach/asp.h
> +++ b/arch/arm/mach-davinci/include/mach/asp.h
> @@ -15,6 +15,9 @@
>  #define	DAVINCI_DM646X_MCASP0_REG_BASE		0x01D01000
>  #define DAVINCI_DM646X_MCASP1_REG_BASE		0x01D01800
>  
> +/* Bases of da850/da830 McASP0  register banks */
> +#define DAVINCI_DA8XX_MCASP0_REG_BASE	0x01D00000
> +
>  /* Bases of da830 McASP1 register banks */
>  #define DAVINCI_DA830_MCASP1_REG_BASE	0x01D04000
>  
> @@ -29,6 +32,10 @@
>  #define	DAVINCI_DM646X_DMA_MCASP0_AREVT0	9
>  #define	DAVINCI_DM646X_DMA_MCASP1_AXEVT1	12
>  
> +/* EDMA channels of da850/da830 McASP0 */
> +#define	DAVINCI_DA8XX_DMA_MCASP0_AREVT	0
> +#define	DAVINCI_DA8XX_DMA_MCASP0_AXEVT	1
> +
>  /* EDMA channels of da830 McASP1 */
>  #define	DAVINCI_DA830_DMA_MCASP1_AREVT	2
>  #define	DAVINCI_DA830_DMA_MCASP1_AXEVT	3
> diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
> index a676b2f..f50f5b2 100644
> --- a/arch/arm/mach-davinci/include/mach/mux.h
> +++ b/arch/arm/mach-davinci/include/mach/mux.h
> @@ -748,6 +748,31 @@ enum davinci_da850_index {
>  	DA850_MII_RXD_2,
>  	DA850_MII_RXD_1,
>  	DA850_MII_RXD_0,
> +
> +	/* McASP function */
> +	DA850_ACLKR,
> +	DA850_ACLKX,
> +	DA850_AFSR,
> +	DA850_AFSX,
> +	DA850_AHCLKR,
> +	DA850_AHCLKX,
> +	DA850_AMUTE,
> +	DA850_AXR_15,
> +	DA850_AXR_14,
> +	DA850_AXR_13,
> +	DA850_AXR_12,
> +	DA850_AXR_11,
> +	DA850_AXR_10,
> +	DA850_AXR_9,
> +	DA850_AXR_8,
> +	DA850_AXR_7,
> +	DA850_AXR_6,
> +	DA850_AXR_5,
> +	DA850_AXR_4,
> +	DA850_AXR_3,
> +	DA850_AXR_2,
> +	DA850_AXR_1,
> +	DA850_AXR_0,
>  };
>  
>  #ifdef CONFIG_DAVINCI_MUX
> -- 
> 1.5.6
>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

  reply	other threads:[~2009-08-12 18:32 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-11 21:03 [PATCH] ARM: DaVinci: Audio support for DA850/OMAP-L138 EVM Chaithrika U S
2009-08-12 18:32 ` Kevin Hilman [this message]
2010-01-16 23:25 ` Ambrose, Martin
2010-01-20 22:12   ` Ambrose, Martin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8763csubmi.fsf@deeprootsystems.com \
    --to=khilman@deeprootsystems.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=chaithrika@ti.com \
    --cc=davinci-linux-open-source@linux.davincidsp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox