summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-04-26 11:47:45 -0700
committerOlof Johansson <olof@lixom.net>2013-04-26 11:47:45 -0700
commit340fcb5cb4c91e58a5102beb0b86b9c416b8c956 (patch)
treed0e41752e473069f4ec9a065cd1f060c4e91266b /arch/arm/mach-exynos
parent37746c9a2dd28d52790dd84267b848c087a63b2e (diff)
parent4923ee444a39c8b75027ed01a7812e940194dbec (diff)
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>
Diffstat (limited to 'arch/arm/mach-exynos')
-rw-r--r--arch/arm/mach-exynos/Kconfig26
-rw-r--r--arch/arm/mach-exynos/Makefile5
-rw-r--r--arch/arm/mach-exynos/common.c6
3 files changed, 6 insertions, 31 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index a77db362a88..b1cdff6f537 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -7,21 +7,6 @@
# Configuration options for the EXYNOS4
-config ARCH_EXYNOS
- # TODO: make this visible after all drivers are converted
- bool "Samsung EXYNOS" if ARCH_MULTI_V7 && BROKEN
- default ARCH_EXYNOS_SINGLE
- select ARCH_HAS_CPUFREQ
- select CLKDEV_LOOKUP
- select COMMON_CLK
- select CPU_V7
- select GENERIC_CLOCKEVENTS
- select HAVE_CLK
- select HAVE_S3C2410_I2C if I2C
- select HAVE_S3C_RTC if RTC_CLASS
- help
- Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5)
-
if ARCH_EXYNOS
menu "SAMSUNG EXYNOS SoCs Support"
@@ -34,9 +19,6 @@ config ARCH_EXYNOS4
help
Samsung EXYNOS4 SoCs based systems
-config ARCH_EXYNOS4_SINGLE
- def_bool ARCH_EXYNOS4 && ARCH_EXYNOS_SINGLE
-
config ARCH_EXYNOS5
bool "SAMSUNG EXYNOS5"
select HAVE_SMP
@@ -53,7 +35,7 @@ config CPU_EXYNOS4210
select PM_GENERIC_DOMAINS
select S5P_PM if PM
select S5P_SLEEP if PM
- select SAMSUNG_DMADEV if ARCH_EXYNOS_SINGLE
+ select SAMSUNG_DMADEV
help
Enable EXYNOS4210 CPU support
@@ -63,7 +45,7 @@ config SOC_EXYNOS4212
depends on ARCH_EXYNOS4
select S5P_PM if PM
select S5P_SLEEP if PM
- select SAMSUNG_DMADEV if ARCH_EXYNOS_SINGLE
+ select SAMSUNG_DMADEV
help
Enable EXYNOS4212 SoC support
@@ -71,7 +53,7 @@ config SOC_EXYNOS4412
bool "SAMSUNG EXYNOS4412"
default y
depends on ARCH_EXYNOS4
- select SAMSUNG_DMADEV if ARCH_EXYNOS_SINGLE
+ select SAMSUNG_DMADEV
help
Enable EXYNOS4412 SoC support
@@ -83,7 +65,7 @@ config SOC_EXYNOS5250
select S5P_PM if PM
select S5P_SLEEP if PM
select S5P_DEV_MFC
- select SAMSUNG_DMADEV if ARCH_EXYNOS_SINGLE
+ select SAMSUNG_DMADEV
help
Enable EXYNOS5250 SoC support
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
index e26d05c5249..d2f6b362b6d 100644
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@ -4,7 +4,6 @@
# http://www.samsung.com/
#
# Licensed under GPLv2
-ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include
obj-y :=
obj-m :=
@@ -43,12 +42,12 @@ obj-$(CONFIG_MACH_EXYNOS5_DT) += mach-exynos5-dt.o
# device support
obj-y += dev-uart.o
-obj-$(CONFIG_ARCH_EXYNOS4_SINGLE) += dev-audio.o
+obj-$(CONFIG_ARCH_EXYNOS4) += dev-audio.o
obj-$(CONFIG_EXYNOS4_DEV_AHCI) += dev-ahci.o
obj-$(CONFIG_EXYNOS_DEV_DMA) += dma.o
obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI) += dev-ohci.o
-obj-$(CONFIG_ARCH_EXYNOS_SINGLE) += setup-i2c0.o
+obj-$(CONFIG_ARCH_EXYNOS) += setup-i2c0.o
obj-$(CONFIG_EXYNOS4_SETUP_FIMC) += setup-fimc.o
obj-$(CONFIG_EXYNOS4_SETUP_FIMD0) += setup-fimd0.o
obj-$(CONFIG_EXYNOS4_SETUP_I2C1) += setup-i2c1.o
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index a3ab0ecc7c6..939bda77def 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -361,9 +361,6 @@ static void __init exynos4_map_io(void)
else
iotable_init(exynos4_iodesc1, ARRAY_SIZE(exynos4_iodesc1));
- if (!IS_ENABLED(CONFIG_EXYNOS_ATAGS))
- return
-
/* initialize device information early */
exynos4_default_sdhci0();
exynos4_default_sdhci1();
@@ -549,8 +546,6 @@ static void __init exynos4_init_uarts(struct s3c2410_uartcfg *cfg, int no)
s3c24xx_init_uartdevs("exynos4210-uart", exynos4_uart_resources, cfg, no);
}
-
-#ifdef CONFIG_EXYNOS_ATAGS
static void __iomem *exynos_eint_base;
static DEFINE_SPINLOCK(eint_lock);
@@ -857,7 +852,6 @@ static int __init exynos_init_irq_eint(void)
return 0;
}
arch_initcall(exynos_init_irq_eint);
-#endif
static struct resource exynos4_pmu_resource[] = {
DEFINE_RES_IRQ(EXYNOS4_IRQ_PMU),