[PATCH 1/2] ASoC: Convert S3C24XX I2S driver to gpiolib API

[PATCH 1/2] ASoC: Convert S3C24XX I2S driver to gpiolib API

[Sylwester Nawrocki]

The s3c2410_gpio* calls are obsolete and have been scheduled for
removal since several kernel releases. Remove them and use common
gpiolib API.
This patch is a prerequisite for removal of the S3C24XX SoC specific
arch/arm/plat-samsung/include/gpio-fns.h header.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
---
 sound/soc/samsung/s3c24xx-i2s.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index c4aa4d4..0aae3a3 100644
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -23,7 +23,6 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>

-#include <mach/regs-gpio.h>
 #include <mach/dma.h>
 #include <plat/regs-iis.h>

@@ -391,12 +390,9 @@ static int s3c24xx_i2s_probe(struct snd_soc_dai *dai)
 	}
 	clk_enable(s3c24xx_i2s.iis_clk);

-	/* Configure the I2S pins in correct mode */
-	s3c2410_gpio_cfgpin(S3C2410_GPE0, S3C2410_GPE0_I2SLRCK);
-	s3c2410_gpio_cfgpin(S3C2410_GPE1, S3C2410_GPE1_I2SSCLK);
-	s3c2410_gpio_cfgpin(S3C2410_GPE2, S3C2410_GPE2_CDCLK);
-	s3c2410_gpio_cfgpin(S3C2410_GPE3, S3C2410_GPE3_I2SSDI);
-	s3c2410_gpio_cfgpin(S3C2410_GPE4, S3C2410_GPE4_I2SSDO);
+	/* Configure the I2S pins (GPE0...GPE4) in correct mode */
+	s3c_gpio_cfgall_range(S3C2410_GPE(0), 5, S3C_GPIO_SFN(2),
+			      S3C_GPIO_PULL_NONE);

 	writel(S3C2410_IISCON_IISEN, s3c24xx_i2s.regs + S3C2410_IISCON);

--
1.7.4.1

[PATCH 2/2] ASoC: Convert S3C2412 I2S driver to gpiolib API

[Sylwester Nawrocki]

The s3c2410_gpio* calls are obsolete and have been scheduled for
removal since several kernel releases. Remove them and use common
gpiolib API.
This patch is a prerequisite for removal of the S3C24XX SoC specific
arch/arm/plat-samsung/include/gpio-fns.h header.

Compile tested only.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
---
 sound/soc/samsung/s3c2412-i2s.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index 79fbeea..ac7701b 100644
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -25,7 +25,6 @@
 #include <sound/soc.h>
 #include <sound/pcm_params.h>

-#include <mach/regs-gpio.h>
 #include <mach/dma.h>

 #include "dma.h"
@@ -83,12 +82,9 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai)

 	s3c2412_i2s.iis_cclk = s3c2412_i2s.iis_pclk;

-	/* Configure the I2S pins in correct mode */
-	s3c2410_gpio_cfgpin(S3C2410_GPE0, S3C2410_GPE0_I2SLRCK);
-	s3c2410_gpio_cfgpin(S3C2410_GPE1, S3C2410_GPE1_I2SSCLK);
-	s3c2410_gpio_cfgpin(S3C2410_GPE2, S3C2410_GPE2_CDCLK);
-	s3c2410_gpio_cfgpin(S3C2410_GPE3, S3C2410_GPE3_I2SSDI);
-	s3c2410_gpio_cfgpin(S3C2410_GPE4, S3C2410_GPE4_I2SSDO);
+	/* Configure the I2S pins (GPE0...GPE4) in correct mode */
+	s3c_gpio_cfgall_range(S3C2410_GPE(0), 5, S3C_GPIO_SFN(2),
+			      S3C_GPIO_PULL_NONE);

 	return 0;
 }
--
1.7.4.1

Re: [PATCH 1/2] ASoC: Convert S3C24XX I2S driver to gpiolib API

[Sylwester Nawrocki]

Hello,

On 06/30/2012 02:37 PM, Sylwester Nawrocki wrote:
> The s3c2410_gpio* calls are obsolete and have been scheduled for
> removal since several kernel releases. Remove them and use common
> gpiolib API.
> This patch is a prerequisite for removal of the S3C24XX SoC specific
> arch/arm/plat-samsung/include/gpio-fns.h header.
> 
> Cc: Ben Dooks<ben-linux@fluff.org>
> Signed-off-by: Sylwester Nawrocki<sylvester.nawrocki@gmail.com>
> ---
>   sound/soc/samsung/s3c24xx-i2s.c |   10 +++-------
>   1 files changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
> index c4aa4d4..0aae3a3 100644
> --- a/sound/soc/samsung/s3c24xx-i2s.c
> +++ b/sound/soc/samsung/s3c24xx-i2s.c
> @@ -23,7 +23,6 @@
>   #include<sound/soc.h>
>   #include<sound/pcm_params.h>
> 
> -#include<mach/regs-gpio.h>
>   #include<mach/dma.h>
>   #include<plat/regs-iis.h>
> 
> @@ -391,12 +390,9 @@ static int s3c24xx_i2s_probe(struct snd_soc_dai *dai)
>   	}
>   	clk_enable(s3c24xx_i2s.iis_clk);
> 
> -	/* Configure the I2S pins in correct mode */
> -	s3c2410_gpio_cfgpin(S3C2410_GPE0, S3C2410_GPE0_I2SLRCK);
> -	s3c2410_gpio_cfgpin(S3C2410_GPE1, S3C2410_GPE1_I2SSCLK);
> -	s3c2410_gpio_cfgpin(S3C2410_GPE2, S3C2410_GPE2_CDCLK);
> -	s3c2410_gpio_cfgpin(S3C2410_GPE3, S3C2410_GPE3_I2SSDI);
> -	s3c2410_gpio_cfgpin(S3C2410_GPE4, S3C2410_GPE4_I2SSDO);
> +	/* Configure the I2S pins (GPE0...GPE4) in correct mode */
> +	s3c_gpio_cfgall_range(S3C2410_GPE(0), 5, S3C_GPIO_SFN(2),
> +			      S3C_GPIO_PULL_NONE);
> 
>   	writel(S3C2410_IISCON_IISEN, s3c24xx_i2s.regs + S3C2410_IISCON);
> 
> --

