Skip to content

Commit 76940c8

Browse files
olofjolofj
committed
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>
2 parents 7a5f008 + 0df3c29 commit 76940c8

10 files changed

Lines changed: 22 additions & 16 deletions

File tree

‎MAINTAINERS‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2400,7 +2400,7 @@ ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
24002400
M: Kukjin Kim <kgene@kernel.org>
24012401
M: Krzysztof Kozlowski <krzk@kernel.org>
24022402
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
2403-
L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
2403+
L: linux-samsung-soc@vger.kernel.org
24042404
S: Maintained
24052405
Q: https://patchwork.kernel.org/project/linux-samsung-soc/list/
24062406
F: Documentation/arm/samsung/
@@ -2443,7 +2443,7 @@ F: drivers/media/platform/s5p-g2d/
24432443

24442444
ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT
24452445
M: Marek Szyprowski <m.szyprowski@samsung.com>
2446-
L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
2446+
L: linux-samsung-soc@vger.kernel.org
24472447
L: linux-media@vger.kernel.org
24482448
S: Maintained
24492449
F: Documentation/devicetree/bindings/media/s5p-cec.txt
@@ -13298,7 +13298,7 @@ PCI DRIVER FOR SAMSUNG EXYNOS
1329813298
M: Jingoo Han <jingoohan1@gmail.com>
1329913299
L: linux-pci@vger.kernel.org
1330013300
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
13301-
L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
13301+
L: linux-samsung-soc@vger.kernel.org
1330213302
S: Maintained
1330313303
F: drivers/pci/controller/dwc/pci-exynos.c
1330413304

@@ -13700,7 +13700,7 @@ M: Tomasz Figa <tomasz.figa@gmail.com>
1370013700
M: Krzysztof Kozlowski <krzk@kernel.org>
1370113701
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
1370213702
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
13703-
L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
13703+
L: linux-samsung-soc@vger.kernel.org
1370413704
S: Maintained
1370513705
Q: https://patchwork.kernel.org/project/linux-samsung-soc/list/
1370613706
T: git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git
@@ -15246,7 +15246,7 @@ F: include/linux/mfd/samsung/
1524615246
SAMSUNG S3C24XX/S3C64XX SOC SERIES CAMIF DRIVER
1524715247
M: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
1524815248
L: linux-media@vger.kernel.org
15249-
L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
15249+
L: linux-samsung-soc@vger.kernel.org
1525015250
S: Maintained
1525115251
F: drivers/media/platform/s3c-camif/
1525215252
F: include/media/drv-intf/s3c_camif.h
@@ -15295,7 +15295,7 @@ SAMSUNG SOC CLOCK DRIVERS
1529515295
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
1529615296
M: Tomasz Figa <tomasz.figa@gmail.com>
1529715297
M: Chanwoo Choi <cw00.choi@samsung.com>
15298-
L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
15298+
L: linux-samsung-soc@vger.kernel.org
1529915299
S: Supported
1530015300
T: git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
1530115301
F: Documentation/devicetree/bindings/clock/exynos*.txt
@@ -15311,7 +15311,7 @@ M: Kukjin Kim <kgene@kernel.org>
1531115311
M: Krzysztof Kozlowski <krzk@kernel.org>
1531215312
M: Andi Shyti <andi@etezian.org>
1531315313
L: linux-spi@vger.kernel.org
15314-
L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
15314+
L: linux-samsung-soc@vger.kernel.org
1531515315
S: Maintained
1531615316
F: Documentation/devicetree/bindings/spi/spi-samsung.txt
1531715317
F: drivers/spi/spi-s3c*

‎arch/arm/mach-exynos/exynos.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ static void __init exynos_dt_fixup(void)
206206
}
207207

208208
DT_MACHINE_START(EXYNOS_DT, "Samsung Exynos (Flattened Device Tree)")
209-
.l2c_aux_val = 0x3c400000,
210-
.l2c_aux_mask = 0xc20fffff,
209+
.l2c_aux_val = 0x38400000,
210+
.l2c_aux_mask = 0xc60fffff,
211211
.smp = smp_ops(exynos_smp_ops),
212212
.map_io = exynos_init_io,
213213
.init_early = exynos_firmware_init,

