pwm: Tidyup PWM menu for Renesas

Because current PWM Kconfig is sorting by symbol name,
it looks strange ordering in menuconfig.

=>	[ ]   Renesas R-Car PWM support
=>	[ ]   Renesas TPU PWM support
	[ ]   Rockchip PWM support
=>	[ ]   Renesas RZ/G2L General PWM Timer support
=>	[ ]   Renesas RZ/G2L MTU3a PWM Timer support

Let's use common CONFIG_PWM_RENESAS_xxx symbol name for Renesas,
and sort it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/877c2mxrrr.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Uwe Kleine-König <ukleinek@kernel.org>

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 28a6ca75086104527b84fb8163ab50de6dc7465d..957e6fde0280b3948111a37517943b2011299c45 100644 (file)
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -1184,7 +1184,7 @@ CONFIG_PWM_BCM2835=y
 CONFIG_PWM_BRCMSTB=m
 CONFIG_PWM_FSL_FTM=m
 CONFIG_PWM_MESON=m
-CONFIG_PWM_RCAR=m
+CONFIG_PWM_RENESAS_RCAR=m
 CONFIG_PWM_RENESAS_TPU=y
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_PWM_SAMSUNG=m

diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index 0ea34d5d797c818af8d280011f1086abfd147cd0..7c3d6a8f0038c5e25db23172a7dfa8b6aa1f93db 100644 (file)
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -203,7 +203,7 @@ CONFIG_RZ_DMAC=y
 CONFIG_IIO=y
 CONFIG_AK8975=y
 CONFIG_PWM=y
-CONFIG_PWM_RCAR=y
+CONFIG_PWM_RENESAS_RCAR=y
 CONFIG_PWM_RENESAS_TPU=y
 CONFIG_PHY_RCAR_GEN2=y
 CONFIG_PHY_RCAR_GEN3_USB2=y

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 2dd75c799848eb7ae4452873da351cf2c14b2a5e..304a0285d61e71d836c3e2774b438f3ed42894b8 100644 (file)
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -1528,11 +1528,11 @@ CONFIG_PWM_IMX27=m
 CONFIG_PWM_MESON=m
 CONFIG_PWM_MTK_DISP=m
 CONFIG_PWM_MEDIATEK=m
-CONFIG_PWM_RCAR=m
+CONFIG_PWM_RENESAS_RCAR=m
+CONFIG_PWM_RENESAS_RZG2L_GPT=m
+CONFIG_PWM_RENESAS_RZ_MTU3=m
 CONFIG_PWM_RENESAS_TPU=m
 CONFIG_PWM_ROCKCHIP=y
-CONFIG_PWM_RZG2L_GPT=m
-CONFIG_PWM_RZ_MTU3=m
 CONFIG_PWM_SAMSUNG=y
 CONFIG_PWM_SL28CPLD=m
 CONFIG_PWM_SUN4I=m

diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index c866ed388da961061b61a29ff7b85e36ea01523d..d9bcd1e8413eaed1602d6686873e263767c58f5f 100644 (file)
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -534,7 +534,7 @@ config PWM_RASPBERRYPI_POE
          Enable Raspberry Pi firmware controller PWM bus used to control the
          official RPI PoE hat
 
-config PWM_RCAR
+config PWM_RENESAS_RCAR
        tristate "Renesas R-Car PWM support"
        depends on ARCH_RENESAS || COMPILE_TEST
        depends on HAS_IOMEM
@@ -545,26 +545,7 @@ config PWM_RCAR
          To compile this driver as a module, choose M here: the module
          will be called pwm-rcar.
 
