ARM: Kconfig: Move if ARCH_S3C64XX statement to mach-s3c64xx/Kconfig
Subsystems (8)
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.
--- arch/arm/Kconfig | 2 -- arch/arm/mach-s3c64xx/Kconfig | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-)
arch/arm/Kconfig +0 -2
@@ -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"
arch/arm/mach-s3c64xx/Kconfig +4 -0
@@ -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
Signature · 1 line
1.8.3.2
PATCH 2/5 gpio: samsung: Use CONFIG_ARCH_S3C64XX to check for S3C64xx support
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.
--- drivers/gpio/gpio-samsung.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpio/gpio-samsung.c +4 -4
@@ -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],
Signature · 1 line
1.8.3.2
Re: [PATCH 2/5] gpio: samsung: Use CONFIG_ARCH_S3C64XX to check for S3C64xx support
Quoted 5 lines · Tomasz Figa
Since
CONFIG_PLAT_S3C64XXis 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 <[email protected]>
I assume that this will go through ARM SoC?
Yours,
Linus Walleij
Re: [PATCH 2/5] gpio: samsung: Use CONFIG_ARCH_S3C64XX to check for S3C64xx support
Hi Linus,
Quoted 1 line · On Wednesday 02 of October 2013 12:46:51 Linus Walleij wrote:
On Sat, Sep 28, 2013 at 8:21 PM, Tomasz Figa <[email protected]>
Quoted 7 lines · wrote:
Quoted 5 lines
Since
CONFIG_PLAT_S3C64XXis 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 <[email protected]>Acked-by Linus Walleij <[email protected]>
Thanks.
Quoted 1 line
I assume that this will go through ARM SoC?
I think so.
Best regards,
Tomasz
PATCH 3/5 s3c-camif: Use CONFIG_ARCH_S3C64XX to check for S3C64xx support
In reply to Tomasz FigaSince 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.
--- drivers/media/platform/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/Kconfig +1 -1
@@ -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
Signature · 1 line
1.8.3.2
Re: [PATCH 3/5] [media] s3c-camif: Use CONFIG_ARCH_S3C64XX to check for S3C64xx support
Quoted 5 lines · Tomasz Figa
Since
CONFIG_PLAT_S3C64XXis going to be removed, this patch modifies theKconfigentry of s3c-camif driver to use the proper way of checking for S3C64xx support -CONFIG_ARCH_S3C64XX.Signed-off-by Tomasz Figa<[email protected]>
PATCH 4/5 ASoC: samsung: Use CONFIG_ARCH_S3C64XX to check for S3C64xx support
In reply to Tomasz FigaSince 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.
--- sound/soc/samsung/s3c-i2s-v2.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
sound/soc/samsung/s3c-i2s-v2.c +1 -5
@@ -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
Signature · 1 line
1.8.3.2
Re: [PATCH 4/5] ASoC: samsung: Use CONFIG_ARCH_S3C64XX to check for S3C64xx support
Quoted 3 lines · Tomasz Figa
Since
CONFIG_PLAT_S3C64XXis 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.
PATCH 5/5 ARM: s3c64xx: Kill CONFIG_PLAT_S3C64XX
In reply to Tomasz FigaCONFIG_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.
--- arch/arm/Kconfig | 2 ++ arch/arm/mach-s3c64xx/Kconfig | 11 ----------- 2 files changed, 2 insertions(+), 11 deletions(-)
arch/arm/Kconfig +2 -0
@@ -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
arch/arm/mach-s3c64xx/Kconfig +0 -11
@@ -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
Signature · 1 line
1.8.3.2
Quoted 45 lines · Tomasz Figa
All other platforms have this condition checked inside their own
Kconfigfiles, so for consistency this patch makes it this way for mach-s3c64xx as well.Signed-off-by Tomasz Figa <[email protected]>--- arch/arm/Kconfig | 2 -- arch/arm/mach-s3c64xx/Kconfig | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-)arch/arm/Kconfig +0
-2@@ -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"arch/arm/mach-s3c64xx/Kconfig +4
-1@@ -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 --
Quoted 1 line
1.8.3.2
Looks good to me, applied 1 to 5 patches into cleanup.
Thanks,
Kukjin