diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-08-06 20:20:45 +0200 |
|---|---|---|
| committer | Krzysztof Kozlowski <krzk@kernel.org> | 2020-08-20 17:40:57 +0200 |
| commit | 673085f450b218f51793af7ca7614c4149ab38a9 (patch) | |
| tree | daaeffb0323081b6c67c1a100b3f21d313ea14eb /sound | |
| parent | 35ee36c79380f7e72c022c13b83226f134c8b619 (diff) | |
| download | linux-673085f450b218f51793af7ca7614c4149ab38a9.tar.gz linux-673085f450b218f51793af7ca7614c4149ab38a9.tar.bz2 linux-673085f450b218f51793af7ca7614c4149ab38a9.zip | |
ARM: s3c24xx: move iis pinctrl config into boards
The s3c_gpio_cfgall_range() function is an internal interface of the
samsung gpio driver and should not be called directly by drivers, so
move the iis pin initialization into the boards.
This means the pin configuration is only run once at early boot, rather
than each time the driver binds, but the effect should be the same.
Note that the s3c2412-i2s driver has no boards using it in mainline linux,
the driver gets selected for the jive machine but is never instantiated.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20200806182059.2431-28-krzk@kernel.org
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/samsung/s3c2412-i2s.c | 7 | ||||
| -rw-r--r-- | sound/soc/samsung/s3c24xx-i2s.c | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c index edfa9d11d2e5..81f416ac457e 100644 --- a/sound/soc/samsung/s3c2412-i2s.c +++ b/sound/soc/samsung/s3c2412-i2s.c @@ -19,9 +19,6 @@ #include <sound/soc.h> #include <sound/pcm_params.h> -#include <mach/gpio-samsung.h> -#include <plat/gpio-cfg.h> - #include "dma.h" #include "regs-i2s-v2.h" #include "s3c2412-i2s.h" @@ -70,10 +67,6 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai) if (ret) goto err; - /* 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; err: diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 60bfaed5f7a6..50c08008aacb 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -18,10 +18,7 @@ #include <sound/soc.h> #include <sound/pcm_params.h> -#include <mach/gpio-samsung.h> -#include <plat/gpio-cfg.h> #include "regs-iis.h" - #include "dma.h" #include "s3c24xx-i2s.h" @@ -348,10 +345,6 @@ static int s3c24xx_i2s_probe(struct snd_soc_dai *dai) if (ret) return ret; - /* 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); s3c24xx_snd_txctrl(0); |