Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull ARM SoC cleanup from Olof Johansson:
 "Here is a collection of cleanup patches.  Among the pieces that stand
  out are:

   - The deletion of h720x platforms
   - Split of at91 non-dt platforms to their own Kconfig file to keep
     them separate
   - General cleanups and refactoring of i.MX and MXS platforms
   - Some restructuring of clock tables for OMAP
   - Convertion of PMC driver for Tegra to dt-only
   - Some renames of sunxi -> sun4i (Allwinner A10)
   - ... plus a bunch of other stuff that I haven't mentioned"

* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (119 commits)
  ARM: i.MX: remove unused ARCH_* configs
  ARM i.MX53: remove platform ahci support
  ARM: sunxi: Rework the restart code
  irqchip: sunxi: Rename sunxi to sun4i
  irqchip: sunxi: Make use of the IRQCHIP_DECLARE macro
  clocksource: sunxi: Rename sunxi to sun4i
  clocksource: sunxi: make use of CLKSRC_OF
  clocksource: sunxi: Cleanup the timer code
  ARM: at91: remove trailing semicolon from macros
  ARM: at91/setup: fix trivial typos
  ARM: EXYNOS: remove "config EXYNOS_DEV_DRM"
  ARM: EXYNOS: change the name of USB ohci header
  ARM: SAMSUNG: Remove unnecessary code for dma
  ARM: S3C24XX: Remove unused GPIO drive strength register definitions
  ARM: OMAP4+: PM: Restore CPU power state to ON with clockdomain force wakeup method
  ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412
  ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410
  ARM: S3C24XX: Removed unneeded dependency on ARCH_S3C24XX for boards
  ARM: SAMSUNG: Fix typo "CONFIG_SAMSUNG_DEV_RTC"
  ARM: S5P64X0: Fix typo "CONFIG_S5P64X0_SETUP_SDHCI"
  ...
parents 4d26aa30 afcf7924

Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-ic.txt→Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Allwinner Sunxi Interrupt Controller 


Required properties:



- compatible : should be "allwinner,sunxi-ic"

- compatible : should be "allwinner,sun4i-ic"

- reg : Specifies base physical address and size of the registers.

- interrupt-controller : Identifies the node as an interrupt controller

- #interrupt-cells : Specifies the number of cells needed to encode an
@@ -97,7 +97,7 @@ The interrupt sources are as follows: 
Example:



intc: interrupt-controller {

	compatible = "allwinner,sunxi-ic";

	compatible = "allwinner,sun4i-ic";

	reg = <0x01c20400 0x400>;

	interrupt-controller;

	#interrupt-cells = <2>;

Documentation/devicetree/bindings/timer/allwinner,sunxi-timer.txt→Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Allwinner A1X SoCs Timer Controller 


Required properties:



- compatible : should be "allwinner,sunxi-timer"

- compatible : should be "allwinner,sun4i-timer"

- reg : Specifies base physical address and size of the registers.

- interrupts : The interrupt of the first timer

- clocks: phandle to the source clock (usually a 24 MHz fixed clock)
@@ -10,7 +10,7 @@ Required properties: 
Example:



timer {

	compatible = "allwinner,sunxi-timer";

	compatible = "allwinner,sun4i-timer";

	reg = <0x01c20c00 0x400>;

	interrupts = <22>;

	clocks = <&osc>;

Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt→Documentation/devicetree/bindings/watchdog/sun4i-wdt.txt

+3 −3
Original line number Diff line number Diff line 
Allwinner sunXi Watchdog timer

Allwinner sun4i Watchdog timer



Required properties:



- compatible : should be "allwinner,sunxi-wdt"

- compatible : should be "allwinner,sun4i-wdt"

- reg : Specifies base physical address and size of the registers.



Example:



wdt: watchdog@01c20c90 {

	compatible = "allwinner,sunxi-wdt";

	compatible = "allwinner,sun4i-wdt";

	reg = <0x01c20c90 0x10>;

};

arch/arm/Kconfig

+4 −18
Original line number Diff line number Diff line
@@ -411,6 +411,7 @@ config ARCH_GEMINI 
	bool "Cortina Systems Gemini"

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MACH_GPIO_H

	select CPU_FA526

	help

	  Support for the Cortina Systems Gemini family SoCs
@@ -474,12 +475,14 @@ config ARCH_MXS 
	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_OF

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK_PREPARE

	select MULTI_IRQ_HANDLER

	select PINCTRL

	select SPARSE_IRQ

	select STMP_DEVICE

	select USE_OF

	help

	  Support for Freescale MXS-based family of processors
@@ -493,14 +496,6 @@ config ARCH_NETX 
	help

	  This enables support for systems based on the Hilscher NetX Soc



config ARCH_H720X

	bool "Hynix HMS720x-based"

	select ARCH_USES_GETTIMEOFFSET

	select CPU_ARM720T

	select ISA_DMA_API

	help

	  This enables support for systems based on the Hynix HMS720x



config ARCH_IOP13XX

	bool "IOP13xx-based"

	depends on MMU
@@ -1054,8 +1049,6 @@ source "arch/arm/mach-footbridge/Kconfig" 


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



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



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



source "arch/arm/mach-integrator/Kconfig"
@@ -1176,7 +1169,6 @@ config PLAT_VERSATILE 
config ARM_TIMER_SP804

	bool

	select CLKSRC_MMIO

	select HAVE_SCHED_CLOCK



source arch/arm/mm/Kconfig
@@ -1606,6 +1598,7 @@ config HAVE_ARM_ARCH_TIMER 
config HAVE_ARM_TWD

	bool

	depends on SMP

	select CLKSRC_OF if OF

	help

	  This options enables support for the ARM timer and watchdog unit
@@ -2165,13 +2158,6 @@ menu "CPU Power Management" 
if ARCH_HAS_CPUFREQ

source "drivers/cpufreq/Kconfig"



config CPU_FREQ_IMX

	tristate "CPUfreq driver for i.MX CPUs"

	depends on ARCH_MXC && CPU_FREQ

	select CPU_FREQ_TABLE

	help

	  This enables the CPUfreq driver for i.MX CPUs.



config CPU_FREQ_S3C

	bool

	help

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ machine-$(CONFIG_ARCH_DOVE) += dove 
machine-$(CONFIG_ARCH_EBSA110)		+= ebsa110

machine-$(CONFIG_ARCH_EP93XX)		+= ep93xx

machine-$(CONFIG_ARCH_GEMINI)		+= gemini

machine-$(CONFIG_ARCH_H720X)		+= h720x

machine-$(CONFIG_ARCH_HIGHBANK)		+= highbank

machine-$(CONFIG_ARCH_INTEGRATOR)	+= integrator

machine-$(CONFIG_ARCH_IOP13XX)		+= iop13xx