From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 20 Jun 2013 20:36:11 +0000 (+0200)
Subject: Merge tag 'remove-nondt-exynos-3' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ff8fa4e287b0d57d44eeb8aad43c38f92efcf398;p=linux-beck.git

Merge tag 'remove-nondt-exynos-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc

From Kukjin Kim:

cleanup and removing dead code for only support DT for exynos
- remove board file for exynos
- remove legacy files which are not used anymore
- decouple ARCH_EXYNOS from PLAT_S5P

* tag 'remove-nondt-exynos-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (35 commits)
  ARM: EXYNOS: Remove remaining dead code after non-DT support removal
  ARM: EXYNOS: Remove legacy L2X0 initialization
  ARM: EXYNOS: Use exynos_init_io() as map_io callback
  ARM: EXYNOS: Remove custom init_irq callbacks
  ARM: EXYNOS: Remove mach/regs-usb-phy.h header
  thermal: exynos: Support both EXYNOS4X12 SoCs
  ARM: EXYNOS: Remove unused base addresses from mach/map.h header
  ARM: EXYNOS: Remove mach/irqs.h header
  ARM: EXYNOS: Select SPARSE_IRQ for Exynos
  ARM: SAMSUNG: Make legacy MFC support code depend on SAMSUNG_ATAGS
  ARM: EXYNOS: Remove mach/regs-gpio.h header
  ARM: EXYNOS: Remove mach/gpio.h
  ARM: EXYNOS: Remove setup-i2c0.c
  ARM: EXYNOS: Do not select legacy Kconfig symbols any more
  ARM: SAMSUNG: Include most of mach/ headers conditionally
  ARM: EXYNOS: Decouple ARCH_EXYNOS from PLAT_S5P
  USB: Check for ARCH_EXYNOS separately
  platform: Check for ARCH_EXYNOS separately
  ARM: SAMSUNG: Compile legacy IRQ and GPIO PM code only with ATAGS support
  ARM: EXYNOS: Provide compatibility stubs for PM code in pm-core.h header
  ...

Conflicts:
	arch/arm/mach-exynos/Kconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

ff8fa4e287b0d57d44eeb8aad43c38f92efcf398
diff --cc arch/arm/mach-exynos/Kconfig
index e51d99060d33,46c8332476f8..1e0e3999c17a
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -418,8 -96,9 +101,7 @@@ config MACH_EXYNOS4_D
  	select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
  	select CPU_EXYNOS4210
  	select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
 -	select PINCTRL
 -	select PINCTRL_EXYNOS
  	select S5P_DEV_MFC
- 	select USE_OF
  	help
  	  Machine support for Samsung Exynos4 machine with device tree enabled.
  	  Select this if a fdt blob is available for the Exynos4 SoC based board.
@@@ -432,8 -111,6 +114,7 @@@ config MACH_EXYNOS5_D
  	depends on ARCH_EXYNOS5
  	select ARM_AMBA
  	select CLKSRC_OF
 +	select USB_ARCH_HAS_XHCI
- 	select USE_OF
  	help
  	  Machine support for Samsung EXYNOS5 machine with device tree enabled.
  	  Select this if a fdt blob is available for the EXYNOS5 SoC based board.