[PATCH 05/21] ARM: s3c: simplify platform code

[Arnd Bergmann]

On Mon, Oct 24, 2022, at 14:29, Krzysztof Kozlowski wrote:

>> diff --git a/arch/arm/mach-s3c/Kconfig.s3c64xx b/arch/arm/mach-s3c/Kconfig.s3c64xx
>> index c403d7642f0a..c52c7ce1d8fa 100644
>> --- a/arch/arm/mach-s3c/Kconfig.s3c64xx
>> +++ b/arch/arm/mach-s3c/Kconfig.s3c64xx
>> @@ -15,12 +15,9 @@ menuconfig ARCH_S3C64XX
>>  	select HAVE_TCM
>>  	select PLAT_SAMSUNG
>>  	select PM_GENERIC_DOMAINS if PM
>> -	select S3C_DEV_NAND if ATAGS
>>  	select S3C_GPIO_TRACK if ATAGS
>> -	select S3C2410_WATCHDOG
>
> This does not seem right. S3C2410_WATCHDOG is a driver used by all
> (including Exynos) platforms.

I don't remember why I removed this line, probably because I
removed S3C_DEV_WDT after there are no references to that
symbol left in board files. The watchdog driver is now DT-only
with cragg6410 being the last remaining board file.

Ideally we should not 'select' it from here but instead have
it enabled in the defconfig file, but I agree that would
be something to do in a separate patch, while the patch here
should not change the behavior. I'll revert this part.

>> @@ -121,10 +118,8 @@ config MACH_WLF_CRAGG_6410
>>  	select S3C_DEV_HSMMC1
>>  	select S3C_DEV_HSMMC2
>>  	select S3C_DEV_I2C1
>> -	select S3C_DEV_RTC
>
> This as well.

I'm fairly sure this can be removed along with S3C_DEV_WDT,
S3C_DEV_I2C[2-7], S3C_DEV_NAND, and S3C_DEV_ONENAND
as I remove the symbols due to the lack of references
from cragg6410.

I folded in this fixup now:

--- a/arch/arm/mach-s3c/Kconfig.s3c64xx
+++ b/arch/arm/mach-s3c/Kconfig.s3c64xx
@@ -16,8 +16,10 @@ menuconfig ARCH_S3C64XX
        select PLAT_SAMSUNG
        select PM_GENERIC_DOMAINS if PM
        select S3C_GPIO_TRACK if ATAGS
+       select S3C2410_WATCHDOG
        select SAMSUNG_ATAGS if ATAGS
        select SAMSUNG_WAKEMASK if PM
+       select WATCHDOG
        help
          Samsung S3C64XX series based systems
 
      Arnd