summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210
diff options
context:
space:
mode:
authorTomasz Figa <t.figa@samsung.com>2014-07-03 13:17:12 +0200
committerKukjin Kim <kgene.kim@samsung.com>2014-07-19 04:32:16 +0900
commitaa42587a43e82b409436e05ce52835904de1a96f (patch)
tree0617153bf08eb07042d3717a9445e59f18a3ae6e /arch/arm/mach-s5pv210
parent6d4ed0f46af6c27ca2de4a7d586955aef38ef556 (diff)
downloadlinux-aa42587a43e82b409436e05ce52835904de1a96f.tar.bz2
ARM: S5PV210: Enable multi-platform build support
This makes it possible to enable the s5pv210 platform as part of a multiplatform kernel. Also redundant Kconfig options are removed. Signed-off-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5pv210')
-rw-r--r--arch/arm/mach-s5pv210/Kconfig36
-rw-r--r--arch/arm/mach-s5pv210/Makefile7
-rw-r--r--arch/arm/mach-s5pv210/Makefile.boot2
3 files changed, 19 insertions, 26 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index ffc777dfa8a0..330bfc8fcd52 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -7,32 +7,28 @@
# Configuration options for the S5PV210/S5PC110
+config ARCH_S5PV210
+ bool "Samsung S5PV210/S5PC110" if ARCH_MULTI_V7
+ select ARCH_HAS_HOLES_MEMORYMODEL
+ select ARCH_REQUIRE_GPIOLIB
+ select ARM_VIC
+ select CLKSRC_SAMSUNG_PWM
+ select COMMON_CLK_SAMSUNG
+ select HAVE_S3C2410_I2C if I2C
+ select HAVE_S3C2410_WATCHDOG if WATCHDOG
+ select HAVE_S3C_RTC if RTC_CLASS
+ select PINCTRL
+ select PINCTRL_EXYNOS
+ help
+ Samsung S5PV210/S5PC110 series based systems
+
if ARCH_S5PV210
config CPU_S5PV210
- bool
+ def_bool y
select ARM_AMBA
select PL330_DMA if DMADEVICES
- select S5P_EXT_INT
help
Enable S5PV210 CPU support
-menu "S5PV210 Machines"
-
-config MACH_S5PV210_DT
- bool "Samsung S5PV210/S5PC110 machine using Device Tree"
- select CLKSRC_OF
- select CPU_S5PV210
- select PINCTRL
- select PINCTRL_EXYNOS
- select USE_OF
- help
- Machine support for Samsung S5PV210/S5PC110 machines with Device Tree
- enabled.
- Select this if a fdt blob is available for your S5PV210 SoC based
- board.
- Note: This is under development and not all peripherals can be
- supported with this machine file.
-endmenu
-
endif
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile
index 5308225dfdee..7dc2d0e25a83 100644
--- a/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@ -5,6 +5,8 @@
#
# Licensed under GPLv2
+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include
+
obj-y :=
obj-m :=
obj-n :=
@@ -16,7 +18,4 @@ obj-$(CONFIG_PM_SLEEP) += pm.o sleep.o
# machine support
-obj-$(CONFIG_MACH_S5PV210_DT) += s5pv210.o
-# device support
-
-obj-y += setup-i2c0.o
+obj-y += s5pv210.o
diff --git a/arch/arm/mach-s5pv210/Makefile.boot b/arch/arm/mach-s5pv210/Makefile.boot
deleted file mode 100644
index 79ece4055b02..000000000000
--- a/arch/arm/mach-s5pv210/Makefile.boot
+++ /dev/null
@@ -1,2 +0,0 @@
- zreladdr-y += 0x20008000
-params_phys-y := 0x20000100