Commit b274776c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC cleanups from Arnd Bergmann:
 "A large number of cleanups, all over the platforms.  This is dominated
  largely by the Samsung platforms (s3c, s5p, exynos) and a few of the
  others moving code out of arch/arm into more appropriate subsystems.

  The clocksource and irqchip drivers are now abstracted to the point
  where platforms that are already cleaned up do not need to even
  specify the driver they use, it can all get configured from the device
  tree as we do for normal device drivers.  The clocksource changes
  basically touch every single platform in the process.

  We further clean up the use of platform specific header files here,
  with the goal of turning more of the platforms over to being
  "multiplatform" enabled, which implies that they cannot expose their
  headers to architecture independent code any more.

  It is expected that no functional changes are part of the cleanup.
  The overall reduction in total code lines is mostly the result of
  removing broken and obsolete code."

* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (133 commits)
  ARM: mvebu: correct gated clock documentation
  ARM: kirkwood: add missing include for nsa310
  ARM: exynos: move exynos4210-combiner to drivers/irqchip
  mfd: db8500-prcmu: update resource passing
  drivers/db8500-cpufreq: delete dangling include
  ARM: at91: remove NEOCORE 926 board
  sunxi: Cleanup the reset code and add meaningful registers defines
  ARM: S3C24XX: header mach/regs-mem.h local
  ARM: S3C24XX: header mach/regs-power.h local
  ARM: S3C24XX: header mach/regs-s3c2412-mem.h local
  ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/
  ARM: S3C24XX: transform s3c2443 subirqs into new structure
  ARM: S3C24XX: modify s3c2443 irq init to initialize all irqs
  ARM: S3C24XX: move s3c2443 irq code to irq.c
  ARM: S3C24XX: transform s3c2416 irqs into new structure
  ARM: S3C24XX: modify s3c2416 irq init to initialize all irqs
  ARM: S3C24XX: move s3c2416 irq init to common irq code
  ARM: S3C24XX: Modify s3c_irq_wake to use the hwirq property
  ARM: S3C24XX: Move irq syscore-ops to irq-pm
  clocksource: always define CLOCKSOURCE_OF_DECLARE
  ...
parents b24174b0 3b1209e7

Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ ID Clock Peripheral 
16	xor1	XOR DMA 1

17	crypto	CESA engine

18	pex1	PCIe Cntrl 1

19	ge1	Gigabit Ethernet 0

19	ge1	Gigabit Ethernet 1

20	tdm	Time Division Mplx



Required properties:

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4231,6 +4231,7 @@ M: Thomas Gleixner <tglx@linutronix.de> 
S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core

F:	kernel/irq/

F:	drivers/irqchip/



IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)

M:	Benjamin Herrenschmidt <benh@kernel.crashing.org>

arch/arm/Kconfig

+2 −14
Original line number Diff line number Diff line
@@ -344,10 +344,10 @@ config ARCH_BCM2835 
	select ARM_ERRATA_411920

	select ARM_TIMER_SP804

	select CLKDEV_LOOKUP

	select CLKSRC_OF

	select COMMON_CLK

	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select MULTI_IRQ_HANDLER

	select PINCTRL

	select PINCTRL_BCM2835
@@ -642,9 +642,9 @@ config ARCH_TEGRA 
	select ARCH_HAS_CPUFREQ

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_OF

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0
@@ -744,7 +744,6 @@ config ARCH_S3C24XX 
	select ARCH_HAS_CPUFREQ

	select ARCH_USES_GETTIMEOFFSET

	select CLKDEV_LOOKUP

	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -787,7 +786,6 @@ config ARCH_S5P64X0 
	select CLKSRC_MMIO

	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -802,7 +800,6 @@ config ARCH_S5PC100 
	select ARCH_USES_GETTIMEOFFSET

	select CLKDEV_LOOKUP

	select CPU_V7

	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -820,7 +817,6 @@ config ARCH_S5PV210 
	select CLKSRC_MMIO

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -838,7 +834,6 @@ config ARCH_EXYNOS 
	select CLKDEV_LOOKUP

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -873,7 +868,6 @@ config ARCH_U300 
	select COMMON_CLK

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select HAVE_TCM

	select SPARSE_IRQ

	help
@@ -957,7 +951,6 @@ config ARCH_VT8500_SINGLE 
	select COMMON_CLK

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select HAVE_CLK

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ
@@ -1086,17 +1079,12 @@ source "arch/arm/mach-realview/Kconfig" 
source "arch/arm/mach-sa1100/Kconfig"



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

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



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



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



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

if ARCH_S3C24XX

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

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

endif



if ARCH_S3C64XX

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

arch/arm/Kconfig.debug

+5 −5
Original line number Diff line number Diff line
@@ -219,12 +219,12 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on i.MX51.



	config DEBUG_IMX50_IMX53_UART

		bool "i.MX50 and i.MX53 Debug UART"

		depends on SOC_IMX50 || SOC_IMX53

	config DEBUG_IMX53_UART

		bool "i.MX53 Debug UART"

		depends on SOC_IMX53

		help

		  Say Y here if you want kernel low-level debugging support

		  on i.MX50 or i.MX53.

		  on i.MX53.



	config DEBUG_IMX6Q_UART

		bool "i.MX6Q Debug UART"
@@ -497,7 +497,7 @@ config DEBUG_LL_INCLUDE 
				 DEBUG_IMX21_IMX27_UART || \

				 DEBUG_IMX31_IMX35_UART || \

				 DEBUG_IMX51_UART || \

				 DEBUG_IMX50_IMX53_UART ||\

				 DEBUG_IMX53_UART ||\

				 DEBUG_IMX6Q_UART

	default "debug/highbank.S" if DEBUG_HIGHBANK_UART

	default "debug/mvebu.S" if DEBUG_MVEBU_UART

arch/arm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ machine-$(CONFIG_ARCH_PRIMA2) += prima2 
machine-$(CONFIG_ARCH_PXA)		+= pxa

machine-$(CONFIG_ARCH_REALVIEW)		+= realview

machine-$(CONFIG_ARCH_RPC)		+= rpc

machine-$(CONFIG_ARCH_S3C24XX)		+= s3c24xx s3c2412 s3c2440

machine-$(CONFIG_ARCH_S3C24XX)		+= s3c24xx

machine-$(CONFIG_ARCH_S3C64XX)		+= s3c64xx

machine-$(CONFIG_ARCH_S5P64X0)		+= s5p64x0

machine-$(CONFIG_ARCH_S5PC100)		+= s5pc100
@@ -204,7 +204,7 @@ plat-$(CONFIG_ARCH_S3C64XX) += samsung 
plat-$(CONFIG_PLAT_IOP)		+= iop

plat-$(CONFIG_PLAT_ORION)	+= orion

plat-$(CONFIG_PLAT_PXA)		+= pxa

plat-$(CONFIG_PLAT_S3C24XX)	+= s3c24xx samsung

plat-$(CONFIG_PLAT_S3C24XX)	+= samsung

plat-$(CONFIG_PLAT_S5P)		+= samsung

plat-$(CONFIG_PLAT_SPEAR)	+= spear

plat-$(CONFIG_PLAT_VERSATILE)	+= versatile

CRA Git | Maintained and supported by SUSTech CRA and CCSE