浏览代码

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.

Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Kukjin Kim 10 年之前
父节点
当前提交
a1bd8d8bb8

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

@@ -124,6 +124,11 @@ config S3C24XX_PLL
 	  This also means that the PLL tables for the selected CPU(s) will
 	  This also means that the PLL tables for the selected CPU(s) will
 	  be built which may increase the size of the kernel image.
 	  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
 # cpu frequency items common between s3c2410 and s3c2440/s3c2442
 
 
 config S3C2410_IOTIMING
 config S3C2410_IOTIMING

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

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

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


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

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

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

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