Commit e731f314 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull ARM SoC platform updates from Olof Johansson:
 "SoC changes, a substantial part of this is cleanup of some of the
  older platforms that used to have a bunch of board files.

  In particular:

   - Remove non-DT i.MX platforms that haven't seen activity in years,
     it's time to remove them.

   - A bunch of cleanup and removal of platform data for TI/OMAP
     platforms, moving over to genpd for power/reset control (yay!)

   - Major cleanup of Samsung S3C24xx and S3C64xx platforms, moving them
     closer to multiplatform support (not quite there yet, but getting
     close).

  There are a few other changes too, smaller fixlets, etc. For new
  platform support, the primary ones are:

   - New SoC: Hisilicon SD5203, ARM926EJ-S platform.

   - Cpufreq support for i.MX7ULP"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (121 commits)
  ARM: mstar: Select MStar intc
  ARM: stm32: Replace HTTP links with HTTPS ones
  ARM: debug: add UART early console support for SD5203
  ARM: hisi: add support for SD5203 SoC
  ARM: omap3: enable off mode automatically
  clk: imx: imx35: Remove mx35_clocks_init()
  clk: imx: imx31: Remove mx31_clocks_init()
  clk: imx: imx27: Remove mx27_clocks_init()
  ARM: imx: Remove unused definitions
  ARM: imx35: Retrieve the IIM base address from devicetree
  ARM: imx3: Retrieve the AVIC base address from devicetree
  ARM: imx3: Retrieve the CCM base address from devicetree
  ARM: imx31: Retrieve the IIM base address from devicetree
  ARM: imx27: Retrieve the CCM base address from devicetree
  ARM: imx27: Retrieve the SYSCTRL base address from devicetree
  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: imx: Remove remnant board file support pieces
  ...
parents 1f70935f accdab6d
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Required properties:
		(base address and length)

Optional properties:
- #power-domain-cells:	Should be 0 if the instance is a power domain provider.
- #reset-cells:	Should be 1 if the PRM instance in question supports resets.

Example:
@@ -25,5 +26,6 @@ Example:
prm_dsp2: prm@1b00 {
	compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
	reg = <0x1b00 0x40>;
	#power-domain-cells = <0>;
	#reset-cells = <1>;
};
+21 −19
Original line number Diff line number Diff line
@@ -2199,8 +2199,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>
@@ -2379,7 +2379,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/
@@ -2389,10 +2389,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*
@@ -2403,6 +2401,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>
@@ -2421,7 +2422,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
@@ -3415,7 +3416,7 @@ M: bcm-kernel-feedback-list@broadcom.com
L:	linux-arm-kernel@lists.infradead.org
S:	Maintained
F:	arch/arm/boot/dts/bcm470*
F:	arch/arm/boot/dts/bcm5301x*.dtsi
F:	arch/arm/boot/dts/bcm5301*
F:	arch/arm/boot/dts/bcm953012*
F:	arch/arm/mach-bcm/bcm_5301x.c
@@ -13447,7 +13448,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
@@ -13854,7 +13855,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
@@ -15415,7 +15416,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
@@ -15465,7 +15466,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
@@ -15473,17 +15474,20 @@ 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>
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*
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>
@@ -16001,19 +16005,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>
@@ -18952,7 +18954,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
+4 −8
Original line number Diff line number Diff line
@@ -268,9 +268,7 @@ config PHYS_OFFSET
	depends on !ARM_PATCH_PHYS_VIRT
	default DRAM_BASE if !MMU
	default 0x00000000 if ARCH_EBSA110 || \
			ARCH_FOOTBRIDGE || \
			ARCH_INTEGRATOR || \
			ARCH_REALVIEW
			ARCH_FOOTBRIDGE
	default 0x10000000 if ARCH_OMAP1 || ARCH_RPC
	default 0x20000000 if ARCH_S5PV210
	default 0xc0000000 if ARCH_SA1100
@@ -506,11 +504,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
@@ -639,7 +638,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"

@@ -712,9 +710,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"

+24 −5
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
@@ -1086,6 +1086,14 @@ choice
		  on SA-11x0 UART ports. The kernel will check for the first
		  enabled UART in a sequence 3-1-2.

	config DEBUG_SD5203_UART
		bool "Hisilicon SD5203 Debug UART"
		depends on ARCH_SD5203
		select DEBUG_UART_8250
		help
		  Say Y here if you want kernel low-level debugging support
		  on SD5203 UART.

	config DEBUG_SOCFPGA_UART0
		depends on ARCH_SOCFPGA
		bool "Use SOCFPGA UART0 for low-level debug"
@@ -1497,6 +1505,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
@@ -1650,6 +1668,7 @@ config DEBUG_UART_PHYS
	default 0x11006000 if DEBUG_MT6589_UART0
	default 0x11009000 if DEBUG_MT8135_UART3
	default 0x16000000 if DEBUG_INTEGRATOR
	default 0x1600d000 if DEBUG_SD5203_UART
	default 0x18000300 if DEBUG_BCM_5301X
	default 0x18000400 if DEBUG_BCM_HR2
	default 0x18010000 if DEBUG_SIRFATLAS7_UART0
@@ -1852,7 +1871,7 @@ config DEBUG_UART_VIRT
	default 0xfec60000 if DEBUG_SIRFPRIMA2_UART1
	default 0xfec90000 if DEBUG_RK32_UART2
	default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
	default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
	default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2 || DEBUG_SD5203_UART
	default 0xfed60000 if DEBUG_RK29_UART0
	default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
	default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
+1 −6
Original line number Diff line number Diff line
@@ -212,8 +212,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
@@ -235,13 +234,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)
Loading