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@xxxxxxxxxxx>
> ---
> 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
Attachment:
signature.asc
Description: PGP signature
