diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-26 11:32:02 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-26 11:35:51 -0700 |
| commit | 4923ee444a39c8b75027ed01a7812e940194dbec (patch) | |
| tree | 660146f078a65463590d9b623d2a37bb263a6b29 /arch/arm/plat-samsung | |
| parent | bd51de53e1be9896d815bbea30560262216d4616 (diff) | |
Revert "ARM: exynos: enable multiplatform support"
This reverts commit bd51de53e1be9896d815bbea30560262216d4616.
Turns out that multiplatform breaks some uses cases, such as when you
have an existing defconfig, since it adds the new EXYNOS_SINGLE config
option as a dependecy. As a result, nearly all exynos config options
will be disabled by default.
Reverting instead of rebasing since this branch is pulled in as a
dependency elsewhere.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/Kconfig | 7 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/Makefile | 8 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/pm.h | 5 |
3 files changed, 3 insertions, 17 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 8aae6816ebc2..a9d52167e16e 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 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 cf684b2eb6fc..3a7c64d1814a 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 @@ -37,7 +34,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 @@ -54,10 +51,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); |