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 /arch/arm/mach-s3c/s3c64xx.c | |
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 'arch/arm/mach-s3c/s3c64xx.c')
-rw-r--r-- | arch/arm/mach-s3c/s3c64xx.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c/s3c64xx.c b/arch/arm/mach-s3c/s3c64xx.c index b5fc615a482f..4dfb648142f2 100644 --- a/arch/arm/mach-s3c/s3c64xx.c +++ b/arch/arm/mach-s3c/s3c64xx.c @@ -95,7 +95,12 @@ static struct cpu_table cpu_ids[] __initdata = { /* minimal IO mapping */ -/* see notes on uart map in arch/arm/mach-s3c64xx/include/mach/debug-macro.S */ +/* + * note, for the boot process to work we have to keep the UART + * virtual address aligned to an 1MiB boundary for the L1 + * mapping the head code makes. We keep the UART virtual address + * aligned and add in the offset when we load the value here. + */ #define UART_OFFS (S3C_PA_UART & 0xfffff) static struct map_desc s3c_iodesc[] __initdata = { |