These are the only two patches (out of 15) that are now needed to remove
some obsolete s3c2410_gpio_* API. 1/2 was tested on Micro2440 board
and 2/2 is an identical change which wasn't tested on a real H/W since 
I don't have any s3c2412 based board. I'm a bit lost through which tree
should these be merged. Could someone please pick these patches up ?

--

Thanks,
Sylwester

Re: [PATCH 1/2] ASoC: Convert S3C24XX I2S driver to gpiolib API

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 512 bytes --]

On Thu, Jul 12, 2012 at 03:56:36PM +0200, Sylwester Nawrocki wrote:

> These are the only two patches (out of 15) that are now needed to remove
> some obsolete s3c2410_gpio_* API. 1/2 was tested on Micro2440 board
> and 2/2 is an identical change which wasn't tested on a real H/W since 
> I don't have any s3c2412 based board. I'm a bit lost through which tree
> should these be merged. Could someone please pick these patches up ?

If you send them to the relevant maintainers that'd probably help...

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 1/2] ASoC: Convert S3C24XX I2S driver to gpiolib API

[Sylwester Nawrocki]

On 07/12/2012 06:19 PM, Mark Brown wrote:
> On Thu, Jul 12, 2012 at 03:56:36PM +0200, Sylwester Nawrocki wrote:
>
>> These are the only two patches (out of 15) that are now needed to remove
>> some obsolete s3c2410_gpio_* API. 1/2 was tested on Micro2440 board
>> and 2/2 is an identical change which wasn't tested on a real H/W since
>> I don't have any s3c2412 based board. I'm a bit lost through which tree
>> should these be merged. Could someone please pick these patches up ?
>
> If you send them to the relevant maintainers that'd probably help...

Thanks, would that be Takashi Iwai and Jaroslav Kysela then ? I just
want to get it right this time...
Or perhaps could you take care of them ?

Re: [PATCH 1/2] ASoC: Convert S3C24XX I2S driver to gpiolib API

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 281 bytes --]

On Thu, Jul 12, 2012 at 08:09:09PM +0200, Sylwester Nawrocki wrote:

> Thanks, would that be Takashi Iwai and Jaroslav Kysela then ? I just
> want to get it right this time...
> Or perhaps could you take care of them ?

As with everything else look in MAINTAINERS, so me for ASoC.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH 1/2] ASoC: Convert S3C24XX I2S driver to gpiolib API

[Sylwester Nawrocki]

On 07/13/2012 04:28 PM, Mark Brown wrote:
> On Thu, Jul 12, 2012 at 08:09:09PM +0200, Sylwester Nawrocki wrote:
> 
>> Thanks, would that be Takashi Iwai and Jaroslav Kysela then ? I just
>> want to get it right this time...
>> Or perhaps could you take care of them ?
> 
> As with everything else look in MAINTAINERS, so me for ASoC.

Gah, how could I miss that.. especially having gone through the
WolfsonMicro ASoC website before. scripts/get_maintainer.pl must have
led me astray:

$ scripts/get_maintainer.pl -f sound/soc/samsung
Ben Dooks <ben-linux@fluff.org> (maintainer:ARM/SAMSUNG ARM A...)
Kukjin Kim <kgene.kim@samsung.com> (maintainer:ARM/SAMSUNG ARM A...)
Sangbeom Kim <sbkim73@samsung.com> (supporter:SAMSUNG AUDIO (AS...)
Liam Girdwood <lrg@ti.com> (supporter:SOUND - SOC LAYER...)
Mark Brown <broonie@opensource.wolfsonmicro.com> (supporter:SOUND - SOC LAYER...)
Jaroslav Kysela <perex@perex.cz> (maintainer:SOUND)
Takashi Iwai <tiwai@suse.de> (maintainer:SOUND)
linux-arm-kernel@lists.infradead.org (moderated list:ARM/SAMSUNG ARM A...)
linux-samsung-soc@vger.kernel.org (moderated list:ARM/SAMSUNG ARM A...)
alsa-devel@alsa-project.org (moderated list:SAMSUNG AUDIO (AS...)
linux-kernel@vger.kernel.org (open list)

Looks like there is something that could be improved in the MAINTAINERS
file.