Commit 76940c8d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-soc-5.10' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 7a5f0085 0df3c29f

MAINTAINERS

+7 −7
Original line number Diff line number Diff line
@@ -2400,7 +2400,7 @@ ARM/SAMSUNG EXYNOS ARM ARCHITECTURES 
M:	Kukjin Kim <kgene@kernel.org>

M:	Krzysztof Kozlowski <krzk@kernel.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org

S:	Maintained

Q:	https://patchwork.kernel.org/project/linux-samsung-soc/list/

F:	Documentation/arm/samsung/
@@ -2443,7 +2443,7 @@ F: drivers/media/platform/s5p-g2d/ 








ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT









M:	Marek Szyprowski <m.szyprowski@samsung.com>









L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)









L:	linux-samsung-soc@vger.kernel.org









L:	linux-media@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/media/s5p-cec.txt








@@ -13298,7 +13298,7 @@ PCI DRIVER FOR SAMSUNG EXYNOS







M:	Jingoo Han <jingoohan1@gmail.com>









L:	linux-pci@vger.kernel.org









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)









L:	linux-samsung-soc@vger.kernel.org









S:	Maintained









F:	drivers/pci/controller/dwc/pci-exynos.c
















@@ -13700,7 +13700,7 @@ M:	Tomasz Figa <tomasz.figa@gmail.com>







M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Sylwester Nawrocki <s.nawrocki@samsung.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)









L:	linux-samsung-soc@vger.kernel.org









S:	Maintained









Q:	https://patchwork.kernel.org/project/linux-samsung-soc/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git








@@ -15246,7 +15246,7 @@ F:	include/linux/mfd/samsung/







SAMSUNG S3C24XX/S3C64XX SOC SERIES CAMIF DRIVER









M:	Sylwester Nawrocki <sylvester.nawrocki@gmail.com>









L:	linux-media@vger.kernel.org









L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)









L:	linux-samsung-soc@vger.kernel.org









S:	Maintained









F:	drivers/media/platform/s3c-camif/









F:	include/media/drv-intf/s3c_camif.h








@@ -15295,7 +15295,7 @@ SAMSUNG SOC CLOCK DRIVERS







M:	Sylwester Nawrocki <s.nawrocki@samsung.com>









M:	Tomasz Figa <tomasz.figa@gmail.com>









M:	Chanwoo Choi <cw00.choi@samsung.com>









L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)









L:	linux-samsung-soc@vger.kernel.org









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git









F:	Documentation/devicetree/bindings/clock/exynos*.txt








@@ -15311,7 +15311,7 @@ M:	Kukjin Kim <kgene@kernel.org>







M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Andi Shyti <andi@etezian.org>









L:	linux-spi@vger.kernel.org









L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)









L:	linux-samsung-soc@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/spi/spi-samsung.txt









F:	drivers/spi/spi-s3c*
































arch/arm/mach-exynos/exynos.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -206,8 +206,8 @@ static void __init exynos_dt_fixup(void)







}



















DT_MACHINE_START(EXYNOS_DT, "Samsung Exynos (Flattened Device Tree)")









	.l2c_aux_val	= 0x3c400000,









	.l2c_aux_mask	= 0xc20fffff,









	.l2c_aux_val	= 0x38400000,









	.l2c_aux_mask	= 0xc60fffff,









	.smp		= smp_ops(exynos_smp_ops),









	.map_io		= exynos_init_io,









	.init_early	= exynos_firmware_init,
































arch/arm/mach-s3c/s3c2410.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -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),
































arch/arm/mach-s3c/s3c2412.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -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),
































arch/arm/mach-s3c/s3c2416.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -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),








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE