Commit 465c335b authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge tag 'samsung-soc-s3c-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/soc

Samsung S3C24xx and S3C64xx machine code cleanup for v5.10

Big cleanup for the Samsung S3C24xx and S3C64xx platforms, although it
also touches files shared with S5Pv210 and Exynos.  This is mostly Arnd
Bergmann work which Krzysztof Kozlowski took over, rebased and polished.

The goal is to cleanup, merge and finally make the Samsung S3C24xx and
S3C64xx architectures multiplatform.  The multiplatform did not happen
yet here - just cleaning up and merging into one arch/arm/mach-s3c
directory.  However this is step forward for multiplatform or at least
to keep this code still maintainable.

This pulls also branch with changes for Samsung SoC sound drivers from
broonie/sound because the cleanups there were part of this series and
all further patches depend on them.

* tag 'samsung-soc-s3c-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: (62 commits)
  ARM: s3c: Avoid naming clash of S3C24xx and S3C64xx timer setup
  ARM: s3c: Cleanup from old plat-samsung include
  ARM: s3c: make headers local if possible
  ARM: s3c: move into a common directory
  ARM: s3c24xx: stop including mach/hardware.h from mach/io.h
  cpufreq: s3c24xx: move low-level clk reg access into platform code
  cpufreq: s3c2412: use global s3c2412_cpufreq_setrefresh
  ARM: s3c: remove cpufreq header dependencies
  cpufreq: s3c24xx: split out registers
  fbdev: s3c2410fb: remove mach header dependency
  ARM: s3c24xx: bast: avoid irq_desc array usage
  ARM: s3c24xx: spi: avoid hardcoding fiq number in driver
  ARM: s3c24xx: include mach/irqs.h where needed
  ARM: s3c24xx: move s3cmci pinctrl handling into board files
  ARM: s3c24xx: move iis pinctrl config into boards
  ARM: s3c24xx: move spi fiq handler into platform
  ARM: s3c: adc: move header to linux/soc/samsung
  ARM: s3c24xx: move irqchip driver back into platform
  ARM: s3c24xx: move regs-spi.h into spi driver
  ARM: s3c64xx: remove mach/hardware.h
  ...

Link: https://lore.kernel.org/r/20200831154751.7551-1-krzk@kernel.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f75aef39 a1342f6a

MAINTAINERS

+13 −11
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*








@@ -2424,6 +2422,9 @@ F:	drivers/soc/samsung/







F:	drivers/tty/serial/samsung*









F:	include/linux/soc/samsung/









N:	exynos









N:	s3c2410









N:	s3c64xx









N:	s5pv210

















ARM/SAMSUNG MOBILE MACHINE SUPPORT









M:	Kyungmin Park <kyungmin.park@samsung.com>








@@ -15302,6 +15303,8 @@ F:	Documentation/devicetree/bindings/clock/samsung,s3c*







F:	Documentation/devicetree/bindings/clock/samsung,s5p*









F:	drivers/clk/samsung/









F:	include/dt-bindings/clock/exynos*.h









F:	include/linux/clk/samsung.h









F:	include/linux/platform_data/clk-s3c2410.h

















SAMSUNG SPI DRIVERS









M:	Kukjin Kim <kgene@kernel.org>








@@ -15313,6 +15316,7 @@ S:	Maintained







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









F:	drivers/spi/spi-s3c*









F:	include/linux/platform_data/spi-s3c64xx.h









F:	include/linux/spi/s3c24xx-fiq.h

















SAMSUNG SXGBE DRIVERS









M:	Byungho An <bh74.an@samsung.com>








@@ -15826,19 +15830,17 @@ F:	drivers/video/fbdev/simplefb.c







F:	include/linux/platform_data/simplefb.h

















SIMTEC EB110ATX (Chalice CATS)









M:	Vincent Sanders <vince@simtec.co.uk>









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









S:	Supported









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

















SIMTEC EB2410ITX (BAST)









M:	Vincent Sanders <vince@simtec.co.uk>









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>








@@ -18757,7 +18759,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



+3
−5






























Original line number
Diff line number
Diff line







