From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Nov 2011 01:18:05 +0000 (-0700)
Subject: Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc
X-Git-Tag: v3.2-rc1~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7abec10c623d9e0416dab6919a0ea22e6283516b;p=profile%2Fcommon%2Fkernel-common.git

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
---

7abec10c623d9e0416dab6919a0ea22e6283516b
diff --cc arch/arm/Kconfig
index fe6b052,70b3943..e17fe25
--- a/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 44013e0,dd660eb..59299ea
--- a/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 a52024e,db61691..2894f0a
--- a/arch/arm/mach-exynos4/clock.c
+++ b/arch/arm/mach-exynos4/clock.c
@@@ -508,8 -523,43 +523,38 @@@ static struct clk init_clocks_off[] = 
  		.enable		= exynos4_clk_ip_fsys_ctrl,
  		.ctrlbit	= (1 << 9),
  	}, {
+ 		.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		= "sata",
 -		.parent		= &clk_aclk_133.clk,
 -		.enable		= exynos4_clk_ip_fsys_ctrl,
 -		.ctrlbit	= (1 << 10),
 -	}, {
  		.name		= "dma",
- 		.devname	= "s3c-pl330.0",
+ 		.devname	= "dma-pl330.0",
  		.enable		= exynos4_clk_ip_fsys_ctrl,
  		.ctrlbit	= (1 << 0),
  	}, {
diff --cc drivers/gpio/Makefile
index 19c5d27,62db458..4a9ad2f
--- a/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