| Message ID | 20220615160355.1519592-7-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | de0a73291550c68a7c7306c2627cbf6484241fef |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [01/13] Convert CONFIG_DW_ALTDESCRIPTOR to Kconfig | expand |
On 6/16/22 01:03, Tom Rini wrote: > 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> Best Regards, Jaehoon Chung > --- > arch/arm/cpu/armv7/s5p-common/Makefile | 3 +-- > board/friendlyarm/Kconfig | 1 + > configs/s5p_goni_defconfig | 1 + > configs/smdkc100_defconfig | 1 + > drivers/pwm/Kconfig | 5 +++++ > include/configs/exynos-common.h | 3 --- > include/configs/s5p_goni.h | 3 --- > include/configs/smdkc100.h | 3 --- > 8 files changed, 9 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/cpu/armv7/s5p-common/Makefile b/arch/arm/cpu/armv7/s5p-common/Makefile > index bfe02389cd94..0985420fe5c8 100644 > --- 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 f8f9cfd879a8..fa04727a6a2b 100644 > --- 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 a0104044a85f..4d4005de1a48 100644 > --- 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 2c8bd1c8ee27..8c89c39c9e2f 100644 > --- 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 cb54e67faebf..8fd5a2e20519 100644 > --- 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 79860212f403..246aa9b7ab99 100644 > --- 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 8b7e2e5dc9e9..d9eeec48a0dd 100644 > --- 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 5edf6f607270..995623e9a6fe 100644 > --- 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
diff --git a/arch/arm/cpu/armv7/s5p-common/Makefile b/arch/arm/cpu/armv7/s5p-common/Makefile index bfe02389cd94..0985420fe5c8 100644 --- 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 f8f9cfd879a8..fa04727a6a2b 100644 --- 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 a0104044a85f..4d4005de1a48 100644 --- 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 2c8bd1c8ee27..8c89c39c9e2f 100644 --- 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 cb54e67faebf..8fd5a2e20519 100644 --- 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 79860212f403..246aa9b7ab99 100644 --- 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 8b7e2e5dc9e9..d9eeec48a0dd 100644 --- 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 5edf6f607270..995623e9a6fe 100644 --- 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
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> --- arch/arm/cpu/armv7/s5p-common/Makefile | 3 +-- board/friendlyarm/Kconfig | 1 + configs/s5p_goni_defconfig | 1 + configs/smdkc100_defconfig | 1 + drivers/pwm/Kconfig | 5 +++++ include/configs/exynos-common.h | 3 --- include/configs/s5p_goni.h | 3 --- include/configs/smdkc100.h | 3 --- 8 files changed, 9 insertions(+), 11 deletions(-)