Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc

* 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc: (79 commits)
  ARM: SAMSUNG: Move fimc plat. device from board files to plat-samsung
  ARM: SAMSUNG: Cleanup resources by using macro
  ARM: SAMSUNG: Cleanup plat-samsung/devs.c and devs.h
  ARM: S5P: To merge devs.c files to one devs.c
  ARM: S3C64XX: To merge devs.c files to one devs.c
  ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c
  ARM: S5P64X0: Add Power Management support
  ARM: S5P: Make the sleep code common for S5P series SoCs
  ARM: S5P: Make the common S5P PM code conditionally compile
  ARM: SAMSUNG: Move S5P header files to plat-samsung
  ARM: SAMSUNG: Move S3C24XX header files to plat-samsung
  ARM: SAMSUNG: Moving each SoC support header files
  ARM: SAMSUNG: Consolidate plat/pll.h
  ARM: SAMSUNG: Consolidate plat/pwm-clock.h
  ARM: SAMSUNG: Cleanup mach/clkdev.h
  ARM: SAMSUNG: remove sdhci default configuration setup platform helper
  ARM: EXYNOS4: Add FIMC device on SMDKV310 board
  ARM: EXYNOS4: Add header file protection macros
  ARM: EXYNOS4: Add usb ehci device to the SMDKV310
  ARM: S3C2443: Add hsspi-clock from pclk and rename S3C2443 hsspi sclk
  ...

Fix up conflicts in
 - arch/arm/mach-exynos4/{Kconfig,clock.c}
	ARM_CPU_SUSPEND, various random device tables (gah!)
 - drivers/gpio/Makefile
	sa1100 gpio added, samsung gpio drivers merged

diff --cc arch/arm/Kconfig
index fe6b0526b3a6fb3f52d35730b84930932050d8a9,70b3943a5754b18566ef313c79557f7f8b43fe62..e17fe2503bba3900c6c22be290507f02014d5f73
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -776,10 -744,8 +776,7 @@@ config ARCH_S3C64X
        select ARCH_REQUIRE_GPIOLIB
        select SAMSUNG_CLKSRC
        select SAMSUNG_IRQ_VIC_TIMER
 -      select SAMSUNG_IRQ_UART
        select S3C_GPIO_TRACK
-       select S3C_GPIO_PULL_UPDOWN
-       select S3C_GPIO_CFG_S3C24XX
-       select S3C_GPIO_CFG_S3C64XX
        select S3C_DEV_NAND
        select USB_ARCH_HAS_OHCI
        select SAMSUNG_GPIOLIB_4BIT

diff --cc arch/arm/mach-exynos4/Kconfig
index 44013e0672fed751614e48528238f51f9061df8b,dd660eb2020482b544ba762beb89134eb1e2f40a..59299ea5b2ffdb74c6343af3e1613d61039caa18
--- 1/arch/arm/mach-exynos4/Kconfig
--- 2/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@@ -12,12 -12,15 +12,17 @@@ if ARCH_EXYNOS
  config CPU_EXYNOS4210
        bool
        select SAMSUNG_DMADEV
 +      select ARM_CPU_SUSPEND if PM
+       select S5P_PM if PM
+       select S5P_SLEEP if PM
        help
          Enable EXYNOS4210 CPU support
  
  config SOC_EXYNOS4212
        bool
++      select ARM_CPU_SUSPEND if PM
+       select S5P_PM if PM
+       select S5P_SLEEP if PM
        help
          Enable EXYNOS4212 SoC support
  

