ARM: SAMSUNG: make local setup-camif in mach-s3c24xx

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 1/3 ARM: SAMSUNG: make local setup-camif in mach-s3c24xx

This patch moves setup-camif from plat-samsung into mach-s3c24xx because it can be used only for s3c24xx no other platforms.

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

Cc Krzysztof Kozlowski <[email protected]>

---
 arch/arm/mach-s3c24xx/Kconfig                         | 5 +++++
 arch/arm/mach-s3c24xx/Makefile                        | 1 +
 arch/arm/{plat-samsung => mach-s3c24xx}/setup-camif.c | 0
 arch/arm/plat-samsung/Kconfig                         | 6 ------
 arch/arm/plat-samsung/Makefile                        | 2 --
 5 files changed, 6 insertions(+), 8 deletions(-)
 rename arch/arm/{plat-samsung => mach-s3c24xx}/setup-camif.c (100%)

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

index 23bec3a..ef68ecb 100644
@@ -124,6 +124,11 @@ config S3C24XX_PLL
 	  This also means that the PLL tables for the selected CPU(s) will
 	  be built which may increase the size of the kernel image.
 
+config S3C_SETUP_CAMIF
+	bool
+	help
+	  Compile in common setup code for S3C CAMIF devices
+
 # cpu frequency items common between s3c2410 and s3c2440/s3c2442
 
 config S3C2410_IOTIMING

arch/arm/mach-s3c24xx/Makefile +1 -0

index 05920c8..8ac2f58 100644
@@ -99,3 +99,4 @@ obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
 obj-$(CONFIG_S3C2443_SETUP_SPI)		+= setup-spi.o
 obj-$(CONFIG_ARCH_S3C24XX)		+= setup-i2c.o
 obj-$(CONFIG_S3C24XX_SETUP_TS)		+= setup-ts.o
+obj-$(CONFIG_S3C_SETUP_CAMIF)		+= setup-camif.o

arch/arm/mach-s3c24xx/setup-camif.c renamed from arch/arm/plat-samsung/setup-camif.c +0 -0

similarity index 100%
rename from arch/arm/plat-samsung/setup-camif.c
rename to arch/arm/mach-s3c24xx/setup-camif.c

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

index cb8e3d6..f115c81 100644
@@ -231,18 +231,12 @@ config S3C24XX_PWM
 	  Support for exporting the PWM timer blocks via the pwm device
 	  system
 
-config S3C_SETUP_CAMIF
-	bool
-	help
-	  Compile in common setup code for S3C CAMIF devices
-
 config SAMSUNG_PM_GPIO
 	bool
 	default y if GPIO_SAMSUNG && PM
 	help
 	  Include legacy GPIO power management code for platforms not using
 	  pinctrl-samsung driver.
-
 endif
 
 config S5P_DEV_MFC

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

index 1a29ab1..c48a2cc 100644
@@ -24,8 +24,6 @@ obj-$(CONFIG_S5P_DEV_MFC)	+= s5p-dev-mfc.o
 
 obj-$(CONFIG_SAMSUNG_DEV_BACKLIGHT)	+= dev-backlight.o
 
-obj-$(CONFIG_S3C_SETUP_CAMIF)	+= setup-camif.o
-
 # PM support
 
 obj-$(CONFIG_PM_SLEEP)		+= pm-common.o

Signature · 1 line

2.0.0