@@ -503,11 +503,12 @@ config ARCH_S3C24XX







	select GPIOLIB









	select GENERIC_IRQ_MULTI_HANDLER









	select HAVE_S3C2410_I2C if I2C









	select HAVE_S3C2410_WATCHDOG if WATCHDOG









	select HAVE_S3C_RTC if RTC_CLASS









	select NEED_MACH_IO_H









	select S3C2410_WATCHDOG









	select SAMSUNG_ATAGS









	select USE_OF









	select WATCHDOG









	help









	  Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443









	  and S3C2450 SoCs based systems, such as the Simtec Electronics BAST








@@ -636,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"


















@@ -709,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/Kconfig.debug



+14
−4






























Original line number
Diff line number
Diff line







@@ -1005,7 +1005,7 @@ choice







		  via SCIFA4 on Renesas SH-Mobile AG5 (SH73A0).



















	config DEBUG_S3C_UART0









		depends on PLAT_SAMSUNG









		depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS









		select DEBUG_EXYNOS_UART if ARCH_EXYNOS









		select DEBUG_S3C24XX_UART if ARCH_S3C24XX









		select DEBUG_S3C64XX_UART if ARCH_S3C64XX








@@ -1017,7 +1017,7 @@ choice







		  by the boot-loader before use.



















	config DEBUG_S3C_UART1









		depends on PLAT_SAMSUNG









		depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS









		select DEBUG_EXYNOS_UART if ARCH_EXYNOS









		select DEBUG_S3C24XX_UART if ARCH_S3C24XX









		select DEBUG_S3C64XX_UART if ARCH_S3C64XX








@@ -1029,7 +1029,7 @@ choice







		  by the boot-loader before use.



















	config DEBUG_S3C_UART2









		depends on PLAT_SAMSUNG









		depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS









		select DEBUG_EXYNOS_UART if ARCH_EXYNOS









		select DEBUG_S3C24XX_UART if ARCH_S3C24XX









		select DEBUG_S3C64XX_UART if ARCH_S3C64XX








@@ -1041,7 +1041,7 @@ choice







		  by the boot-loader before use.



















	config DEBUG_S3C_UART3









		depends on PLAT_SAMSUNG && (ARCH_EXYNOS || ARCH_S5PV210)









		depends on ARCH_EXYNOS || ARCH_S5PV210









		select DEBUG_EXYNOS_UART if ARCH_EXYNOS









		select DEBUG_S3C64XX_UART if ARCH_S3C64XX









		select DEBUG_S5PV210_UART if ARCH_S5PV210








@@ -1497,6 +1497,16 @@ config DEBUG_S3C64XX_UART







config DEBUG_S5PV210_UART









	bool



















config DEBUG_S3C_UART









	depends on DEBUG_S3C2410_UART || DEBUG_S3C24XX_UART || \









		   DEBUG_S3C64XX_UART ||  DEBUG_S5PV210_UART || \









		   DEBUG_EXYNOS_UART









	int









	default "0" if DEBUG_S3C_UART0









	default "1" if DEBUG_S3C_UART1









	default "2" if DEBUG_S3C_UART2









	default "3" if DEBUG_S3C_UART3



















config DEBUG_OMAP2PLUS_UART









	bool









	depends on ARCH_OMAP2PLUS
































arch/arm/Makefile



+1
−6






























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








@@ -232,13 +231,9 @@ machine-$(CONFIG_PLAT_SPEAR)		+= spear

















# Platform directory name.  This list is sorted alphanumerically









# by CONFIG_* macro name.









plat-$(CONFIG_ARCH_EXYNOS)	+= samsung









plat-$(CONFIG_ARCH_OMAP)	+= omap









plat-$(CONFIG_ARCH_S3C64XX)	+= samsung









plat-$(CONFIG_ARCH_S5PV210)	+= 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/mach-exynos/Kconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -24,7 +24,6 @@ menuconfig ARCH_EXYNOS







	select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5









	select HAVE_ARM_SCU if SMP









	select HAVE_S3C2410_I2C if I2C









	select HAVE_S3C2410_WATCHDOG if WATCHDOG









	select HAVE_S3C_RTC if RTC_CLASS









	select PINCTRL









	select PINCTRL_EXYNOS








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE