| Message ID | cb62dfc0-cb3d-beba-6d0b-8db18583dda0@gmail.com |
|---|---|
| Headers | show |
| Series | soc: amlogic: switch bindings to yaml and adjust some dtbs's | expand |
Hi Heiner, Le 23/01/2023 à 22:22, Heiner Kallweit a écrit : > At first adjust some existing dtbs's so that they pass dtbs_check > after switching bindings to yaml. Thanks for this patchset, but please drop patches 1, 3 & 4, and take in account the existing compatible usage in your new bindings like I did in my conversion patchset. While we did remove some bad compatibles we introduced a few years ago, now the GXBB, GXL & GXM are now stable a aew LTS releases now and a few other projects uses them as-is (U-Boot, BSDs, ...) so changing the compatibles isn't an option anymore... and we can't know which one they use and how the implementation behaves we must document the existing usage without breaking any potential users (including linux). Thanks, Neil > > Then switch further Amlogic Meson bindings to yaml. > Tested with make targets dt_binding_check and dtbs_check. > > Heiner Kallweit (8): > arm64: dts: meson-gx: Remove invalid pwm compatible > arm64: dts: amlogic: Fix non-compliant SD/SDIO node names > arm64: dts: meson-gx: Set only one compatible string for mmc > arm64: dts: amlogic: Remove invalid compatible string > amlogic,meson-gpio-intc > dt-bindings: rtc: Add Amlogic Meson vrtc controller binding > dt-bindings: pwm: Add Amlogic Meson PWM binding > dt-bindings: interrupt-controller: Add Amlogic Meson GPIO interrupt > controller binding > dt-bindings: pinctrl: Add Amlogic Meson pinctrl binding > > .../amlogic,meson-gpio-intc.txt | 38 ------ > .../amlogic,meson-gpio-intc.yaml | 72 +++++++++++ > .../pinctrl/amlogic,meson-pinctrl.yaml | 121 ++++++++++++++++++ > .../bindings/pinctrl/meson,pinctrl.txt | 94 -------------- > .../devicetree/bindings/pwm/pwm-amlogic.yaml | 61 +++++++++ > .../devicetree/bindings/pwm/pwm-meson.txt | 29 ----- > .../bindings/rtc/amlogic,meson-vrtc.yaml | 50 ++++++++ > .../bindings/rtc/rtc-meson-vrtc.txt | 22 ---- > arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 5 +- > .../boot/dts/amlogic/meson-g12-common.dtsi | 7 +- > arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 15 +-- > arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 3 +- > arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 3 +- > arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 3 +- > arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 3 +- > 15 files changed, 320 insertions(+), 206 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt > create mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml > create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml > delete mode 100644 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt > create mode 100644 Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml > delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt > create mode 100644 Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml > delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-meson-vrtc.txt >
Hi, On Mon, 23 Jan 2023 22:22:15 +0100, Heiner Kallweit wrote: > At first adjust some existing dtbs's so that they pass dtbs_check > after switching bindings to yaml. > > Then switch further Amlogic Meson bindings to yaml. > Tested with make targets dt_binding_check and dtbs_check. > > Heiner Kallweit (8): > arm64: dts: meson-gx: Remove invalid pwm compatible > arm64: dts: amlogic: Fix non-compliant SD/SDIO node names > arm64: dts: meson-gx: Set only one compatible string for mmc > arm64: dts: amlogic: Remove invalid compatible string > amlogic,meson-gpio-intc > dt-bindings: rtc: Add Amlogic Meson vrtc controller binding > dt-bindings: pwm: Add Amlogic Meson PWM binding > dt-bindings: interrupt-controller: Add Amlogic Meson GPIO interrupt > controller binding > dt-bindings: pinctrl: Add Amlogic Meson pinctrl binding > > [...] Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.3/arm64-dt) [2/8] arm64: dts: amlogic: Fix non-compliant SD/SDIO node names https://git.kernel.org/amlogic/c/1be13a5091bf71627aa1a3d35360b039510f42f3 These changes has been applied on the intermediate git tree [1]. The v6.3/arm64-dt branch will then be sent via a formal Pull Request to the Linux SoC maintainers for inclusion in their intermediate git branches in order to be sent to Linus during the next merge window, or sooner if it's a set of fixes. In the cases of fixes, those will be merged in the current release candidate kernel and as soon they appear on the Linux master branch they will be backported to the previous Stable and Long-Stable kernels [2]. The intermediate git branches are merged daily in the linux-next tree [3], people are encouraged testing these pre-release kernels and report issues on the relevant mailing-lists. If problems are discovered on those changes, please submit a signed-off-by revert patch followed by a corrective changeset. [1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git [3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
On 24.01.2023 08:16, Neil Armstrong wrote: > Hi Heiner, > > Le 23/01/2023 à 22:22, Heiner Kallweit a écrit : >> At first adjust some existing dtbs's so that they pass dtbs_check >> after switching bindings to yaml. > > Thanks for this patchset, but please drop patches 1, 3 & 4, and take > in account the existing compatible usage in your new bindings like > I did in my conversion patchset. > > While we did remove some bad compatibles we introduced a few years ago, > now the GXBB, GXL & GXM are now stable a aew LTS releases now and > a few other projects uses them as-is (U-Boot, BSDs, ...) so changing > the compatibles isn't an option anymore... and we can't know which > one they use and how the implementation behaves we must document > the existing usage without breaking any potential users (including linux). > I wasn't aware of this. Thanks for the hint. So I'll rework the schemas to cover current usage of compatible strings. > Thanks, > Neil > Heiner > > >> >> Then switch further Amlogic Meson bindings to yaml. >> Tested with make targets dt_binding_check and dtbs_check. >> >> Heiner Kallweit (8): >> arm64: dts: meson-gx: Remove invalid pwm compatible >> arm64: dts: amlogic: Fix non-compliant SD/SDIO node names >> arm64: dts: meson-gx: Set only one compatible string for mmc >> arm64: dts: amlogic: Remove invalid compatible string >> amlogic,meson-gpio-intc >> dt-bindings: rtc: Add Amlogic Meson vrtc controller binding >> dt-bindings: pwm: Add Amlogic Meson PWM binding >> dt-bindings: interrupt-controller: Add Amlogic Meson GPIO interrupt >> controller binding >> dt-bindings: pinctrl: Add Amlogic Meson pinctrl binding >> >> .../amlogic,meson-gpio-intc.txt | 38 ------ >> .../amlogic,meson-gpio-intc.yaml | 72 +++++++++++ >> .../pinctrl/amlogic,meson-pinctrl.yaml | 121 ++++++++++++++++++ >> .../bindings/pinctrl/meson,pinctrl.txt | 94 -------------- >> .../devicetree/bindings/pwm/pwm-amlogic.yaml | 61 +++++++++ >> .../devicetree/bindings/pwm/pwm-meson.txt | 29 ----- >> .../bindings/rtc/amlogic,meson-vrtc.yaml | 50 ++++++++ >> .../bindings/rtc/rtc-meson-vrtc.txt | 22 ---- >> arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 5 +- >> .../boot/dts/amlogic/meson-g12-common.dtsi | 7 +- >> arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 15 +-- >> arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 3 +- >> arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 3 +- >> arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 3 +- >> arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 3 +- >> 15 files changed, 320 insertions(+), 206 deletions(-) >> delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt >> create mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml >> create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml >> delete mode 100644 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt >> create mode 100644 Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml >> delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt >> create mode 100644 Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml >> delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-meson-vrtc.txt >> > >
Hello, On Tue, Jan 24, 2023 at 08:16:45AM +0100, Neil Armstrong wrote: > Le 23/01/2023 à 22:22, Heiner Kallweit a écrit : > > At first adjust some existing dtbs's so that they pass dtbs_check > > after switching bindings to yaml. > > Thanks for this patchset, but please drop patches 1, 3 & 4, and take > in account the existing compatible usage in your new bindings like > I did in my conversion patchset. > > While we did remove some bad compatibles we introduced a few years ago, > now the GXBB, GXL & GXM are now stable a aew LTS releases now and > a few other projects uses them as-is (U-Boot, BSDs, ...) so changing > the compatibles isn't an option anymore... and we can't know which > one they use and how the implementation behaves we must document > the existing usage without breaking any potential users (including linux). I only looked into patch #1, and I support dropping it for stronger reasons than not breaking things which maybe started to rely on the existing contents. In patch #1 you write: | amlogic,meson-gx-pwm isn't a valid compatible string, so remove it. | See drivers/pwm/pwm-meson.c. | | Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> | --- | arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 8 ++++---- | 1 file changed, 4 insertions(+), 4 deletions(-) | | diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi | index a79a35e84..75d35dcfe 100644 | --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi | +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi | @@ -328,14 +328,14 @@ i2c_A: i2c@8500 { | }; | | pwm_ab: pwm@8550 { | - compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm"; | + compatible = "amlogic,meson-gxbb-pwm"; There are two issues: a) drivers/pwm/pwm-meson.c isn't the reference. The driver doesn't justify which compatibles should be used. You should refer to the binding document instead. b) Having the SoC name as an additional compatible (i.e. the status quo before your patch) is an advantage. While it doesn't hurt (apart from making the dtb a tad bigger) it makes it possible to adapt the driver if in the future someone discovers that the PWM component on GX is a tad different from the GXBB one. In that case you can add a check in the driver à la if (of_device_is_compatible(np, amlogic,meson-gx-pwm)) do_the_special_gx_handling() without having to adapt the device trees then (or use some ugly code that somehow detects if it's running on GX). So the driver not handling amlogic,meson-gx-pwm today is fine. I expect the fix to be: Include that compatible in the binding. Best regards Uwe
Hi, On Mon, 23 Jan 2023 22:22:15 +0100, Heiner Kallweit wrote: > At first adjust some existing dtbs's so that they pass dtbs_check > after switching bindings to yaml. > > Then switch further Amlogic Meson bindings to yaml. > Tested with make targets dt_binding_check and dtbs_check. > > Heiner Kallweit (8): > arm64: dts: meson-gx: Remove invalid pwm compatible > arm64: dts: amlogic: Fix non-compliant SD/SDIO node names > arm64: dts: meson-gx: Set only one compatible string for mmc > arm64: dts: amlogic: Remove invalid compatible string > amlogic,meson-gpio-intc > dt-bindings: rtc: Add Amlogic Meson vrtc controller binding > dt-bindings: pwm: Add Amlogic Meson PWM binding > dt-bindings: interrupt-controller: Add Amlogic Meson GPIO interrupt > controller binding > dt-bindings: pinctrl: Add Amlogic Meson pinctrl binding > > [...] Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.5/drivers) [1/1] dt-bindings: interrupt-controller: Convert Amlogic Meson GPIO interrupt controller binding https://git.kernel.org/amlogic/c/6b0139b372d40bd5dafc140b6618b57d13211168 These changes has been applied on the intermediate git tree [1]. The v6.5/drivers branch will then be sent via a formal Pull Request to the Linux SoC maintainers for inclusion in their intermediate git branches in order to be sent to Linus during the next merge window, or sooner if it's a set of fixes. In the cases of fixes, those will be merged in the current release candidate kernel and as soon they appear on the Linux master branch they will be backported to the previous Stable and Long-Stable kernels [2]. The intermediate git branches are merged daily in the linux-next tree [3], people are encouraged testing these pre-release kernels and report issues on the relevant mailing-lists. If problems are discovered on those changes, please submit a signed-off-by revert patch followed by a corrective changeset. [1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git [3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
At first adjust some existing dtbs's so that they pass dtbs_check after switching bindings to yaml. Then switch further Amlogic Meson bindings to yaml. Tested with make targets dt_binding_check and dtbs_check. Heiner Kallweit (8): arm64: dts: meson-gx: Remove invalid pwm compatible arm64: dts: amlogic: Fix non-compliant SD/SDIO node names arm64: dts: meson-gx: Set only one compatible string for mmc arm64: dts: amlogic: Remove invalid compatible string amlogic,meson-gpio-intc dt-bindings: rtc: Add Amlogic Meson vrtc controller binding dt-bindings: pwm: Add Amlogic Meson PWM binding dt-bindings: interrupt-controller: Add Amlogic Meson GPIO interrupt controller binding dt-bindings: pinctrl: Add Amlogic Meson pinctrl binding .../amlogic,meson-gpio-intc.txt | 38 ------ .../amlogic,meson-gpio-intc.yaml | 72 +++++++++++ .../pinctrl/amlogic,meson-pinctrl.yaml | 121 ++++++++++++++++++ .../bindings/pinctrl/meson,pinctrl.txt | 94 -------------- .../devicetree/bindings/pwm/pwm-amlogic.yaml | 61 +++++++++ .../devicetree/bindings/pwm/pwm-meson.txt | 29 ----- .../bindings/rtc/amlogic,meson-vrtc.yaml | 50 ++++++++ .../bindings/rtc/rtc-meson-vrtc.txt | 22 ---- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 5 +- .../boot/dts/amlogic/meson-g12-common.dtsi | 7 +- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 15 +-- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 3 +- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 3 +- arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 3 +- arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 3 +- 15 files changed, 320 insertions(+), 206 deletions(-) delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.txt create mode 100644 Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml create mode 100644 Documentation/devicetree/bindings/pinctrl/amlogic,meson-pinctrl.yaml delete mode 100644 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt create mode 100644 Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-meson.txt create mode 100644 Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-meson-vrtc.txt