‎arch/arm/mach-s3c/s3c2410.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
/* Initial IO mappings */
4747

48-
static struct map_desc s3c2410_iodesc[] __initdata = {
48+
static struct map_desc s3c2410_iodesc[] __initdata __maybe_unused = {
4949
IODESC_ENT(CLKPWR),
5050
IODESC_ENT(TIMER),
5151
IODESC_ENT(WATCHDOG),

‎arch/arm/mach-s3c/s3c2412.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static inline void s3c2412_init_gpio2(void)
5555

5656
/* Initial IO mappings */
5757

58-
static struct map_desc s3c2412_iodesc[] __initdata = {
58+
static struct map_desc s3c2412_iodesc[] __initdata __maybe_unused = {
5959
IODESC_ENT(CLKPWR),
6060
IODESC_ENT(TIMER),
6161
IODESC_ENT(WATCHDOG),

‎arch/arm/mach-s3c/s3c2416.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
#include "nand-core-s3c24xx.h"
5252
#include "spi-core-s3c24xx.h"
5353

54-
static struct map_desc s3c2416_iodesc[] __initdata = {
54+
static struct map_desc s3c2416_iodesc[] __initdata __maybe_unused = {
5555
IODESC_ENT(WATCHDOG),
5656
IODESC_ENT(CLKPWR),
5757
IODESC_ENT(TIMER),

‎arch/arm/mach-s3c/s3c2443.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#include "nand-core-s3c24xx.h"
4545
#include "spi-core-s3c24xx.h"
4646

47-
static struct map_desc s3c2443_iodesc[] __initdata = {
47+
static struct map_desc s3c2443_iodesc[] __initdata __maybe_unused = {
4848
IODESC_ENT(WATCHDOG),
4949
IODESC_ENT(CLKPWR),
5050
IODESC_ENT(TIMER),

‎arch/arm/mach-s3c/s3c244x.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include "nand-core-s3c24xx.h"
4040
#include "regs-dsc-s3c24xx.h"
4141

42-
static struct map_desc s3c244x_iodesc[] __initdata = {
42+
static struct map_desc s3c244x_iodesc[] __initdata __maybe_unused = {
4343
IODESC_ENT(CLKPWR),
4444
IODESC_ENT(TIMER),
4545
IODESC_ENT(WATCHDOG),

‎arch/arm/mach-s3c/s3c24xx.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ static struct cpu_table cpu_ids[] __initdata = {
139139

140140
/* minimal IO mapping */
141141

142-
static struct map_desc s3c_iodesc[] __initdata = {
142+
static struct map_desc s3c_iodesc[] __initdata __maybe_unused = {
143143
IODESC_ENT(GPIO),
144144
IODESC_ENT(IRQ),
145145
IODESC_ENT(MEMCTRL),

‎arch/arm/mach-s3c/s3c64xx.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,12 @@ static struct cpu_table cpu_ids[] __initdata = {
9595

9696
/* minimal IO mapping */
9797

98-
/* see notes on uart map in arch/arm/mach-s3c64xx/include/mach/debug-macro.S */
98+
/*
99+
* note, for the boot process to work we have to keep the UART
100+
* virtual address aligned to an 1MiB boundary for the L1
101+
* mapping the head code makes. We keep the UART virtual address
102+
* aligned and add in the offset when we load the value here.
103+
*/
99104
#define UART_OFFS (S3C_PA_UART & 0xfffff)
100105

101106
static struct map_desc s3c_iodesc[] __initdata = {

‎drivers/soc/samsung/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ config SAMSUNG_PM_DEBUG
4242
depends on PM && DEBUG_KERNEL
4343
depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210
4444
depends on DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART
45+
depends on DEBUG_LL && MMU
4546
help
4647
Say Y here if you want verbose debugging from the PM Suspend and
4748
Resume code. See <file:Documentation/arm/samsung-s3c24xx/suspend.rst>

0 commit comments

Comments
 (0)