Commit 71b9114d authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Krzysztof Kozlowski
Browse files

ARM: s3c: move into a common directory 



s3c24xx and s3c64xx have a lot in common, but are split across three
separate directories, which makes the interaction of the header files
more complicated than necessary.

Move all three directories into a new mach-s3c, with a minimal
set of changes to each file.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
[krzk: Rebase, add s3c24xx and s3c64xx suffix to several files, add SPDX
       headers to new files, remove plat-samsung from MAINTAINERS]
Co-developed-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
https://lore.kernel.org/r/20200806182059.2431-39-krzk@kernel.org
parent a3814e55

MAINTAINERS

+7 −9
Original line number Diff line number Diff line
@@ -2220,8 +2220,8 @@ ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT 
L:	openmoko-kernel@lists.openmoko.org (subscribers-only)

S:	Orphan

W:	http://wiki.openmoko.org/wiki/Neo_FreeRunner

F:	arch/arm/mach-s3c24xx/gta02.h

F:	arch/arm/mach-s3c24xx/mach-gta02.c

F:	arch/arm/mach-s3c/gta02.h

F:	arch/arm/mach-s3c/mach-gta02.c









ARM/Orion SoC/Technologic Systems TS-78xx platform support









M:	Alexander Clouter <alex@digriz.org.uk>








@@ -2410,10 +2410,8 @@ F:	arch/arm/boot/dts/exynos*







F:	arch/arm/boot/dts/s3c*









F:	arch/arm/boot/dts/s5p*









F:	arch/arm/mach-exynos*/









F:	arch/arm/mach-s3c24*/









F:	arch/arm/mach-s3c64xx/









F:	arch/arm/mach-s3c/









F:	arch/arm/mach-s5p*/









F:	arch/arm/plat-samsung/









F:	arch/arm64/boot/dts/exynos/









F:	drivers/*/*/*s3c24*









F:	drivers/*/*s3c24*








@@ -15839,9 +15837,9 @@ SIMTEC EB2410ITX (BAST)







M:	Simtec Linux Team <linux@simtec.co.uk>









S:	Supported









W:	http://www.simtec.co.uk/products/EB2410ITX/









F:	arch/arm/mach-s3c24xx/bast-ide.c









F:	arch/arm/mach-s3c24xx/bast-irq.c









F:	arch/arm/mach-s3c24xx/mach-bast.c









F:	arch/arm/mach-s3c/bast-ide.c









F:	arch/arm/mach-s3c/bast-irq.c









F:	arch/arm/mach-s3c/mach-bast.c

















SIOX









M:	Thorsten Scherer <t.scherer@eckelmann.de>








@@ -18760,7 +18758,7 @@ F:	Documentation/devicetree/bindings/mfd/wm831x.txt







F:	Documentation/devicetree/bindings/regulator/wlf,arizona.yaml









F:	Documentation/devicetree/bindings/sound/wlf,arizona.yaml









F:	Documentation/hwmon/wm83??.rst









F:	arch/arm/mach-s3c64xx/mach-crag6410*









F:	arch/arm/mach-s3c/mach-crag6410*









F:	drivers/clk/clk-wm83*.c









F:	drivers/extcon/extcon-arizona.c









F:	drivers/gpio/gpio-*wm*.c

























arch/arm/Kconfig



+1
−4






























Original line number
Diff line number
Diff line







@@ -637,7 +637,6 @@ source "arch/arm/mach-dove/Kconfig"







source "arch/arm/mach-ep93xx/Kconfig"



















source "arch/arm/mach-exynos/Kconfig"









source "arch/arm/plat-samsung/Kconfig"



















source "arch/arm/mach-footbridge/Kconfig"


















@@ -710,9 +709,7 @@ source "arch/arm/mach-realview/Kconfig"

















source "arch/arm/mach-rockchip/Kconfig"



















source "arch/arm/mach-s3c24xx/Kconfig"



















source "arch/arm/mach-s3c64xx/Kconfig"









source "arch/arm/mach-s3c/Kconfig"



















source "arch/arm/mach-s5pv210/Kconfig"










































arch/arm/Makefile



+1
−4






























Original line number
Diff line number
Diff line







@@ -209,8 +209,7 @@ machine-$(CONFIG_ARCH_REALTEK)		+= realtek







machine-$(CONFIG_ARCH_REALVIEW)		+= realview









machine-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip









machine-$(CONFIG_ARCH_RPC)		+= rpc









machine-$(CONFIG_ARCH_S3C24XX)		+= s3c24xx









machine-$(CONFIG_ARCH_S3C64XX)		+= s3c64xx









machine-$(CONFIG_PLAT_SAMSUNG)		+= s3c









machine-$(CONFIG_ARCH_S5PV210)		+= s5pv210









machine-$(CONFIG_ARCH_SA1100)		+= sa1100









machine-$(CONFIG_ARCH_RENESAS)	 	+= shmobile








@@ -233,10 +232,8 @@ machine-$(CONFIG_PLAT_SPEAR)		+= spear







# Platform directory name.  This list is sorted alphanumerically









# by CONFIG_* macro name.









plat-$(CONFIG_ARCH_OMAP)	+= omap









plat-$(CONFIG_ARCH_S3C64XX)	+= samsung









plat-$(CONFIG_PLAT_ORION)	+= orion









plat-$(CONFIG_PLAT_PXA)		+= pxa









plat-$(CONFIG_PLAT_S3C24XX)	+= samsung









plat-$(CONFIG_PLAT_VERSATILE)	+= versatile



















ifeq ($(CONFIG_ARCH_EBSA110),y)
































arch/arm/plat-samsung/Kconfig→arch/arm/mach-s3c/Kconfig



+3
−0






























Original line number
Diff line number
Diff line







@@ -2,6 +2,9 @@







#









# Copyright 2009 Simtec Electronics



















source "arch/arm/mach-s3c/Kconfig.s3c24xx"









source "arch/arm/mach-s3c/Kconfig.s3c64xx"



















config PLAT_SAMSUNG









	bool









	depends on PLAT_S3C24XX || ARCH_S3C64XX












































































CRA Git | Maintained and supported by SUSTech CRA and CCSE