Samsung mach/soc changes for v5.20
1. Use preferred strscpy() over strlcpy(). 2. Kconfig indentation cleanup. -----BEGIN PGP SIGNATURE----- iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmK1bZsQHGtyemtAa2Vy bmVsLm9yZwAKCRDBN2bmhouD1zvCD/94GTjMhy7XeGMKipzewmRYOAJ5VrP+aN8G tG5J+Uw3ETqzWDEk6pdD1E7iKKard9U1+YPc7LYtjuMZoSkyFlfmXXX21j8WIZos R3qJJ/o5c7s3n2tIzuIK4mwjgc7zQapObqRRmaK8+tvYIlTRQNa0BUDUxOyv2Ix+ DC/NRipKIoiUl68200oQ3gvjOgqDhCDsR4dkG/1xLaxQOX4BMX6KjYitITqGSHk4 DhmXTThqsh9TP2UZsQ1Z/p8rBTOdAAP9dHnbmMY60E7auiiZVoOCXLW3pbBLxVN7 mz/6tdwSbioPmLYGOi2dUEsje0qzKx43JuUyc34MOWuT9oyK3q9fv8HG7R5gVmMX xqeJ1M6Wc9I8Z7hGi95P+LgVRkpIqvg5w5+bAdamdJX6D+9+UQRg+UbMPy0a6c97 xhz6uxfVv9R1X2TAC93xL7ifflY8vPU3Mr3NCePiSRLCHmGYee617rSGDRwmGb6k kIRHDyGWfofmbz1Uix5/NlvKK6jqDEGtXA9k9IFrIvMBPpG0wabjaTPUJAT5VQ4f O20bHpcmis0hgDdfYSySKPtHEoWRYhU2azHLnn1+UoOjnggoDr8Hzqy096cqeNaX 23ON/l7Kme4+xRJxZtyuqhk9wqRAzMPJjF2ycxpHEGGGa6D6Ye678MRrlDjuHU3r JQK9622jGQ== =tkSi -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmK/XbQACgkQmmx57+YA GNllyg//bTdTXTFEd/gGmuk+CIydaTWPoiOii/JBTu/Sv0jXW5aSOO2A/0M7gUrX yqN84Y6Jglkx4zPhMeMB1Bv0IfF0SCJalvoYUhyvSjIL1AFYwROx5li3BqnZWm44 KqQ0U1skpWC1DjtHE/nZfRgQzH3hGCxXJqDu4drt1kbcxYresGeGVR8+1j2UALu0 1abZEQtDO28cdDYOz+VjI4Www+nXMfLjfoLiLTvWUegRIcskYZabLG8+UBbIIr0S XHRP9D4GpF0r3+tvd5dlTyqMJX631XDzs7fTrXH8zJ4u+r84FXZXAD9SCATBbpAX kkgcDWQzLcphjx7kT5bb4dV+dPYcBaypXEUusWfNmd/klhyqUUZmHsCEqqsCcByu vW91fXiADQ/PPJeNGrXZRh6WC7JdEXNT943vuoX21d4ICM2f/qNQVwcdweXtYYRr M9aGJlwMK9Q8Ni0eZ0eqpfXWYjhuZeg/rvAK3uzhZtKTSlPSczj8rXoZXxX4vqJi zEsecLZbBVuoNlJGL3a6p/AXrWMt2oYgU2W23FlOWH2pwQzIZD7udpkS+pGxC5hf X/h9hb1YsxGlMxmZKHsOVISt8LRxHNfMLoMCqI7pQKW2cybHGivInFLBvesk7/gJ 9Rm0iIVlPnP+/DEboyb3V3ihSbAOk6albxqOxNODT0tYBjUF/qo= =oRWp -----END PGP SIGNATURE----- Merge tag 'samsung-soc-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/soc Samsung mach/soc changes for v5.20 1. Use preferred strscpy() over strlcpy(). 2. Kconfig indentation cleanup. * tag 'samsung-soc-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: s3c: Kconfig.s3c64xx: Fix indentation ARM: s3c: Kconfig.s3c24xx: Fix indentation and replace some tabs ARM: s3c: Kconfig: Fix indentation ARM: s3c: Use strscpy to replace strlcpy Link: https://lore.kernel.org/r/20220624080746.31947-3-krzysztof.kozlowski@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
1c74a93ce9
@ -43,12 +43,12 @@ config SAMSUNG_ATAGS
|
||||
def_bool n
|
||||
depends on ATAGS
|
||||
help
|
||||
This option enables ATAGS based boot support code for
|
||||
Samsung platforms, including static platform devices, legacy
|
||||
clock, timer and interrupt initialization, etc.
|
||||
This option enables ATAGS based boot support code for
|
||||
Samsung platforms, including static platform devices, legacy
|
||||
clock, timer and interrupt initialization, etc.
|
||||
|
||||
Platforms that support only DT based boot need not to select
|
||||
this option.
|
||||
Platforms that support only DT based boot need not to select
|
||||
this option.
|
||||
|
||||
if SAMSUNG_ATAGS
|
||||
|
||||
@ -102,7 +102,7 @@ config S3C_DEV_HSMMC3
|
||||
config S3C_DEV_HWMON
|
||||
bool
|
||||
help
|
||||
Compile in platform device definitions for HWMON
|
||||
Compile in platform device definitions for HWMON
|
||||
|
||||
config S3C_DEV_I2C1
|
||||
bool
|
||||
@ -194,7 +194,7 @@ config S3C64XX_DEV_SPI0
|
||||
config SAMSUNG_DEV_TS
|
||||
bool
|
||||
help
|
||||
Common in platform device definitions for touchscreen device
|
||||
Common in platform device definitions for touchscreen device
|
||||
|
||||
config SAMSUNG_DEV_KEYPAD
|
||||
bool
|
||||
|
@ -37,8 +37,6 @@ config PLAT_S3C24XX
|
||||
help
|
||||
Base platform code for any Samsung S3C24XX device
|
||||
|
||||
|
||||
|
||||
menu "Samsung S3C24XX SoCs Support"
|
||||
|
||||
comment "S3C24XX SoCs"
|
||||
@ -293,7 +291,7 @@ config MACH_VR1000
|
||||
help
|
||||
Say Y here if you are using the Thorcom VR1000 board.
|
||||
|
||||
endif # CPU_S3C2410
|
||||
endif # CPU_S3C2410
|
||||
|
||||
config S3C2412_PM_SLEEP
|
||||
bool
|
||||
@ -367,7 +365,7 @@ config MACH_VSTMS
|
||||
help
|
||||
Say Y here if you are using an VSTMS board
|
||||
|
||||
endif # CPU_S3C2412
|
||||
endif # CPU_S3C2412
|
||||
|
||||
if CPU_S3C2416
|
||||
|
||||
@ -415,7 +413,7 @@ config MACH_S3C2416_DT
|
||||
Note: This is under development and not all peripherals can be supported
|
||||
with this machine file.
|
||||
|
||||
endif # CPU_S3C2416
|
||||
endif # CPU_S3C2416
|
||||
|
||||
if CPU_S3C2440 || CPU_S3C2442
|
||||
|
||||
@ -444,7 +442,7 @@ config S3C2440_PLL_16934400
|
||||
default y if S3C24XX_PLL
|
||||
help
|
||||
PLL tables for S3C2440 or S3C2442 CPUs with 16.934MHz crystals.
|
||||
endif
|
||||
endif # CPU_S3C2440 || CPU_S3C2442
|
||||
|
||||
if CPU_S3C2440
|
||||
|
||||
@ -540,7 +538,7 @@ config SMDK2440_CPU2440
|
||||
default y if ARCH_S3C2440
|
||||
select S3C2440_XTAL_16934400
|
||||
|
||||
endif # CPU_S3C2440
|
||||
endif # CPU_S3C2440
|
||||
|
||||
if CPU_S3C2442
|
||||
|
||||
@ -559,7 +557,7 @@ config MACH_NEO1973_GTA02
|
||||
select POWER_SUPPLY
|
||||
select S3C_DEV_USB_HOST
|
||||
help
|
||||
Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone
|
||||
Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone
|
||||
|
||||
config MACH_RX1950
|
||||
bool "HP iPAQ rx1950"
|
||||
@ -570,9 +568,9 @@ config MACH_RX1950
|
||||
select S3C2440_XTAL_16934400
|
||||
select S3C_DEV_NAND
|
||||
help
|
||||
Say Y here if you're using HP iPAQ rx1950
|
||||
Say Y here if you're using HP iPAQ rx1950
|
||||
|
||||
endif # CPU_S3C2442
|
||||
endif # CPU_S3C2442
|
||||
|
||||
if CPU_S3C2443 || CPU_S3C2416
|
||||
|
||||
@ -581,7 +579,7 @@ config S3C2443_SETUP_SPI
|
||||
help
|
||||
Common setup code for SPI GPIO configurations
|
||||
|
||||
endif # CPU_S3C2443 || CPU_S3C2416
|
||||
endif # CPU_S3C2443 || CPU_S3C2416
|
||||
|
||||
if CPU_S3C2443
|
||||
|
||||
@ -594,13 +592,13 @@ config MACH_SMDK2443
|
||||
help
|
||||
Say Y here if you are using an SMDK2443
|
||||
|
||||
endif # CPU_S3C2443
|
||||
endif # CPU_S3C2443
|
||||
|
||||
config PM_H1940
|
||||
bool
|
||||
help
|
||||
Internal node for H1940 and related PM
|
||||
|
||||
endmenu # Samsung S3C24XX SoCs Support
|
||||
endmenu # "Samsung S3C24XX SoCs Support"
|
||||
|
||||
endif # ARCH_S3C24XX
|
||||
endif # ARCH_S3C24XX
|
||||
|
@ -104,7 +104,7 @@ config S3C64XX_SETUP_SDHCI_GPIO
|
||||
config S3C64XX_SETUP_SPI
|
||||
bool
|
||||
help
|
||||
Common setup code for SPI GPIO configurations
|
||||
Common setup code for SPI GPIO configurations
|
||||
|
||||
config S3C64XX_SETUP_USB_PHY
|
||||
bool
|
||||
@ -114,7 +114,7 @@ config S3C64XX_SETUP_USB_PHY
|
||||
# S36400 Macchine support
|
||||
|
||||
config MACH_SMDK6400
|
||||
bool "SMDK6400"
|
||||
bool "SMDK6400"
|
||||
depends on ATAGS
|
||||
select CPU_S3C6400
|
||||
select S3C64XX_SETUP_SDHCI
|
||||
@ -205,7 +205,7 @@ config SMDK6410_SD_CH0
|
||||
bool "Use channel 0 only"
|
||||
depends on MACH_SMDK6410
|
||||
help
|
||||
Select CON7 (channel 0) as the MMC/SD slot, as
|
||||
Select CON7 (channel 0) as the MMC/SD slot, as
|
||||
at least some SMDK6410 boards come with the
|
||||
resistors fitted so that the card detects for
|
||||
channels 0 and 1 are the same.
|
||||
@ -214,7 +214,7 @@ config SMDK6410_SD_CH1
|
||||
bool "Use channel 1 only"
|
||||
depends on MACH_SMDK6410
|
||||
help
|
||||
Select CON6 (channel 1) as the MMC/SD slot, as
|
||||
Select CON6 (channel 1) as the MMC/SD slot, as
|
||||
at least some SMDK6410 boards come with the
|
||||
resistors fitted so that the card detects for
|
||||
channels 0 and 1 are the same.
|
||||
@ -260,7 +260,7 @@ config MACH_NCP
|
||||
select S3C_DEV_HSMMC1
|
||||
select S3C_DEV_I2C1
|
||||
help
|
||||
Machine support for the Samsung NCP
|
||||
Machine support for the Samsung NCP
|
||||
|
||||
config MACH_HMT
|
||||
bool "Airgoo HMT"
|
||||
@ -292,21 +292,21 @@ config MACH_SMARTQ
|
||||
select SAMSUNG_DEV_PWM
|
||||
select SAMSUNG_DEV_TS
|
||||
help
|
||||
Shared machine support for SmartQ 5/7
|
||||
Shared machine support for SmartQ 5/7
|
||||
|
||||
config MACH_SMARTQ5
|
||||
bool "SmartQ 5"
|
||||
depends on ATAGS
|
||||
select MACH_SMARTQ
|
||||
help
|
||||
Machine support for the SmartQ 5
|
||||
Machine support for the SmartQ 5
|
||||
|
||||
config MACH_SMARTQ7
|
||||
bool "SmartQ 7"
|
||||
depends on ATAGS
|
||||
select MACH_SMARTQ
|
||||
help
|
||||
Machine support for the SmartQ 7
|
||||
Machine support for the SmartQ 7
|
||||
|
||||
config MACH_WLF_CRAGG_6410
|
||||
bool "Wolfson Cragganmore 6410"
|
||||
|
@ -624,7 +624,7 @@ static char mini2440_features_str[12] __initdata = "0tb";
|
||||
static int __init mini2440_features_setup(char *str)
|
||||
{
|
||||
if (str)
|
||||
strlcpy(mini2440_features_str, str,
|
||||
strscpy(mini2440_features_str, str,
|
||||
sizeof(mini2440_features_str));
|
||||
return 1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user