| Message ID | 877c2mxrrr.wl-kuninori.morimoto.gx@renesas.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v4] pwm: tidyup PWM menu for Renesas | expand |
Hi Morimoto-san, I like cleanup patches! On 2025-05-12 06:33:12 +0000, Kuninori Morimoto wrote: > 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. I think you also need to update the symbol names in the various config files found in tree. A quick look, $ git grep CONFIG_PWM_RCAR -- arch arch/arm/configs/multi_v7_defconfig:1206:CONFIG_PWM_RCAR=m arch/arm/configs/shmobile_defconfig:220:CONFIG_PWM_RCAR=y arch/arm64/configs/defconfig:1553:CONFIG_PWM_RCAR=m $ git grep CONFIG_PWM_RZG2L_GPT -- arch arch/arm64/configs/defconfig:1534:CONFIG_PWM_RZG2L_GPT=m $ git grep CONFIG_PWM_RZ_MTU3 -- arch arch/arm64/configs/defconfig:1556:CONFIG_PWM_RZ_MTU3=m > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > --- > v3 -> v4 > - Based on linux-next/master > > arch/arm/configs/multi_v7_defconfig | 2 +- > arch/arm/configs/shmobile_defconfig | 2 +- > arch/arm64/configs/defconfig | 6 ++-- > drivers/pwm/Kconfig | 44 ++++++++++++++--------------- > drivers/pwm/Makefile | 6 ++-- > 5 files changed, 30 insertions(+), 30 deletions(-) > > diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig > index dc4b722ad4b5..50c170b4619f 100644 > --- 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 0ea34d5d797c..7c3d6a8f0038 100644 > --- 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 d0768584647c..fe021cbb6393 100644 > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@ -1536,11 +1536,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 c866ed388da9..d9bcd1e8413e 100644 > --- 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 5c782af8f49b..96160f4257fc 100644 > --- 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 > -- > 2.43.0 > >
Hi Morimoto-San, > -----Original Message----- > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > Subject: [PATCH v4] 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> Cheers, Biju > --- > v3 -> v4 > - Based on linux-next/master > > arch/arm/configs/multi_v7_defconfig | 2 +- arch/arm/configs/shmobile_defconfig | 2 +- > arch/arm64/configs/defconfig | 6 ++-- > drivers/pwm/Kconfig | 44 ++++++++++++++--------------- > drivers/pwm/Makefile | 6 ++-- > 5 files changed, 30 insertions(+), 30 deletions(-) > > diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig > index dc4b722ad4b5..50c170b4619f 100644 > --- 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 0ea34d5d797c..7c3d6a8f0038 100644 > --- 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 > d0768584647c..fe021cbb6393 100644 > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@ -1536,11 +1536,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 c866ed388da9..d9bcd1e8413e 100644 > --- 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 5c782af8f49b..96160f4257fc 100644 > --- 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 > -- > 2.43.0
On Mon, May 12, 2025 at 09:39:49AM +0200, Niklas Söderlund wrote: > Hi Morimoto-san, > > I like cleanup patches! > > On 2025-05-12 06:33:12 +0000, Kuninori Morimoto wrote: > > 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. > > I think you also need to update the symbol names in the various config > files found in tree. A quick look, > > $ git grep CONFIG_PWM_RCAR -- arch > arch/arm/configs/multi_v7_defconfig:1206:CONFIG_PWM_RCAR=m > arch/arm/configs/shmobile_defconfig:220:CONFIG_PWM_RCAR=y > arch/arm64/configs/defconfig:1553:CONFIG_PWM_RCAR=m > > $ git grep CONFIG_PWM_RZG2L_GPT -- arch > arch/arm64/configs/defconfig:1534:CONFIG_PWM_RZG2L_GPT=m > > $ git grep CONFIG_PWM_RZ_MTU3 -- arch > arch/arm64/configs/defconfig:1556:CONFIG_PWM_RZ_MTU3=m > > > > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > --- > > v3 -> v4 > > - Based on linux-next/master > > > > arch/arm/configs/multi_v7_defconfig | 2 +- > > arch/arm/configs/shmobile_defconfig | 2 +- > > arch/arm64/configs/defconfig | 6 ++-- I didn't check in detail, but looking at the diffstat I'd claim that adapting the defconfigs is coped for? Best regards Uwe
On 2025-05-12 10:09:17 +0200, "Uwe Kleine-König" wrote: > On Mon, May 12, 2025 at 09:39:49AM +0200, Niklas Söderlund wrote: > > Hi Morimoto-san, > > > > I like cleanup patches! > > > > On 2025-05-12 06:33:12 +0000, Kuninori Morimoto wrote: > > > 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. > > > > I think you also need to update the symbol names in the various config > > files found in tree. A quick look, > > > > $ git grep CONFIG_PWM_RCAR -- arch > > arch/arm/configs/multi_v7_defconfig:1206:CONFIG_PWM_RCAR=m > > arch/arm/configs/shmobile_defconfig:220:CONFIG_PWM_RCAR=y > > arch/arm64/configs/defconfig:1553:CONFIG_PWM_RCAR=m > > > > $ git grep CONFIG_PWM_RZG2L_GPT -- arch > > arch/arm64/configs/defconfig:1534:CONFIG_PWM_RZG2L_GPT=m > > > > $ git grep CONFIG_PWM_RZ_MTU3 -- arch > > arch/arm64/configs/defconfig:1556:CONFIG_PWM_RZ_MTU3=m > > > > > > > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > > --- > > > v3 -> v4 > > > - Based on linux-next/master > > > > > > arch/arm/configs/multi_v7_defconfig | 2 +- > > > arch/arm/configs/shmobile_defconfig | 2 +- > > > arch/arm64/configs/defconfig | 6 ++-- > > I didn't check in detail, but looking at the diffstat I'd claim that > adapting the defconfigs is coped for? You are correct, my bad. Had the wrong branch when testing. Sorry for the noise. > > Best regards > Uwe
Hello, On Mon, May 12, 2025 at 06:33:12AM +0000, Kuninori Morimoto wrote: > 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> > --- > v3 -> v4 > - Based on linux-next/master > > arch/arm/configs/multi_v7_defconfig | 2 +- > arch/arm/configs/shmobile_defconfig | 2 +- > arch/arm64/configs/defconfig | 6 ++-- > drivers/pwm/Kconfig | 44 ++++++++++++++--------------- > drivers/pwm/Makefile | 6 ++-- > 5 files changed, 30 insertions(+), 30 deletions(-) > > diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig > index dc4b722ad4b5..50c170b4619f 100644 > --- a/arch/arm/configs/multi_v7_defconfig > +++ b/arch/arm/configs/multi_v7_defconfig > @@ -1184,7 +1184,7 @@ CONFIG_PWM_BCM2835=y > [...] > diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig > index 0ea34d5d797c..7c3d6a8f0038 100644 > --- a/arch/arm/configs/shmobile_defconfig > +++ b/arch/arm/configs/shmobile_defconfig > @@ -203,7 +203,7 @@ CONFIG_RZ_DMAC=y > [...] > diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig > index d0768584647c..fe021cbb6393 100644 > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@ -1536,11 +1536,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 I was about to apply this patch, but here in arch/arm64/configs/defconfig is an not entirely trivial merge conflict. The problem is that CONFIG_PWM_RZG2L_GPT=m is only added in commit 5ad7de623853 ("arm64: defconfig: Enable Renesas RZ/G2L GPT config") which isn't included in my tree yet but only in Geert's renesas-devel.git/next. So conceptually I'd need to do: --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -1536,11 +1536,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_RZ_MTU3=m CONFIG_PWM_RENESAS_TPU=m CONFIG_PWM_ROCKCHIP=y -CONFIG_PWM_RZ_MTU3=m CONFIG_PWM_SAMSUNG=y CONFIG_PWM_SL28CPLD=m CONFIG_PWM_SUN4I=m and the merge conflict resolution needs to add CONFIG_PWM_RENESAS_RZG2L_GPT=m. This is too bad IMHO. The obvious options are (in order of my preference): - Geert declares his renesas-arm-defconfig-for-v6.16 to be stable and I merge it into my tree and then apply the patch - I cherry pick 5ad7de623853 in my pwm tree and Geert drops it - I delay applying the patch until after v6.16-rc1 Geert: What is your preference? Let's discuss on irc? Best regards Uwe
Hi Uwe, Geert > > => [ ] 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> > > --- (snip) > I was about to apply this patch, but here in > arch/arm64/configs/defconfig is an not entirely trivial merge conflict. (snip) > - I delay applying the patch until after v6.16-rc1 This is not a important patch, IMO. I can re-post the patch after next merge window, if Uwe is OK. Thank you for your help !! Best regards --- Kuninori Morimoto
Hi Uwe, On Tue, 13 May 2025 at 22:19, "Uwe Kleine-König" <ukleinek@kernel.org> wrote: > On Mon, May 12, 2025 at 06:33:12AM +0000, Kuninori Morimoto wrote: > > 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> > > --- > > v3 -> v4 > > - Based on linux-next/master > > > > arch/arm/configs/multi_v7_defconfig | 2 +- > > arch/arm/configs/shmobile_defconfig | 2 +- > > arch/arm64/configs/defconfig | 6 ++-- > > drivers/pwm/Kconfig | 44 ++++++++++++++--------------- > > drivers/pwm/Makefile | 6 ++-- > > 5 files changed, 30 insertions(+), 30 deletions(-) > > > > diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig > > index dc4b722ad4b5..50c170b4619f 100644 > > --- a/arch/arm/configs/multi_v7_defconfig > > +++ b/arch/arm/configs/multi_v7_defconfig > > @@ -1184,7 +1184,7 @@ CONFIG_PWM_BCM2835=y > > [...] > > diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig > > index 0ea34d5d797c..7c3d6a8f0038 100644 > > --- a/arch/arm/configs/shmobile_defconfig > > +++ b/arch/arm/configs/shmobile_defconfig > > @@ -203,7 +203,7 @@ CONFIG_RZ_DMAC=y > > [...] > > diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig > > index d0768584647c..fe021cbb6393 100644 > > --- a/arch/arm64/configs/defconfig > > +++ b/arch/arm64/configs/defconfig > > @@ -1536,11 +1536,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 > > I was about to apply this patch, but here in > arch/arm64/configs/defconfig is an not entirely trivial merge conflict. > The problem is that CONFIG_PWM_RZG2L_GPT=m is only added in commit > 5ad7de623853 ("arm64: defconfig: Enable Renesas RZ/G2L GPT config") > which isn't included in my tree yet but only in Geert's > renesas-devel.git/next. So conceptually I'd need to do: > > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@ -1536,11 +1536,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_RZ_MTU3=m > CONFIG_PWM_RENESAS_TPU=m > CONFIG_PWM_ROCKCHIP=y > -CONFIG_PWM_RZ_MTU3=m > CONFIG_PWM_SAMSUNG=y > CONFIG_PWM_SL28CPLD=m > CONFIG_PWM_SUN4I=m > > and the merge conflict resolution needs to add > CONFIG_PWM_RENESAS_RZG2L_GPT=m. This is too bad IMHO. > > The obvious options are (in order of my preference): > > - Geert declares his renesas-arm-defconfig-for-v6.16 to be stable and I > merge it into my tree and then apply the patch > - I cherry pick 5ad7de623853 in my pwm tree and Geert drops it > - I delay applying the patch until after v6.16-rc1 > > Geert: What is your preference? Let's discuss on irc? My tag renesas-arm-defconfig-for-v6.16-tag2 is stable, as that is already merged in the soc tree. However, renaming config symbols always comes with its own set of pains: users must notice and adapt when updating their own configs, and I do have to manage the non-upstream renesas_defconfig, too. What about dropping the rename part? The symbols that currently lack a RENESAS-prefix do have fairly unique family prefixes. Morimoto-san: Would that still be OK for you? Thanks! Gr{oetje,eeting}s, Geert
Hello, On Wed, May 14, 2025 at 08:56:01AM +0200, Geert Uytterhoeven wrote: > On Tue, 13 May 2025 at 22:19, "Uwe Kleine-König" <ukleinek@kernel.org> wrote: > > The obvious options are (in order of my preference): > > > > - Geert declares his renesas-arm-defconfig-for-v6.16 to be stable and I > > merge it into my tree and then apply the patch > > - I cherry pick 5ad7de623853 in my pwm tree and Geert drops it > > - I delay applying the patch until after v6.16-rc1 > > > > Geert: What is your preference? Let's discuss on irc? > > My tag renesas-arm-defconfig-for-v6.16-tag2 is stable, as that is > already merged in the soc tree. > > However, renaming config symbols always comes with its own set of > pains: users must notice and adapt when updating their own configs, > and I do have to manage the non-upstream renesas_defconfig, too. > What about dropping the rename part? The symbols that currently lack > a RENESAS-prefix do have fairly unique family prefixes. > > Morimoto-san: Would that still be OK for you? I agreed with Geert off-list that merging renesas-arm-defconfig-for-v6.16-tag2 into the pwm tree and apply the patch is fine for him. That's what I did now. Thanks Uwe
Hi Geert > > However, renaming config symbols always comes with its own set of > > pains: users must notice and adapt when updating their own configs, > > and I do have to manage the non-upstream renesas_defconfig, too. > > What about dropping the rename part? The symbols that currently lack > > a RENESAS-prefix do have fairly unique family prefixes. (snip) > I agreed with Geert off-list that merging > renesas-arm-defconfig-for-v6.16-tag2 into the pwm tree and apply the > patch is fine for him. It seems the patch was applied (?) If so, I have a plan to post patch for renesas_defconfig to update symbols. I'm thinking I will post it after next merge window, but please let me know if I can post it immediately. Thank you for your help !! Best regards --- Kuninori Morimoto
Hi Morimoto-san, On Thu, 15 May 2025 at 00:56, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> wrote: > > > However, renaming config symbols always comes with its own set of > > > pains: users must notice and adapt when updating their own configs, > > > and I do have to manage the non-upstream renesas_defconfig, too. > > > What about dropping the rename part? The symbols that currently lack > > > a RENESAS-prefix do have fairly unique family prefixes. > (snip) > > I agreed with Geert off-list that merging > > renesas-arm-defconfig-for-v6.16-tag2 into the pwm tree and apply the > > patch is fine for him. > > It seems the patch was applied (?) > > If so, I have a plan to post patch for renesas_defconfig to update > symbols. I'm thinking I will post it after next merge window, > but please let me know if I can post it immediately. You can send it now, but I cannot apply it before the Kconfig changes are upstream. I do have to update renesas_defconfig in next renesas-drivers release anyway, as usual (cfr. the top 3 commits in renesas-drivers), so I can take it there. Thanks! Gr{oetje,eeting}s, Geert
Hi Geert > > If so, I have a plan to post patch for renesas_defconfig to update > > symbols. I'm thinking I will post it after next merge window, > > but please let me know if I can post it immediately. > > You can send it now, but I cannot apply it before the Kconfig > changes are upstream. I do have to update renesas_defconfig in next > renesas-drivers release anyway, as usual (cfr. the top 3 commits in > renesas-drivers), so I can take it there. Thank you for your help !! Done Best regards --- Kuninori Morimoto
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index dc4b722ad4b5..50c170b4619f 100644 --- 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 0ea34d5d797c..7c3d6a8f0038 100644 --- 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 d0768584647c..fe021cbb6393 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -1536,11 +1536,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 c866ed388da9..d9bcd1e8413e 100644 --- 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 5c782af8f49b..96160f4257fc 100644 --- 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
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> --- v3 -> v4 - Based on linux-next/master arch/arm/configs/multi_v7_defconfig | 2 +- arch/arm/configs/shmobile_defconfig | 2 +- arch/arm64/configs/defconfig | 6 ++-- drivers/pwm/Kconfig | 44 ++++++++++++++--------------- drivers/pwm/Makefile | 6 ++-- 5 files changed, 30 insertions(+), 30 deletions(-)