[alsa-devel] [PATCH 1/5] ARM: Kconfig: Move if ARCH_S3C64XX statement to mach-s3c64xx/Kconfig
All other platforms have this condition checked inside their own Kconfig files, so for consistency this patch makes it this way for mach-s3c64xx as well.
Signed-off-by: Tomasz Figa tomasz.figa@gmail.com --- arch/arm/Kconfig | 2 -- arch/arm/mach-s3c64xx/Kconfig | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b766dad..dc51f8a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -995,9 +995,7 @@ source "arch/arm/mach-sti/Kconfig"
source "arch/arm/mach-s3c24xx/Kconfig"
-if ARCH_S3C64XX source "arch/arm/mach-s3c64xx/Kconfig" -endif
source "arch/arm/mach-s5p64x0/Kconfig"
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index bd14e3a..0e23910 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig @@ -3,6 +3,8 @@ # # Licensed under GPLv2
+if ARCH_S3C64XX + # temporary until we can eliminate all drivers using it. config PLAT_S3C64XX bool @@ -322,3 +324,5 @@ config MACH_S3C64XX_DT board. Note: This is under development and not all peripherals can be supported with this machine file. + +endif
Since CONFIG_PLAT_S3C64XX is going to be removed, this patch modifies the gpio-samsung driver to use the proper way of checking for S3C64xx support - CONFIG_ARCH_S3C64XX.
Signed-off-by: Tomasz Figa tomasz.figa@gmail.com --- drivers/gpio/gpio-samsung.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c index 29b5d67..76e02b9 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c @@ -1033,7 +1033,7 @@ static int s3c24xx_gpiolib_fbank_to_irq(struct gpio_chip *chip, unsigned offset) } #endif
-#ifdef CONFIG_PLAT_S3C64XX +#ifdef CONFIG_ARCH_S3C64XX static int s3c64xx_gpiolib_mbank_to_irq(struct gpio_chip *chip, unsigned pin) { return pin < 5 ? IRQ_EINT(23) + pin : -ENXIO; @@ -1174,7 +1174,7 @@ struct samsung_gpio_chip s3c24xx_gpios[] = { */
static struct samsung_gpio_chip s3c64xx_gpios_4bit[] = { -#ifdef CONFIG_PLAT_S3C64XX +#ifdef CONFIG_ARCH_S3C64XX { .chip = { .base = S3C64XX_GPA(0), @@ -1227,7 +1227,7 @@ static struct samsung_gpio_chip s3c64xx_gpios_4bit[] = { };
static struct samsung_gpio_chip s3c64xx_gpios_4bit2[] = { -#ifdef CONFIG_PLAT_S3C64XX +#ifdef CONFIG_ARCH_S3C64XX { .base = S3C64XX_GPH_BASE + 0x4, .chip = { @@ -1257,7 +1257,7 @@ static struct samsung_gpio_chip s3c64xx_gpios_4bit2[] = { };
static struct samsung_gpio_chip s3c64xx_gpios_2bit[] = { -#ifdef CONFIG_PLAT_S3C64XX +#ifdef CONFIG_ARCH_S3C64XX { .base = S3C64XX_GPF_BASE, .config = &samsung_gpio_cfgs[6],
On Sat, Sep 28, 2013 at 8:21 PM, Tomasz Figa tomasz.figa@gmail.com wrote:
Since CONFIG_PLAT_S3C64XX is going to be removed, this patch modifies the gpio-samsung driver to use the proper way of checking for S3C64xx support - CONFIG_ARCH_S3C64XX.
Signed-off-by: Tomasz Figa tomasz.figa@gmail.com
Acked-by: Linus Walleij linus.walleij@linaro.org
I assume that this will go through ARM SoC?
Yours, Linus Walleij
Hi Linus,
On Wednesday 02 of October 2013 12:46:51 Linus Walleij wrote:
On Sat, Sep 28, 2013 at 8:21 PM, Tomasz Figa tomasz.figa@gmail.com
wrote:
Since CONFIG_PLAT_S3C64XX is going to be removed, this patch modifies the gpio-samsung driver to use the proper way of checking for S3C64xx support - CONFIG_ARCH_S3C64XX.
Signed-off-by: Tomasz Figa tomasz.figa@gmail.com
Acked-by: Linus Walleij linus.walleij@linaro.org
Thanks.
I assume that this will go through ARM SoC?
I think so.
Best regards, Tomasz
Since CONFIG_PLAT_S3C64XX is going to be removed, this patch modifies the Kconfig entry of s3c-camif driver to use the proper way of checking for S3C64xx support - CONFIG_ARCH_S3C64XX.
Signed-off-by: Tomasz Figa tomasz.figa@gmail.com --- drivers/media/platform/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index c7caf94..eb70dda 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -112,7 +112,7 @@ config VIDEO_OMAP3_DEBUG config VIDEO_S3C_CAMIF tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver" depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API - depends on (PLAT_S3C64XX || PLAT_S3C24XX) && PM_RUNTIME + depends on (ARCH_S3C64XX || PLAT_S3C24XX) && PM_RUNTIME select VIDEOBUF2_DMA_CONTIG ---help--- This is a v4l2 driver for s3c24xx and s3c64xx SoC series camera
On 09/28/2013 08:21 PM, Tomasz Figa wrote:
Since CONFIG_PLAT_S3C64XX is going to be removed, this patch modifies the Kconfig entry of s3c-camif driver to use the proper way of checking for S3C64xx support - CONFIG_ARCH_S3C64XX.
Signed-off-by: Tomasz Figatomasz.figa@gmail.com
Acked-by: Sylwester Nawrocki s.nawrocki@samsung.com
Since CONFIG_PLAT_S3C64XX is going to be removed, this patch modifies the s3c-i2s-v2 driver to use the proper way of checking for S3C64xx support - CONFIG_ARCH_S3C64XX.
Signed-off-by: Tomasz Figa tomasz.figa@gmail.com --- sound/soc/samsung/s3c-i2s-v2.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c index e5e81b1..fefc561 100644 --- a/sound/soc/samsung/s3c-i2s-v2.c +++ b/sound/soc/samsung/s3c-i2s-v2.c @@ -31,11 +31,7 @@ #undef S3C_IIS_V2_SUPPORTED
#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413) \ - || defined(CONFIG_CPU_S5PV210) -#define S3C_IIS_V2_SUPPORTED -#endif - -#ifdef CONFIG_PLAT_S3C64XX + || defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_CPU_S5PV210) #define S3C_IIS_V2_SUPPORTED #endif
On Sat, Sep 28, 2013 at 08:21:36PM +0200, Tomasz Figa wrote:
Since CONFIG_PLAT_S3C64XX is going to be removed, this patch modifies the s3c-i2s-v2 driver to use the proper way of checking for S3C64xx support - CONFIG_ARCH_S3C64XX.
Acked-by: Mark Brown broonie@linaro.org
CONFIG_PLAT_S3C64XX has been kept in place way too long since it was marked as temporary in commit
110d85a ARM: S3C64XX: Eliminate plat-s3c64xx
After fixing all users of it in previous patches, this patch finally kills this temporary Kconfig entry.
Signed-off-by: Tomasz Figa tomasz.figa@gmail.com --- arch/arm/Kconfig | 2 ++ arch/arm/mach-s3c64xx/Kconfig | 11 ----------- 2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index dc51f8a..40d5178 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -738,10 +738,12 @@ config ARCH_S3C64XX select NEED_MACH_GPIO_H select NO_IOPORT select PLAT_SAMSUNG + select PM_GENERIC_DOMAINS select S3C_DEV_NAND select S3C_GPIO_TRACK select SAMSUNG_ATAGS select SAMSUNG_GPIOLIB_4BIT + select SAMSUNG_WAKEMASK select SAMSUNG_WDT_RESET select USB_ARCH_HAS_OHCI help diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index 0e23910..2cb8dc5 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig @@ -5,17 +5,6 @@
if ARCH_S3C64XX
-# temporary until we can eliminate all drivers using it. -config PLAT_S3C64XX - bool - depends on ARCH_S3C64XX - default y - select PM_GENERIC_DOMAINS - select SAMSUNG_WAKEMASK - help - Base platform code for any Samsung S3C64XX device - - # Configuration options for the S3C6410 CPU
config CPU_S3C6400
Tomasz Figa wrote:
All other platforms have this condition checked inside their own Kconfig files, so for consistency this patch makes it this way for mach-s3c64xx as well.
Signed-off-by: Tomasz Figa tomasz.figa@gmail.com
arch/arm/Kconfig | 2 -- arch/arm/mach-s3c64xx/Kconfig | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b766dad..dc51f8a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -995,9 +995,7 @@ source "arch/arm/mach-sti/Kconfig"
source "arch/arm/mach-s3c24xx/Kconfig"
-if ARCH_S3C64XX source "arch/arm/mach-s3c64xx/Kconfig" -endif
source "arch/arm/mach-s5p64x0/Kconfig"
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index bd14e3a..0e23910 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig @@ -3,6 +3,8 @@ # # Licensed under GPLv2
+if ARCH_S3C64XX
# temporary until we can eliminate all drivers using it. config PLAT_S3C64XX bool @@ -322,3 +324,5 @@ config MACH_S3C64XX_DT board. Note: This is under development and not all peripherals can be supported with this machine file.
+endif
1.8.3.2
Looks good to me, applied 1 to 5 patches into cleanup.
Thanks, Kukjin
participants (5)
-
Kukjin Kim -
Linus Walleij -
Mark Brown -
Sylwester Nawrocki -
Tomasz Figa