ARM: SAMSUNG: make local dev-backlight in mach-s3c64xx

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 2/3 ARM: SAMSUNG: make local dev-backlight in mach-s3c64xx

This patch moves dev-backlight from plat-samsung into mach-s3c64xx because it is used for only s3c64xx no other platforms.

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

Cc Krzysztof Kozlowski <[email protected]>

---
 arch/arm/mach-s3c64xx/Kconfig                           | 6 ++++++
 arch/arm/mach-s3c64xx/Makefile                          | 2 ++
 arch/arm/{plat-samsung => mach-s3c64xx}/dev-backlight.c | 3 +--
 arch/arm/plat-samsung/Kconfig                           | 6 ------
 arch/arm/plat-samsung/Makefile                          | 2 --
 5 files changed, 9 insertions(+), 10 deletions(-)
 rename arch/arm/{plat-samsung => mach-s3c64xx}/dev-backlight.c (98%)

arch/arm/mach-s3c64xx/Kconfig +6 -0

index eff95e9..28c7097 100644
@@ -34,6 +34,12 @@ config S3C64XX_DEV_ONENAND1
 	help
 	  Compile in platform device definition for OneNAND1 controller
 
+config SAMSUNG_DEV_BACKLIGHT
+	bool
+	depends on SAMSUNG_DEV_PWM
+	help
+	  Compile in platform device definition LCD backlight with PWM Timer
+
 # platform specific device setup
 
 config S3C64XX_SETUP_I2C0

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

index 17f4b07..bb233f3 100644
@@ -40,6 +40,8 @@ obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
 obj-$(CONFIG_S3C64XX_SETUP_SPI)		+= setup-spi.o
 obj-$(CONFIG_S3C64XX_SETUP_USB_PHY) += setup-usb-phy.o
 
+obj-$(CONFIG_SAMSUNG_DEV_BACKLIGHT)	+= dev-backlight.o
+
 # Machine support
 
 obj-$(CONFIG_MACH_ANW6410)		+= mach-anw6410.o

arch/arm/mach-s3c64xx/dev-backlight.c renamed from arch/arm/plat-samsung/dev-backlight.c +1 -2

similarity index 98%
rename from arch/arm/plat-samsung/dev-backlight.c
rename to arch/arm/mach-s3c64xx/dev-backlight.c
index 2157c5b..62f4648 100644
@@ -1,5 +1,4 @@
-/* linux/arch/arm/plat-samsung/dev-backlight.c
- *
+/*
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
  *              http://www.samsung.com
  *

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

index f115c81..0e1874c 100644
@@ -217,12 +217,6 @@ config SAMSUNG_DEV_PWM
 	help
 	  Compile in platform device definition for PWM Timer
 
-config SAMSUNG_DEV_BACKLIGHT
-	bool
-	depends on SAMSUNG_DEV_PWM
-	help
-	  Compile in platform device definition LCD backlight with PWM Timer
-
 config S3C24XX_PWM
 	bool "PWM device support"
 	select PWM

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

index c48a2cc..624f5db 100644
@@ -22,8 +22,6 @@ obj-$(CONFIG_SAMSUNG_ATAGS)	+= devs.o
 obj-$(CONFIG_SAMSUNG_ATAGS)	+= dev-uart.o
 obj-$(CONFIG_S5P_DEV_MFC)	+= s5p-dev-mfc.o
 
-obj-$(CONFIG_SAMSUNG_DEV_BACKLIGHT)	+= dev-backlight.o
-
 # PM support
 
 obj-$(CONFIG_PM_SLEEP)		+= pm-common.o

Signature · 1 line

2.0.0