[PATCH 06/11] ep93xx: Don't use system controller defines in audio drivers

[H Hartley Sweeten]

On Tuesday, January 10, 2012 8:15 PM, Ryan Mallon wrote:
>
> Both the Snapper CL15 and EDB93xx audio drivers set the same
> audio configuration in ep93xx_i2s_acquire. Remove the arguments
>  to ep93xx_i2s_acquire so that the audio drivers no longer need
> the EP93XX_SYSCON defines exported.
> 
> Cc: Hartley Sweeten <hsweeten at visionengravers.com>
> Cc: Mika Westerberg <mika.westerberg at iki.fi>
> Cc: Liam Girdwood <lrg at ti.com>
> Cc: Mark Brown <broonie at opensource.wolfsonmicro.com>
> Signed-off-by: Ryan Mallon <rmallon at gmail.com>
> ---
>  arch/arm/mach-ep93xx/core.c                  |   19 ++++---------------
>  arch/arm/mach-ep93xx/include/mach/platform.h |    2 +-
>  sound/soc/ep93xx/edb93xx.c                   |    4 +---
>  sound/soc/ep93xx/snappercl15.c               |    4 +---
>  4 files changed, 7 insertions(+), 22 deletions(-)
>
> diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index bd59696..0726b7b 100644
> --- a/arch/arm/mach-ep93xx/core.c
> +++ b/arch/arm/mach-ep93xx/core.c
> @@ -836,23 +836,12 @@ void __init ep93xx_register_i2s(void)
>  #define EP93XX_I2SCLKDIV_MASK		(EP93XX_SYSCON_I2SCLKDIV_ORIDE | \
>  					 EP93XX_SYSCON_I2SCLKDIV_SPOL)
>  
> -int ep93xx_i2s_acquire(unsigned i2s_pins, unsigned i2s_config)
> +int ep93xx_i2s_acquire(void)
>  {
>  	unsigned val;
>  
> -	/* Sanity check */
> -	if (i2s_pins & ~EP93XX_SYSCON_DEVCFG_I2S_MASK)
> -		return -EINVAL;
> -	if (i2s_config & ~EP93XX_I2SCLKDIV_MASK)
> -		return -EINVAL;
> -
> -	/* Must have only one of I2SONSSP/I2SONAC97 set */
> -	if ((i2s_pins & EP93XX_SYSCON_DEVCFG_I2SONSSP) ==
> -	    (i2s_pins & EP93XX_SYSCON_DEVCFG_I2SONAC97))
> -		return -EINVAL;
> -
> -	ep93xx_devcfg_clear_bits(EP93XX_SYSCON_DEVCFG_I2S_MASK);
> -	ep93xx_devcfg_set_bits(i2s_pins);
> +	ep93xx_devcfg_set_clear(EP93XX_SYSCON_DEVCFG_I2SONAC97,
> +			EP93XX_SYSCON_DEVCFG_I2S_MASK);
>  
>  	/*
>  	 * This is potentially racy with the clock api for i2s_mclk, sclk and @@ -862,7 +851,7 @@ int ep93xx_i2s_acquire(unsigned i2s_pins, unsigned i2s_config)
>  	 */
>  	val = __raw_readl(EP93XX_SYSCON_I2SCLKDIV);
>  	val &= ~EP93XX_I2SCLKDIV_MASK;
> -	val |= i2s_config;
> +	val |= EP93XX_SYSCON_I2SCLKDIV_ORIDE | EP93XX_SYSCON_I2SCLKDIV_SPOL;
> 	ep93xx_syscon_swlocked_write(val, EP93XX_SYSCON_I2SCLKDIV);

Nitpick... You clear then set the same bits here.

> diff --git a/sound/soc/ep93xx/edb93xx.c b/sound/soc/ep93xx/edb93xx.c index 51930b6..3a6ab05 100644
> --- a/sound/soc/ep93xx/edb93xx.c
> +++ b/sound/soc/ep93xx/edb93xx.c
> @@ -94,9 +94,7 @@ static int __devinit edb93xx_probe(struct platform_device *pdev)
>  	struct snd_soc_card *card = &snd_soc_edb93xx;
>  	int ret;
>  
> -	ret = ep93xx_i2s_acquire(EP93XX_SYSCON_DEVCFG_I2SONAC97,
> -				 EP93XX_SYSCON_I2SCLKDIV_ORIDE |
> -				 EP93XX_SYSCON_I2SCLKDIV_SPOL);
> +	ret = ep93xx_i2s_acquire();
>  	if (ret)
>  		return ret;
>  
> diff --git a/sound/soc/ep93xx/snappercl15.c b/sound/soc/ep93xx/snappercl15.c index 2cde433..6ccac5a 100644
> --- a/sound/soc/ep93xx/snappercl15.c
> +++ b/sound/soc/ep93xx/snappercl15.c
> @@ -110,9 +110,7 @@ static int __devinit snappercl15_probe(struct platform_device *pdev)
>  	struct snd_soc_card *card = &snd_soc_snappercl15;
>  	int ret;
>  
> -	ret = ep93xx_i2s_acquire(EP93XX_SYSCON_DEVCFG_I2SONAC97,
> -				 EP93XX_SYSCON_I2SCLKDIV_ORIDE |
> -				 EP93XX_SYSCON_I2SCLKDIV_SPOL);
> +	ret = ep93xx_i2s_acquire();
>  	if (ret)
>  		return ret;
>

Maybe the ep93xx_i2s_acquire() function should be renamed to something
like ep93xx_i2s_ac97_acquire() so that the i2s configuration is understood.
This should address Mark Brown's issue.

Regardless, looks good.

Acked-by: H Hartley Sweeten <hsweeten at visionengravers.com>