Merge tag 'samsung-soc-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk...

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 <olof@lixom.net>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-exynos/exynos.c
Simple merge

diff --cc arch/arm/mach-s3c/s3c2410.c
Simple merge

diff --cc arch/arm/mach-s3c/s3c2412.c
Simple merge

diff --cc arch/arm/mach-s3c/s3c2416.c
index 34b7c101becfdc34a01bedcca1acc139ccc78c56,17157f0632640980aa948bd728a1bd7c4b6e8424..126e6ed29713641fee163e5dc1935fcecdcfadad
--- 1/arch/arm/mach-s3c/s3c2416.c
--- 2/arch/arm/mach-s3c24xx/s3c2416.c
+++ b/arch/arm/mach-s3c/s3c2416.c
@@@ -32,26 -32,26 +32,26 @@@
  #include <asm/irq.h>
  #include <asm/system_misc.h>
  
 -#include <mach/regs-s3c2443-clock.h>
 -#include <mach/rtc-core.h>
 +#include "regs-s3c2443-clock.h"
 +#include "rtc-core-s3c24xx.h"
  
 -#include <plat/gpio-core.h>
 -#include <plat/gpio-cfg.h>
 -#include <plat/gpio-cfg-helpers.h>
 -#include <plat/devs.h>
 -#include <plat/cpu.h>
 -#include <plat/sdhci.h>
 -#include <plat/pm.h>
 +#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 <plat/iic-core.h>
 -#include <plat/adc-core.h>
 +#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 45fde50b202cfa36228451bb5901560481f7755f,2afeb53a48d1ae8bf42e2d6683027f2516d3355d..08f9101442466b7c4e47159467493e7b192ffcfd
--- 1/arch/arm/mach-s3c/s3c2443.c
--- 2/arch/arm/mach-s3c24xx/s3c2443.c
+++ b/arch/arm/mach-s3c/s3c2443.c
@@@ -29,22 -28,21 +29,22 @@@
  #include <asm/irq.h>
  #include <asm/system_misc.h>
  
 -#include <mach/regs-s3c2443-clock.h>
 -#include <mach/rtc-core.h>
 +#include "regs-s3c2443-clock.h"
 +#include "rtc-core-s3c24xx.h"
  
 -#include <plat/gpio-core.h>
 -#include <plat/gpio-cfg.h>
 -#include <plat/gpio-cfg-helpers.h>
 -#include <plat/devs.h>
 -#include <plat/cpu.h>
 -#include <plat/adc-core.h>
 +#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 bae93598f009f1aa162f559f76504e16497cf497,4439cfb1d04902c82d1d789bc989c7c198ee3559..95df3491e650ee346011c2fbc9433676e73958e9
--- 1/arch/arm/mach-s3c/s3c244x.c
--- 2/arch/arm/mach-s3c24xx/s3c244x.c
+++ b/arch/arm/mach-s3c/s3c244x.c
@@@ -25,21 -25,23 +25,21 @@@
  #include <asm/mach/map.h>
  #include <asm/mach/irq.h>
  
 -#include <mach/hardware.h>
 +#include "map.h"
  #include <asm/irq.h>
  
 -#include <plat/cpu-freq.h>
 +#include "regs-clock.h"
 +#include "regs-gpio.h"
  
 -#include <mach/regs-clock.h>
 -#include <mach/regs-gpio.h>
 +#include "devs.h"
 +#include "cpu.h"
 +#include "pm.h"
  
 -#include <plat/devs.h>
 -#include <plat/cpu.h>
 -#include <plat/pm.h>
 -
 -#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 arch/arm/mach-s3c/s3c24xx.c
Simple merge

diff --cc arch/arm/mach-s3c/s3c64xx.c
Simple merge

diff --cc drivers/soc/samsung/Kconfig
index 5abe82079d2e0a1bbc8f7b4703a46f14e379eb1e,264185664594717e1d6e4e9c90463a3e8600417a..fc7f48a92288162e8fe73412376fd56ea46e78d6
--- 1/drivers/soc/samsung/Kconfig
--- 2/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 <file:Documentation/arm/samsung-s3c24xx/suspend.rst>
 +        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 <file:Documentation/arm/samsung-s3c24xx/suspend.rst>
 +
 +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 <file:Documentation/arm/samsung-s3c24xx/suspend.rst>
  
  config EXYNOS_REGULATOR_COUPLER
        bool "Exynos SoC Regulator Coupler" if COMPILE_TEST