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 | |
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')
-rw-r--r-- | arch/arm/mach-s3c/s3c2410.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c/s3c2412.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c/s3c2416.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c/s3c2443.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c/s3c244x.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c/s3c24xx.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c/s3c64xx.c | 7 |
7 files changed, 12 insertions, 7 deletions
diff --git a/arch/arm/mach-s3c/s3c2410.c b/arch/arm/mach-s3c/s3c2410.c index 4153e67f0e86..4d39d9939c2f 100644 --- a/arch/arm/mach-s3c/s3c2410.c +++ b/arch/arm/mach-s3c/s3c2410.c @@ -45,7 +45,7 @@ /* Initial IO mappings */ -static struct map_desc s3c2410_iodesc[] __initdata = { +static struct map_desc s3c2410_iodesc[] __initdata __maybe_unused = { IODESC_ENT(CLKPWR), IODESC_ENT(TIMER), IODESC_ENT(WATCHDOG), diff --git a/arch/arm/mach-s3c/s3c2412.c b/arch/arm/mach-s3c/s3c2412.c index 35f4addd110b..0b1ca78c9d2a 100644 --- a/arch/arm/mach-s3c/s3c2412.c +++ b/arch/arm/mach-s3c/s3c2412.c @@ -55,7 +55,7 @@ static inline void s3c2412_init_gpio2(void) /* Initial IO mappings */ -static struct map_desc s3c2412_iodesc[] __initdata = { +static struct map_desc s3c2412_iodesc[] __initdata __maybe_unused = { IODESC_ENT(CLKPWR), IODESC_ENT(TIMER), IODESC_ENT(WATCHDOG), diff --git a/arch/arm/mach-s3c/s3c2416.c b/arch/arm/mach-s3c/s3c2416.c index 34b7c101becf..126e6ed29713 100644 --- a/arch/arm/mach-s3c/s3c2416.c +++ b/arch/arm/mach-s3c/s3c2416.c @@ -51,7 +51,7 @@ #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 --git a/arch/arm/mach-s3c/s3c2443.c b/arch/arm/mach-s3c/s3c2443.c index 45fde50b202c..08f910144246 100644 --- a/arch/arm/mach-s3c/s3c2443.c +++ b/arch/arm/mach-s3c/s3c2443.c @@ -44,7 +44,7 @@ #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 --git a/arch/arm/mach-s3c/s3c244x.c b/arch/arm/mach-s3c/s3c244x.c index bae93598f009..95df3491e650 100644 --- a/arch/arm/mach-s3c/s3c244x.c +++ b/arch/arm/mach-s3c/s3c244x.c @@ -39,7 +39,7 @@ #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 --git a/arch/arm/mach-s3c/s3c24xx.c b/arch/arm/mach-s3c/s3c24xx.c index 26a2190a81ff..ccfed48c98aa 100644 --- a/arch/arm/mach-s3c/s3c24xx.c +++ b/arch/arm/mach-s3c/s3c24xx.c @@ -139,7 +139,7 @@ static struct cpu_table cpu_ids[] __initdata = { /* minimal IO mapping */ -static struct map_desc s3c_iodesc[] __initdata = { +static struct map_desc s3c_iodesc[] __initdata __maybe_unused = { IODESC_ENT(GPIO), IODESC_ENT(IRQ), IODESC_ENT(MEMCTRL), 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 = { |