diff options
| author | Olof Johansson <olof@lixom.net> | 2020-09-26 22:55:43 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-09-26 22:55:43 +0300 |
| commit | 76940c8d5ab1d3a7939eb08db10ca2cdfd05b8b1 (patch) | |
| tree | c27506586227e98eb6d38a0719574e896cec27ed /drivers/soc | |
| parent | 7a5f0085db9247271c059525eca7baa193201a39 (diff) | |
| parent | 0df3c29f6883facf56ba422dbb060a1ad787f865 (diff) | |
| download | linux-76940c8d5ab1d3a7939eb08db10ca2cdfd05b8b1.tar.xz | |
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 <olof@lixom.net>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/samsung/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/soc/samsung/Kconfig b/drivers/soc/samsung/Kconfig index 5abe82079d2e..fc7f48a92288 100644 --- a/drivers/soc/samsung/Kconfig +++ b/drivers/soc/samsung/Kconfig @@ -42,6 +42,7 @@ config SAMSUNG_PM_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> |