Rename CONFIG_PWM to CONFIG_PWM_S5P and move to Kconfig

We rename the S5P specific "CONFIG_PWM" to CONFIG_PWM_S5P and move it to
Kconfig.  Given the usage of CONFIG_PWM_NX, we have that select this new
symbol.

Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/arch/arm/cpu/armv7/s5p-common/Makefile b/arch/arm/cpu/armv7/s5p-common/Makefile
index bfe02389cd9403480c09aba42ffb0324d75cdd88..0985420fe5c8e92f41a33e9b19ca634f2f45060e 100644 (file)
--- a/arch/arm/cpu/armv7/s5p-common/Makefile
+++ b/arch/arm/cpu/armv7/s5p-common/Makefile
@@ -3,14 +3,13 @@
 # Copyright (C) 2009 Samsung Electronics
 # Minkyu Kang <mk7.kang@samsung.com>
 
+obj-$(CONFIG_PWM_S5P) += pwm.o
 ifdef CONFIG_ARCH_NEXELL
-obj-$(CONFIG_PWM_NX) += pwm.o
 obj-$(CONFIG_S5P4418_ONEWIRE) += pwm.o
 else
 obj-y += cpu_info.o
 ifndef CONFIG_SPL_BUILD
 obj-y += timer.o
 obj-y += sromc.o
-obj-$(CONFIG_PWM) += pwm.o
 endif
 endif

diff --git a/board/friendlyarm/Kconfig b/board/friendlyarm/Kconfig
index f8f9cfd879a8713eabb6642027912e55eccda519..fa04727a6a2b4c737ab1cee4999d0a21c772a406 100644 (file)
--- a/board/friendlyarm/Kconfig
+++ b/board/friendlyarm/Kconfig
@@ -11,6 +11,7 @@ config S5P4418_ONEWIRE
 
 config PWM_NX
        bool "PWM"
+       select PWM_S5P
        help
          This enables LCD-Backlight control via PWM.
 endchoice

diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig
index a0104044a85f49bbb9c021bc22ca61c54ee70ec0..4d4005de1a485b9ac71bf3f3f806d52c6ad2ab61 100644 (file)
--- a/configs/s5p_goni_defconfig
+++ b/configs/s5p_goni_defconfig
@@ -52,6 +52,7 @@ CONFIG_MMC_SDHCI_S5P=y
 CONFIG_MTD=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_PMIC_MAX8998=y
+CONFIG_PWM_S5P=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Samsung"

diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig
index 2c8bd1c8ee27dda262c9a339b300aed27e8ce9ee..8c89c39c9e2f05ce8fae27387736036a5aabb47f 100644 (file)
--- a/configs/smdkc100_defconfig
+++ b/configs/smdkc100_defconfig
@@ -38,3 +38,4 @@ CONFIG_ENV_IS_IN_ONENAND=y
 CONFIG_MTD=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0x98800300
+CONFIG_PWM_S5P=y

diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index cb54e67faebfb33b77f1308a9b9334a1b8fe2a1b..8fd5a2e205192c35300f3695a6ff0b4acd3c47d0 100644 (file)
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -84,6 +84,11 @@ config PWM_SANDBOX
          useful. The PWM can be enabled but is not connected to any outputs
          so this is not very useful.
 
+config PWM_S5P
+       bool "Enable non-DM support for S5P PWM"
+       depends on (S5P || ARCH_NEXELL)
+       default y
+
 config PWM_SIFIVE
        bool "Enable support for SiFive PWM"
        depends on DM_PWM

diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h
index 79860212f4035e520cc28b0397a405c5fd064a6c..246aa9b7ab99d25eb1c19c06a0a598b0e540cd77 100644 (file)
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -18,9 +18,6 @@
 
 /* select serial console configuration */
 
-/* PWM */
-#define CONFIG_PWM
-
 /* Miscellaneous configurable options */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 8b7e2e5dc9e991d4fa7fc4333a6457e64c7499fa..d9eeec48a0ddc485ee9a7b430074dba4a7c3edb6 100644 (file)
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -21,9 +21,6 @@
 /* MMC */
 #define SDHCI_MAX_HOSTS                4
 
-/* PWM */
-#define CONFIG_PWM                     1
-
 /* USB Composite download gadget - g_dnl */
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 

diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 5edf6f60727018ae6c483d4f44f6113bc63ef417..995623e9a6fed95cd8f43e8602d2ae1bdbbdcea4 100644 (file)
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -24,9 +24,6 @@
  * select serial console configuration
  */
 
-/* PWM */
-#define CONFIG_PWM                     1
-
 #define COMMON_BOOT    "console=ttySAC0,115200n8" \
                                " mem=128M " \
                                " " CONFIG_MTDPARTS_DEFAULT