aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKukjin Kim <kgene@kernel.org>2015-07-29 12:48:17 -0400
committerKukjin Kim <kgene@kernel.org>2015-07-29 12:49:00 -0400
commitb93b315d444faa1505b6a5e001c30f3024849e46 (patch)
tree5efba5339bc43618284e2d733d95acd4caa071e1
parent7f798c1c0d562ef1200cbe3227cd0474b1c285f7 (diff)
ARM: SAMSUNG: make local s5p-dev-mfc in mach-exynos
This patch moves s5p-dev-mfc from plat-samsung into mach-exynos because it is used for only exynos no other platforms. Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org>
-rw-r--r--arch/arm/mach-exynos/Kconfig5
-rw-r--r--arch/arm/mach-exynos/Makefile2
-rw-r--r--arch/arm/mach-exynos/s5p-dev-mfc.c (renamed from arch/arm/plat-samsung/s5p-dev-mfc.c)0
-rw-r--r--arch/arm/plat-samsung/Kconfig5
-rw-r--r--arch/arm/plat-samsung/Makefile1
5 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 81064cd61a0a..4c4858c566d8 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -30,6 +30,11 @@ menuconfig ARCH_EXYNOS
30 30
31if ARCH_EXYNOS 31if ARCH_EXYNOS
32 32
33config S5P_DEV_MFC
34 bool
35 help
36 Compile in setup memory (init) code for MFC
37
33config ARCH_EXYNOS3 38config ARCH_EXYNOS3
34 bool "SAMSUNG EXYNOS3" 39 bool "SAMSUNG EXYNOS3"
35 select ARM_CPU_SUSPEND if PM 40 select ARM_CPU_SUSPEND if PM
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
index bcefb5473ee4..2f306767cdfe 100644
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@ -23,3 +23,5 @@ AFLAGS_sleep.o :=-Wa,-march=armv7-a$(plus_sec)
23 23
24obj-$(CONFIG_EXYNOS5420_MCPM) += mcpm-exynos.o 24obj-$(CONFIG_EXYNOS5420_MCPM) += mcpm-exynos.o
25CFLAGS_mcpm-exynos.o += -march=armv7-a 25CFLAGS_mcpm-exynos.o += -march=armv7-a
26
27obj-$(CONFIG_S5P_DEV_MFC) += s5p-dev-mfc.o
diff --git a/arch/arm/plat-samsung/s5p-dev-mfc.c b/arch/arm/mach-exynos/s5p-dev-mfc.c
index 0b04b6b0fa30..0b04b6b0fa30 100644
--- a/arch/arm/plat-samsung/s5p-dev-mfc.c
+++ b/arch/arm/mach-exynos/s5p-dev-mfc.c
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 0e1874ccf1ea..57729b915003 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -233,11 +233,6 @@ config SAMSUNG_PM_GPIO
233 pinctrl-samsung driver. 233 pinctrl-samsung driver.
234endif 234endif
235 235
236config S5P_DEV_MFC
237 bool
238 help
239 Compile in setup memory (init) code for MFC
240
241comment "Power management" 236comment "Power management"
242 237
243config SAMSUNG_PM_DEBUG 238config SAMSUNG_PM_DEBUG
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index 624f5db0e39c..8c911760f55f 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -20,7 +20,6 @@ obj-$(CONFIG_SAMSUNG_ATAGS) += platformdata.o
20 20
21obj-$(CONFIG_SAMSUNG_ATAGS) += devs.o 21obj-$(CONFIG_SAMSUNG_ATAGS) += devs.o
22obj-$(CONFIG_SAMSUNG_ATAGS) += dev-uart.o 22obj-$(CONFIG_SAMSUNG_ATAGS) += dev-uart.o
23obj-$(CONFIG_S5P_DEV_MFC) += s5p-dev-mfc.o
24 23
25# PM support 24# PM support
26 25