ARM: SAMSUNG: make local s5p-dev-mfc in mach-exynos

PATCH New Kukjin Kim 1 participant 1 message Jul 25, 2015

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm Samsung Exynos

lore

Share & tools

lore

Kukjin Kim

author

2015-07-25 02:28 UTC #0 lore raw

PATCH 3/3 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.

Signed-off-by Kukjin Kim <[email protected]>

Cc Krzysztof Kozlowski <[email protected]>

---
 arch/arm/mach-exynos/Kconfig                         | 5 +++++
 arch/arm/mach-exynos/Makefile                        | 2 ++
 arch/arm/{plat-samsung => mach-exynos}/s5p-dev-mfc.c | 0
 arch/arm/plat-samsung/Kconfig                        | 5 -----
 arch/arm/plat-samsung/Makefile                       | 1 -
 5 files changed, 7 insertions(+), 6 deletions(-)
 rename arch/arm/{plat-samsung => mach-exynos}/s5p-dev-mfc.c (100%)

arch/arm/mach-exynos/Kconfig +5 -0

index 81064cd..4c4858c 100644
@@ -30,6 +30,11 @@ menuconfig ARCH_EXYNOS
 
 if ARCH_EXYNOS
 
+config S5P_DEV_MFC
+	bool
+	help
+	  Compile in setup memory (init) code for MFC
+
 config ARCH_EXYNOS3
 	bool "SAMSUNG EXYNOS3"
 	select ARM_CPU_SUSPEND if PM

arch/arm/mach-exynos/Makefile +2 -0

index bcefb54..2f30676 100644
@@ -23,3 +23,5 @@ AFLAGS_sleep.o			:=-Wa,-march=armv7-a$(plus_sec)
 
 obj-$(CONFIG_EXYNOS5420_MCPM)	+= mcpm-exynos.o
 CFLAGS_mcpm-exynos.o		+= -march=armv7-a
+
+obj-$(CONFIG_S5P_DEV_MFC)	+= s5p-dev-mfc.o

arch/arm/mach-exynos/s5p-dev-mfc.c renamed from arch/arm/plat-samsung/s5p-dev-mfc.c +0 -0

similarity index 100%
rename from arch/arm/plat-samsung/s5p-dev-mfc.c
rename to arch/arm/mach-exynos/s5p-dev-mfc.c

arch/arm/plat-samsung/Kconfig +0 -5

index 0e1874c..57729b9 100644
@@ -233,11 +233,6 @@ config SAMSUNG_PM_GPIO
 	  pinctrl-samsung driver.
 endif
 
-config S5P_DEV_MFC
-	bool
-	help
-	  Compile in setup memory (init) code for MFC
-
 comment "Power management"
 
 config SAMSUNG_PM_DEBUG

arch/arm/plat-samsung/Makefile +0 -1

index 624f5db..8c91176 100644
@@ -20,7 +20,6 @@ obj-$(CONFIG_SAMSUNG_ATAGS)	+= platformdata.o
 
 obj-$(CONFIG_SAMSUNG_ATAGS)	+= devs.o
 obj-$(CONFIG_SAMSUNG_ATAGS)	+= dev-uart.o
-obj-$(CONFIG_S5P_DEV_MFC)	+= s5p-dev-mfc.o
 
 # PM support

Signature · 1 line

2.0.0