From: Olof Johansson Date: Sat, 26 Sep 2020 19:55:43 +0000 (-0700) Subject: Merge tag 'samsung-soc-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk... X-Git-Tag: v5.10-rc1~28^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76940c8d5ab1d3a7939eb08db10ca2cdfd05b8b1;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'samsung-soc-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/soc Samsung mach/soc changes for v5.10 1. Clear unneeded L2C-310 flag which presenc was triggering warning message. 2. Fix build of SAMSUNG_PM_DEBUG without MMU. 3. Minor cleanups and update of linux-samsung-soc mailing list in Maintainers. * tag 'samsung-soc-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: s3c64xx: bring back notes from removed debug-macro.S ARM: s3c24xx: fix Wunused-variable warning on !MMU ARM: samsung: fix PM debug build with DEBUG_LL but !MMU MAINTAINERS: mark linux-samsung-soc list non-moderated ARM: exynos: clear L310_AUX_CTRL_NS_LOCKDOWN in default l2c_aux_val Signed-off-by: Olof Johansson --- 76940c8d5ab1d3a7939eb08db10ca2cdfd05b8b1 diff --cc arch/arm/mach-s3c/s3c2416.c index 34b7c101becfd,17157f0632640..126e6ed297136 --- a/arch/arm/mach-s3c/s3c2416.c +++ b/arch/arm/mach-s3c/s3c2416.c @@@ -32,26 -32,26 +32,26 @@@ #include #include -#include -#include +#include "regs-s3c2443-clock.h" +#include "rtc-core-s3c24xx.h" -#include -#include -#include -#include -#include -#include -#include +#include "gpio-core.h" +#include "gpio-cfg.h" +#include "gpio-cfg-helpers.h" +#include "devs.h" +#include "cpu.h" +#include "sdhci.h" +#include "pm.h" -#include -#include +#include "iic-core.h" +#include "adc-core.h" -#include "common.h" -#include "fb-core.h" -#include "nand-core.h" -#include "spi-core.h" +#include "s3c24xx.h" +#include "fb-core-s3c24xx.h" +#include "nand-core-s3c24xx.h" +#include "spi-core-s3c24xx.h" - static struct map_desc s3c2416_iodesc[] __initdata = { + static struct map_desc s3c2416_iodesc[] __initdata __maybe_unused = { IODESC_ENT(WATCHDOG), IODESC_ENT(CLKPWR), IODESC_ENT(TIMER), diff --cc arch/arm/mach-s3c/s3c2443.c index 45fde50b202cf,2afeb53a48d1a..08f9101442466 --- a/arch/arm/mach-s3c/s3c2443.c +++ b/arch/arm/mach-s3c/s3c2443.c @@@ -29,22 -28,21 +29,22 @@@ #include #include -#include -#include +#include "regs-s3c2443-clock.h" +#include "rtc-core-s3c24xx.h" -#include -#include -#include -#include -#include -#include +#include "gpio-core.h" +#include "gpio-cfg.h" +#include "gpio-cfg-helpers.h" +#include "devs.h" +#include "cpu.h" +#include "adc-core.h" -#include "fb-core.h" -#include "nand-core.h" -#include "spi-core.h" +#include "s3c24xx.h" +#include "fb-core-s3c24xx.h" +#include "nand-core-s3c24xx.h" +#include "spi-core-s3c24xx.h" - static struct map_desc s3c2443_iodesc[] __initdata = { + static struct map_desc s3c2443_iodesc[] __initdata __maybe_unused = { IODESC_ENT(WATCHDOG), IODESC_ENT(CLKPWR), IODESC_ENT(TIMER), diff --cc arch/arm/mach-s3c/s3c244x.c index bae93598f009f,4439cfb1d0490..95df3491e650e --- a/arch/arm/mach-s3c/s3c244x.c +++ b/arch/arm/mach-s3c/s3c244x.c @@@ -25,21 -25,23 +25,21 @@@ #include #include -#include +#include "map.h" #include -#include +#include "regs-clock.h" +#include "regs-gpio.h" -#include -#include +#include "devs.h" +#include "cpu.h" +#include "pm.h" -#include -#include -#include - -#include "common.h" -#include "nand-core.h" -#include "regs-dsc.h" +#include "s3c24xx.h" +#include "nand-core-s3c24xx.h" +#include "regs-dsc-s3c24xx.h" - static struct map_desc s3c244x_iodesc[] __initdata = { + static struct map_desc s3c244x_iodesc[] __initdata __maybe_unused = { IODESC_ENT(CLKPWR), IODESC_ENT(TIMER), IODESC_ENT(WATCHDOG), diff --cc drivers/soc/samsung/Kconfig index 5abe82079d2e0,2641856645947..fc7f48a922881 --- a/drivers/soc/samsung/Kconfig +++ b/drivers/soc/samsung/Kconfig @@@ -35,53 -35,7 +35,54 @@@ config EXYNOS_PMU_ARM_DRIVER config EXYNOS_PM_DOMAINS bool "Exynos PM domains" if COMPILE_TEST - depends on PM_GENERIC_DOMAINS || COMPILE_TEST + depends on (ARCH_EXYNOS && PM_GENERIC_DOMAINS) || COMPILE_TEST + +config SAMSUNG_PM_DEBUG + bool "Samsung PM Suspend debug" + depends on PM && DEBUG_KERNEL + depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 + depends on DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART ++ depends on DEBUG_LL && MMU + help + Say Y here if you want verbose debugging from the PM Suspend and + Resume code. See + for more information. + +config S3C_PM_DEBUG_LED_SMDK + bool "SMDK LED suspend/resume debugging" + depends on PM && (MACH_SMDK6410) + help + Say Y here to enable the use of the SMDK LEDs on the baseboard + for debugging of the state of the suspend and resume process. + + Note, this currently only works for S3C64XX based SMDK boards. + +config SAMSUNG_PM_CHECK + bool "S3C2410 PM Suspend Memory CRC" + depends on PM && (PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210) + select CRC32 + help + Enable the PM code's memory area checksum over sleep. This option + will generate CRCs of all blocks of memory, and store them before + going to sleep. The blocks are then checked on resume for any + errors. + + Note, this can take several seconds depending on memory size + and CPU speed. + + See + +config SAMSUNG_PM_CHECK_CHUNKSIZE + int "S3C2410 PM Suspend CRC Chunksize (KiB)" + depends on PM && SAMSUNG_PM_CHECK + default 64 + help + Set the chunksize in Kilobytes of the CRC for checking memory + corruption over suspend and resume. A smaller value will mean that + the CRC data block will take more memory, but will identify any + faults with better precision. + + See config EXYNOS_REGULATOR_COUPLER bool "Exynos SoC Regulator Coupler" if COMPILE_TEST