-config PWM_RENESAS_TPU
-       tristate "Renesas TPU PWM support"
-       depends on ARCH_RENESAS || COMPILE_TEST
-       depends on HAS_IOMEM
-       help
-         This driver exposes the Timer Pulse Unit (TPU) PWM controller found
-         in Renesas chips through the PWM API.
-
-         To compile this driver as a module, choose M here: the module
-         will be called pwm-renesas-tpu.
-
-config PWM_ROCKCHIP
-       tristate "Rockchip PWM support"
-       depends on ARCH_ROCKCHIP || COMPILE_TEST
-       depends on HAS_IOMEM
-       help
-         Generic PWM framework driver for the PWM controller found on
-         Rockchip SoCs.
-
-config PWM_RZG2L_GPT
+config PWM_RENESAS_RZG2L_GPT
        tristate "Renesas RZ/G2L General PWM Timer support"
        depends on ARCH_RZG2L || COMPILE_TEST
        depends on HAS_IOMEM
@@ -575,7 +556,7 @@ config PWM_RZG2L_GPT
          To compile this driver as a module, choose M here: the module
          will be called pwm-rzg2l-gpt.
 
-config PWM_RZ_MTU3
+config PWM_RENESAS_RZ_MTU3
        tristate "Renesas RZ/G2L MTU3a PWM Timer support"
        depends on RZ_MTU3
        depends on HAS_IOMEM
@@ -586,6 +567,25 @@ config PWM_RZ_MTU3
          To compile this driver as a module, choose M here: the module
          will be called pwm-rz-mtu3.
 
+config PWM_RENESAS_TPU
+       tristate "Renesas TPU PWM support"
+       depends on ARCH_RENESAS || COMPILE_TEST
+       depends on HAS_IOMEM
+       help
+         This driver exposes the Timer Pulse Unit (TPU) PWM controller found
+         in Renesas chips through the PWM API.
+
+         To compile this driver as a module, choose M here: the module
+         will be called pwm-renesas-tpu.
+
+config PWM_ROCKCHIP
+       tristate "Rockchip PWM support"
+       depends on ARCH_ROCKCHIP || COMPILE_TEST
+       depends on HAS_IOMEM
+       help
+         Generic PWM framework driver for the PWM controller found on
+         Rockchip SoCs.
+
 config PWM_SAMSUNG
        tristate "Samsung PWM support"
        depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST

diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile
index 5c782af8f49b117ce13591cd92a10b1063ee288d..96160f4257fcb0e0951581af0090615c0edf5260 100644 (file)
--- a/drivers/pwm/Makefile
+++ b/drivers/pwm/Makefile
@@ -48,11 +48,11 @@ obj-$(CONFIG_PWM_OMAP_DMTIMER)      += pwm-omap-dmtimer.o
 obj-$(CONFIG_PWM_PCA9685)      += pwm-pca9685.o
 obj-$(CONFIG_PWM_PXA)          += pwm-pxa.o
 obj-$(CONFIG_PWM_RASPBERRYPI_POE)      += pwm-raspberrypi-poe.o
-obj-$(CONFIG_PWM_RCAR)         += pwm-rcar.o
+obj-$(CONFIG_PWM_RENESAS_RCAR) += pwm-rcar.o
+obj-$(CONFIG_PWM_RENESAS_RZG2L_GPT)    += pwm-rzg2l-gpt.o
+obj-$(CONFIG_PWM_RENESAS_RZ_MTU3)      += pwm-rz-mtu3.o
 obj-$(CONFIG_PWM_RENESAS_TPU)  += pwm-renesas-tpu.o
 obj-$(CONFIG_PWM_ROCKCHIP)     += pwm-rockchip.o
-obj-$(CONFIG_PWM_RZG2L_GPT)    += pwm-rzg2l-gpt.o
-obj-$(CONFIG_PWM_RZ_MTU3)      += pwm-rz-mtu3.o
 obj-$(CONFIG_PWM_SAMSUNG)      += pwm-samsung.o
 obj-$(CONFIG_PWM_SIFIVE)       += pwm-sifive.o
 obj-$(CONFIG_PWM_SL28CPLD)     += pwm-sl28cpld.o