diff --cc arch/arm/mach-exynos4/clock.c
index a52024e309b0352ea09d15f78ade07619e4e9c65,db616916d7a4b012085ef0f46300ad27026ee5f4..2894f0adef5c325dd117c0224d5ddbf40809b0c7
--- 1/arch/arm/mach-exynos4/clock.c
--- 2/arch/arm/mach-exynos4/clock.c
+++ b/arch/arm/mach-exynos4/clock.c
@@@ -507,9 -522,44 +522,39 @@@ static struct clk init_clocks_off[] = 
                .parent         = &clk_aclk_133.clk,
                .enable         = exynos4_clk_ip_fsys_ctrl,
                .ctrlbit        = (1 << 9),
 -      }, {
 -              .name           = "sata",
 -              .parent         = &clk_aclk_133.clk,
 -              .enable         = exynos4_clk_ip_fsys_ctrl,
 -              .ctrlbit        = (1 << 10),
+       }, {
+               .name           = "dac",
+               .devname        = "s5p-sdo",
+               .enable         = exynos4_clk_ip_tv_ctrl,
+               .ctrlbit        = (1 << 2),
+       }, {
+               .name           = "mixer",
+               .devname        = "s5p-mixer",
+               .enable         = exynos4_clk_ip_tv_ctrl,
+               .ctrlbit        = (1 << 1),
+       }, {
+               .name           = "vp",
+               .devname        = "s5p-mixer",
+               .enable         = exynos4_clk_ip_tv_ctrl,
+               .ctrlbit        = (1 << 0),
+       }, {
+               .name           = "hdmi",
+               .devname        = "exynos4-hdmi",
+               .enable         = exynos4_clk_ip_tv_ctrl,
+               .ctrlbit        = (1 << 3),
+       }, {
+               .name           = "hdmiphy",
+               .devname        = "exynos4-hdmi",
+               .enable         = exynos4_clk_hdmiphy_ctrl,
+               .ctrlbit        = (1 << 0),
+       }, {
+               .name           = "dacphy",
+               .devname        = "s5p-sdo",
+               .enable         = exynos4_clk_dac_ctrl,
+               .ctrlbit        = (1 << 0),
        }, {
                .name           = "dma",
-               .devname        = "s3c-pl330.0",
+               .devname        = "dma-pl330.0",
                .enable         = exynos4_clk_ip_fsys_ctrl,
                .ctrlbit        = (1 << 0),
        }, {

diff --cc arch/arm/mach-s3c2410/s3c2410.c
Simple merge

diff --cc arch/arm/mach-s3c2416/s3c2416.c
Simple merge

diff --cc arch/arm/mach-s3c2440/s3c2440.c
Simple merge

diff --cc arch/arm/mach-s3c2440/s3c2442.c
Simple merge

diff --cc arch/arm/plat-s5p/Kconfig
Simple merge

diff --cc arch/arm/plat-s5p/irq-gpioint.c
Simple merge

diff --cc arch/arm/plat-samsung/Kconfig
Simple merge

diff --cc arch/arm/plat-samsung/Makefile
Simple merge

diff --cc arch/arm/plat-samsung/include/plat/irqs.h
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/Makefile
index 19c5d27b6d2e916216594bca14e7243983634bf1,62db458c850d1e5fc83c544e7a30b412c942d932..4a9ad2f99ada80499c058bfefe80edd398ec6552
--- 1/drivers/gpio/Makefile
--- 2/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -14,14 -14,10 +14,13 @@@ obj-$(CONFIG_GPIO_ADP5588) += gpio-adp5
  obj-$(CONFIG_GPIO_BT8XX)      += gpio-bt8xx.o
  obj-$(CONFIG_GPIO_CS5535)     += gpio-cs5535.o
  obj-$(CONFIG_GPIO_DA9052)     += gpio-da9052.o
 +obj-$(CONFIG_ARCH_DAVINCI)    += gpio-davinci.o
  obj-$(CONFIG_GPIO_EP93XX)     += gpio-ep93xx.o
- obj-$(CONFIG_GPIO_EXYNOS4)    += gpio-exynos4.o
  obj-$(CONFIG_GPIO_IT8761E)    += gpio-it8761e.o
  obj-$(CONFIG_GPIO_JANZ_TTL)   += gpio-janz-ttl.o
 +obj-$(CONFIG_MACH_KS8695)     += gpio-ks8695.o
  obj-$(CONFIG_GPIO_LANGWELL)   += gpio-langwell.o
 +obj-$(CONFIG_ARCH_LPC32XX)    += gpio-lpc32xx.o
  obj-$(CONFIG_GPIO_MAX730X)    += gpio-max730x.o
  obj-$(CONFIG_GPIO_MAX7300)    += gpio-max7300.o
  obj-$(CONFIG_GPIO_MAX7301)    += gpio-max7301.o
@@@ -40,13 -36,8 +39,10 @@@ obj-$(CONFIG_GPIO_PCA953X)  += gpio-pca9
  obj-$(CONFIG_GPIO_PCF857X)    += gpio-pcf857x.o
  obj-$(CONFIG_GPIO_PCH)                += gpio-pch.o
  obj-$(CONFIG_GPIO_PL061)      += gpio-pl061.o
 +obj-$(CONFIG_PLAT_PXA)                += gpio-pxa.o
  obj-$(CONFIG_GPIO_RDC321X)    += gpio-rdc321x.o
- 
- obj-$(CONFIG_GPIO_PLAT_SAMSUNG)       += gpio-plat-samsung.o
- obj-$(CONFIG_GPIO_S5PC100)    += gpio-s5pc100.o
- obj-$(CONFIG_GPIO_S5PV210)    += gpio-s5pv210.o
+ obj-$(CONFIG_PLAT_SAMSUNG)    += gpio-samsung.o
 +obj-$(CONFIG_ARCH_SA1100)     += gpio-sa1100.o
  obj-$(CONFIG_GPIO_SCH)                += gpio-sch.o
  obj-$(CONFIG_GPIO_STMPE)      += gpio-stmpe.o
  obj-$(CONFIG_GPIO_SX150X)     += gpio-sx150x.o