Merge branch 'samsung/exynos-multiplatform' into next/drivers

This merges in the revert of multiplatform support for exynos.

Trivial conflicts on removed code. Also, needed to add "select COMMON_CLK"
to the non-multiplatform EXYNOS config option.

* samsung/exynos-multiplatform:
  Revert "ARM: exynos: enable multiplatform support"

Signed-off-by: Olof Johansson <olof@lixom.net>

3 files changed, 3 insertions, 17 deletions

diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 77dd30af32f5..6cb19c6aa9d6 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -13,10 +13,6 @@ config PLAT_SAMSUNG
         help
           Base platform code for all Samsung SoC based systems
 
-config PLAT_SAMSUNG_SINGLE
-        def_bool PLAT_SAMSUNG && !ARCH_MULTIPLATFORM
-        
-
 config PLAT_S5P
         bool
         depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)
@@ -27,7 +23,7 @@ config PLAT_S5P
         select GIC_NON_BANKED if ARCH_EXYNOS4
         select NO_IOPORT
         select PLAT_SAMSUNG
-        select S3C_GPIO_TRACK if PLAT_SAMSUNG_SINGLE
+        select S3C_GPIO_TRACK
         select S5P_GPIO_DRVSTR
         select SAMSUNG_CLKSRC if !COMMON_CLK
         select SAMSUNG_GPIOLIB_4BIT
@@ -182,7 +178,6 @@ config S5P_DEV_UART
 
 config S3C_ADC
         bool "ADC common driver support"
-        depends on PLAT_SAMSUNG_SINGLE
         help
           Core support for the ADC block found in the Samsung SoC systems
           for drivers such as the touchscreen and hwmon to use to share
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index f38ce8489dfd..a23c460299a1 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -4,9 +4,6 @@
 #
 # Licensed under GPLv2
 
-ccflags-$(CONFIG_ARCH_MULTI_V7) += -I$(srctree)/$(src)/include
-ccflags-$(CONFIG_ARCH_EXYNOS)   += -I$(srctree)/arch/arm/mach-exynos/include
-
 obj-y                           :=
 obj-m                           :=
 obj-n                           := dummy.o
@@ -36,7 +33,7 @@ obj-$(CONFIG_S3C_ADC)	+= adc.o
 
 obj-y                           += platformdata.o
 
-obj-$(CONFIG_PLAT_SAMSUNG_SINGLE)       += devs.o
+obj-y                           += devs.o
 obj-y                           += dev-uart.o
 obj-$(CONFIG_S5P_DEV_MFC)       += s5p-dev-mfc.o
 obj-$(CONFIG_S5P_DEV_UART)      += s5p-dev-uart.o
@@ -53,10 +50,9 @@ obj-$(CONFIG_S3C_DMA)		+= dma.o s3c-dma-ops.o
 obj-$(CONFIG_SAMSUNG_DMADEV)    += dma-ops.o
 
 # PM support
+
 obj-$(CONFIG_PM)                += pm.o
-ifdef CONFIG_PLAT_SAMSUNG_SINGLE
 obj-$(CONFIG_PM)                += pm-gpio.o
-endif
 obj-$(CONFIG_SAMSUNG_PM_CHECK)  += pm-check.o
 
 obj-$(CONFIG_SAMSUNG_WAKEMASK)  += wakeup-mask.o
diff --git a/arch/arm/plat-samsung/include/plat/pm.h b/arch/arm/plat-samsung/include/plat/pm.h
index 266a4e3e2458..f6fcadeee969 100644
--- a/arch/arm/plat-samsung/include/plat/pm.h
+++ b/arch/arm/plat-samsung/include/plat/pm.h
@@ -166,7 +166,6 @@ extern void s3c_pm_check_store(void);
  */
 extern void s3c_pm_configure_extint(void);
 
-#ifdef CONFIG_PLAT_SAMSUNG_SINGLE
 /**
  * samsung_pm_restore_gpios() - restore the state of the gpios after sleep.
  *
@@ -182,10 +181,6 @@ extern void samsung_pm_restore_gpios(void);
  * Save the GPIO states for resotration on resume. See samsung_pm_restore_gpios().
  */
 extern void samsung_pm_save_gpios(void);
-#else
-#define samsung_pm_restore_gpios()      do { } while(0)
-#define samsung_pm_save_gpios()         do { } while(0)
-#endif
 
 extern void s3c_pm_save_core(void);
 extern void s3c_pm_restore_core(void);