Commit d61b7a57 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: global cleanups" from Arnd Bergmann:
 "Quite a bit of code gets removed, and some stuff moved around, mostly
  the old samsung s3c24xx stuff.  There should be no functional changes
  in this series otherwise.  Some cleanups have dependencies on other
  arm-soc branches and will be sent in the second round.

  Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de&gt;">

Fixed up trivial conflicts mainly due to #include's being changes on
both sides.

* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (121 commits)
  ep93xx: Remove unnecessary includes of ep93xx-regs.h
  ep93xx: Move EP93XX_SYSCON defines to SoC private header
  ep93xx: Move crunch code to mach-ep93xx directory
  ep93xx: Make syscon access functions private to SoC
  ep93xx: Configure GPIO ports in core code
  ep93xx: Move peripheral defines to local SoC header
  ep93xx: Convert the watchdog driver into a platform device.
  ep93xx: Use ioremap for backlight driver
  ep93xx: Move GPIO defines to gpio-ep93xx.h
  ep93xx: Don't use system controller defines in audio drivers
  ep93xx: Move PHYS_BASE defines to local SoC header file
  ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver
  ARM: EXYNOS: add clock registers for exynos4x12-cpufreq
  PM / devfreq: update the name of EXYNOS clock registers that were omitted
  PM / devfreq: update the name of EXYNOS clock register
  ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock
  ARM: EXYNOS: use static declaration on regarding clock
  ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs
  ARM: OMAP2+: Fix build error after merge
  ARM: S3C24XX: remove call to s3c24xx_setup_clocks
  ...
parents 18d9946b f4e2467b

Documentation/feature-removal-schedule.txt

+0 −14
Original line number Diff line number Diff line
@@ -513,20 +513,6 @@ Who: Bjorn Helgaas <bhelgaas@google.com> 


----------------------------



What:	The CAP9 SoC family will be removed

When:	3.4

Files:	arch/arm/mach-at91/at91cap9.c

	arch/arm/mach-at91/at91cap9_devices.c

	arch/arm/mach-at91/include/mach/at91cap9.h

	arch/arm/mach-at91/include/mach/at91cap9_matrix.h

	arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h

	arch/arm/mach-at91/board-cap9adk.c

Why:	The code is not actively maintained and platforms are now hard to find.

Who:	Nicolas Ferre <nicolas.ferre@atmel.com>

	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>



----------------------------



What:	Low Performance USB Block driver ("CONFIG_BLK_DEV_UB")

When:	3.6

Why:	This driver provides support for USB storage devices like "USB

arch/arm/Kconfig

+13 −16
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ config ARCH_AT91 
	select CLKDEV_LOOKUP

	help

	  This enables support for systems based on the Atmel AT91RM9200,

	  AT91SAM9 and AT91CAP9 processors.

	  AT91SAM9 processors.



config ARCH_BCMRING

	bool "Broadcom BCMRING"
@@ -769,22 +769,21 @@ config ARCH_SA1100 
	help

	  Support for StrongARM 11x0 based boards.



config ARCH_S3C2410

	bool "Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443, S3C2450"

config ARCH_S3C24XX

	bool "Samsung S3C24XX SoCs"

	select GENERIC_GPIO

	select ARCH_HAS_CPUFREQ

	select HAVE_CLK

	select CLKDEV_LOOKUP

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C_RTC if RTC_CLASS

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	help

	  Samsung S3C2410X CPU based systems, such as the Simtec Electronics

	  BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or

	  the Samsung SMDK2410 development board (and derivatives).



	  Note, the S3C2416 and the S3C2450 are so close that they even share

	  the same SoC ID code. This means that there is no separate machine

	  directory (no arch/arm/mach-s3c2450) as the S3C2416 was first.

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

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

	  (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or the

	  Samsung SMDK2410 development board (and derivatives).



config ARCH_S3C64XX

	bool "Samsung S3C64XX"
@@ -1073,12 +1072,10 @@ source "arch/arm/plat-s5p/Kconfig" 


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



if ARCH_S3C2410

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

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

if ARCH_S3C24XX

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

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

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

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

endif



if ARCH_S3C64XX
@@ -1595,7 +1592,7 @@ source kernel/Kconfig.preempt 


config HZ

	int

	default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P64X0 || \

	default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \

		ARCH_S5PV210 || ARCH_EXYNOS4

	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER

	default AT91_TIMER_HZ if ARCH_AT91
@@ -2121,7 +2118,7 @@ config CPU_FREQ_S3C 


config CPU_FREQ_S3C24XX

	bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)"

	depends on ARCH_S3C2410 && CPU_FREQ && EXPERIMENTAL

	depends on ARCH_S3C24XX && CPU_FREQ && EXPERIMENTAL

	select CPU_FREQ_S3C

	help

	  This enables the CPUfreq driver for the Samsung S3C24XX family

arch/arm/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ choice 
		depends on HAVE_AT91_DBGU0



	config AT91_DEBUG_LL_DBGU1

		bool "Kernel low-level debugging on 9263, 9g45 and cap9"

		bool "Kernel low-level debugging on 9263 and 9g45"

		depends on HAVE_AT91_DBGU1



	config DEBUG_CLPS711X_UART1

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ machine-$(CONFIG_ARCH_PRIMA2) := prima2 
machine-$(CONFIG_ARCH_PXA)		:= pxa

machine-$(CONFIG_ARCH_REALVIEW)		:= realview

machine-$(CONFIG_ARCH_RPC)		:= rpc

machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2412 s3c2416 s3c2440 s3c2443

machine-$(CONFIG_ARCH_S3C24XX)		:= s3c24xx s3c2412 s3c2440

machine-$(CONFIG_ARCH_S3C64XX)		:= s3c64xx

machine-$(CONFIG_ARCH_S5P64X0)		:= s5p64x0

machine-$(CONFIG_ARCH_S5PC100)		:= s5pc100

arch/arm/boot/compressed/head.S

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
		add	\rb, \rb, #0x00010000	@ Ser1

#endif

		.endm

#elif defined(CONFIG_ARCH_S3C2410)

#elif defined(CONFIG_ARCH_S3C24XX)

		.macro loadsp, rb, tmp

		mov	\rb, #0x50000000

		add	\rb, \rb, #0x4000 * CONFIG_S3C_LOWLEVEL_UART_PORT

CRA Git | Maintained and supported by SUSTech CRA and CCSE