| Message ID | 20221117-b4-amlogic-bindings-convert-v2-0-36ad050bb625@linaro.org |
|---|---|
| Headers | show |
| Series | dt-bindings: first batch of dt-schema conversions for Amlogic Meson bindings | expand |
On 09/01/2023 13:53, Neil Armstrong wrote: > Convert the Amlogic Meson GX eFuse bindings to dt-schema. > > Take in account the used variant with amlogic,meson-gx-efuse. > > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > --- Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On 09/01/2023 13:53, Neil Armstrong wrote: > Convert the Amlogic Meson6 eFuse bindings to dt-schema. > > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > --- > .../bindings/nvmem/amlogic,meson6-efuse.yaml | 60 ++++++++++++++++++++++ > .../bindings/nvmem/amlogic-meson-mx-efuse.txt | 22 -------- > 2 files changed, 60 insertions(+), 22 deletions(-) > > diff --git a/Documentation/devicetree/bindings/nvmem/amlogic,meson6-efuse.yaml b/Documentation/devicetree/bindings/nvmem/amlogic,meson6-efuse.yaml > new file mode 100644 > index 000000000000..11cace95d18c > --- /dev/null > +++ b/Documentation/devicetree/bindings/nvmem/amlogic,meson6-efuse.yaml > @@ -0,0 +1,60 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/nvmem/amlogic,meson6-efuse.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Amlogic Meson6 eFuse > + > +maintainers: > + - Neil Armstrong <neil.armstrong@linaro.org> > + - Martin Blumenstingl <martin.blumenstingl@googlemail.com> > + > +allOf: > + - $ref: nvmem.yaml# > + > +properties: > + compatible: > + enum: > + - amlogic,meson6-efuse > + - amlogic,meson8-efuse > + - amlogic,meson8b-efuse > + > + reg: > + maxItems: 1 > + > + clocks: > + maxItems: 1 > + > + clock-names: > + const: core > + > + secure-monitor: > + description: phandle to the secure-monitor node Missing $ref > + > +required: > + - compatible > + - reg > + - clocks > + - clock-names > + Best regards, Krzysztof
On 09/01/2023 13:53, Neil Armstrong wrote: > Convert the Amlogic SD / eMMC controller for S905/GXBB family SoCs > to dt-schema. > > Take in account the used variant with amlogic,meson-gx-mmc. > > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > --- > .../bindings/mmc/amlogic,meson-gx-mmc.yaml | 75 ++++++++++++++++++++++ > .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 39 ----------- > 2 files changed, 75 insertions(+), 39 deletions(-) > > diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml > new file mode 100644 > index 000000000000..30228964fd9c > --- /dev/null > +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml > @@ -0,0 +1,75 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/mmc/amlogic,meson-gx-mmc.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Amlogic SD / eMMC controller for S905/GXBB family SoCs > + > +description: > + The MMC 5.1 compliant host controller on Amlogic provides the > + interface for SD, eMMC and SDIO devices > + > +maintainers: > + - Neil Armstrong <neil.armstrong@linaro.org> > + > +allOf: > + - $ref: mmc-controller.yaml# > + > +properties: > + compatible: > + oneOf: > + - enum: > + - amlogic,meson-gx-mmc > + - amlogic,meson-axg-mmc > + - items: > + - const: amlogic,meson-gx-mmc This does not look correct. Either gx is alone (not compatible with gxbb) or it is compatible with gxbb. Cannot be both. Best regards, Krzysztof
On 10/01/2023 11:17, Krzysztof Kozlowski wrote: > On 09/01/2023 13:53, Neil Armstrong wrote: >> Convert the Amlogic SD / eMMC controller for S905/GXBB family SoCs >> to dt-schema. >> >> Take in account the used variant with amlogic,meson-gx-mmc. >> >> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> >> --- >> .../bindings/mmc/amlogic,meson-gx-mmc.yaml | 75 ++++++++++++++++++++++ >> .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 39 ----------- >> 2 files changed, 75 insertions(+), 39 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml >> new file mode 100644 >> index 000000000000..30228964fd9c >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml >> @@ -0,0 +1,75 @@ >> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) >> +%YAML 1.2 >> +--- >> +$id: http://devicetree.org/schemas/mmc/amlogic,meson-gx-mmc.yaml# >> +$schema: http://devicetree.org/meta-schemas/core.yaml# >> + >> +title: Amlogic SD / eMMC controller for S905/GXBB family SoCs >> + >> +description: >> + The MMC 5.1 compliant host controller on Amlogic provides the >> + interface for SD, eMMC and SDIO devices >> + >> +maintainers: >> + - Neil Armstrong <neil.armstrong@linaro.org> >> + >> +allOf: >> + - $ref: mmc-controller.yaml# >> + >> +properties: >> + compatible: >> + oneOf: >> + - enum: >> + - amlogic,meson-gx-mmc >> + - amlogic,meson-axg-mmc >> + - items: >> + - const: amlogic,meson-gx-mmc > > This does not look correct. Either gx is alone (not compatible with > gxbb) or it is compatible with gxbb. Cannot be both. This ishow it's used in DT: arch/arm64/boot/dts/amlogic/meson-gx.dtsi: compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc"; arch/arm64/boot/dts/amlogic/meson-axg.dtsi: compatible = "amlogic,meson-axg-mmc"; arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi: compatible = "amlogic,meson-axg-mmc"; So I'll drop the amlogic,meson-gx-mmc in the first enum to have : +properties: + compatible: + oneOf: + - const: amlogic,meson-axg-mmc + - items: + - const: amlogic,meson-gx-mmc + - const: amlogic,meson-gxbb-mmc It's right ? Neil > > > > Best regards, > Krzysztof >
Hi, On Mon, 09 Jan 2023 13:53:25 +0100, Neil Armstrong wrote: > Batch conversion of the following bindings: > - meson_sm.txt > - amlogic-efuse.txt > - amlogic-meson-mx-efuse.txt > - meson-wdt.txt > - meson-ir.txt > - rtc-meson.txt > - amlogic,meson6-timer.txt > - meson-gxl-usb2-phy.txt > - amlogic,meson-gx.txt > - amlogic,meson-pcie.txt > - mdio-mux-meson-g12a.txt > > [...] Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.3/drivers) [01/11] dt-bindings: firmware: convert meson_sm.txt to dt-schema https://git.kernel.org/amlogic/c/658a8ef679435959f550a45f7312afaebb9e20a8 [06/11] dt-bindings: power: amlogic,meson-gx-pwrc: mark bindings as deprecated https://git.kernel.org/amlogic/c/bc5998b92b9ee8818cc0f7fe02604751389a154e These changes has been applied on the intermediate git tree [1]. The v6.3/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
On 10/01/2023 15:17, Neil Armstrong wrote: > On 10/01/2023 11:17, Krzysztof Kozlowski wrote: >> On 09/01/2023 13:53, Neil Armstrong wrote: >>> Convert the Amlogic SD / eMMC controller for S905/GXBB family SoCs >>> to dt-schema. >>> >>> Take in account the used variant with amlogic,meson-gx-mmc. >>> >>> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> >>> --- >>> .../bindings/mmc/amlogic,meson-gx-mmc.yaml | 75 ++++++++++++++++++++++ >>> .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 39 ----------- >>> 2 files changed, 75 insertions(+), 39 deletions(-) >>> >>> diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml >>> new file mode 100644 >>> index 000000000000..30228964fd9c >>> --- /dev/null >>> +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml >>> @@ -0,0 +1,75 @@ >>> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) >>> +%YAML 1.2 >>> +--- >>> +$id: http://devicetree.org/schemas/mmc/amlogic,meson-gx-mmc.yaml# >>> +$schema: http://devicetree.org/meta-schemas/core.yaml# >>> + >>> +title: Amlogic SD / eMMC controller for S905/GXBB family SoCs >>> + >>> +description: >>> + The MMC 5.1 compliant host controller on Amlogic provides the >>> + interface for SD, eMMC and SDIO devices >>> + >>> +maintainers: >>> + - Neil Armstrong <neil.armstrong@linaro.org> >>> + >>> +allOf: >>> + - $ref: mmc-controller.yaml# >>> + >>> +properties: >>> + compatible: >>> + oneOf: >>> + - enum: >>> + - amlogic,meson-gx-mmc >>> + - amlogic,meson-axg-mmc >>> + - items: >>> + - const: amlogic,meson-gx-mmc >> >> This does not look correct. Either gx is alone (not compatible with >> gxbb) or it is compatible with gxbb. Cannot be both. > > This ishow it's used in DT: > > arch/arm64/boot/dts/amlogic/meson-gx.dtsi: compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc"; > arch/arm64/boot/dts/amlogic/meson-axg.dtsi: compatible = "amlogic,meson-axg-mmc"; > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi: compatible = "amlogic,meson-axg-mmc"; > > So I'll drop the amlogic,meson-gx-mmc in the first enum to have : > +properties: > + compatible: > + oneOf: > + - const: amlogic,meson-axg-mmc > + - items: > + - const: amlogic,meson-gx-mmc > + - const: amlogic,meson-gxbb-mmc > > It's right ? Yes. Best regards, Krzysztof
Hi Neil, On Mon, Jan 9, 2023 at 1:53 PM Neil Armstrong <neil.armstrong@linaro.org> wrote: [...] > + compatible: > + oneOf: > + - enum: > + - amlogic,meson6-wdt > + - amlogic,meson8-wdt Technically this is not an identical representation of what we had before which was: - "amlogic,meson8-wdt" and "amlogic,meson6-wdt" on Meson8 SoCs We're not using the "amlogic,meson8-wdt" compatible anywhere at the moment. In the meson_wdt driver it's defined with the same per-SoC data as "amlogic,meson6-wdt". Long story short: In my opinion there's no need to change what you have right now. If you have to re-spin this then maybe you can add a note to the patch description. Please add my: Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Best regards, Martin
On Mon, Jan 9, 2023 at 1:53 PM Neil Armstrong <neil.armstrong@linaro.org> wrote: > > Convert the Amlogic Meson GX eFuse bindings to dt-schema. > > Take in account the used variant with amlogic,meson-gx-efuse. > > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> This will cause a warning in arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts though (which is an existing issue, this patch just makes it visible). I sent a fix for that: [0] Best regards, Martin [0] https://lore.kernel.org/linux-amlogic/20230110215926.1296650-1-martin.blumenstingl@googlemail.com/T/#u
Hi Neil, Hi Krzysztof, On Tue, Jan 10, 2023 at 11:15 AM Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: [...] > > + secure-monitor: > > + description: phandle to the secure-monitor node > > Missing $ref Actually this IP does not connect to a secure-monitor. So the secure-monitor property can be removed. Best regards, Martin
On Mon, 09 Jan 2023 13:53:25 +0100 Neil Armstrong wrote: > - patch 12: added reviewed-by > - Link to v1: https://lore.kernel.org/r/20221117-b4-amlogic-bindings-convert-v1-0-3f025599b968@linaro.org I'm guessing patch 12 is patch 11 in this posting. Should we take it via net-next? Looks acked & ready.
Hi, On 11/01/2023 00:23, Jakub Kicinski wrote: > On Mon, 09 Jan 2023 13:53:25 +0100 Neil Armstrong wrote: >> - patch 12: added reviewed-by >> - Link to v1: https://lore.kernel.org/r/20221117-b4-amlogic-bindings-convert-v1-0-3f025599b968@linaro.org > > I'm guessing patch 12 is patch 11 in this posting. > Should we take it via net-next? Looks acked & ready. Exact it's ready to be taken Thanks, Neil
Hello: This series was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Mon, 09 Jan 2023 13:53:25 +0100 you wrote: > Batch conversion of the following bindings: > - meson_sm.txt > - amlogic-efuse.txt > - amlogic-meson-mx-efuse.txt > - meson-wdt.txt > - meson-ir.txt > - rtc-meson.txt > - amlogic,meson6-timer.txt > - meson-gxl-usb2-phy.txt > - amlogic,meson-gx.txt > - amlogic,meson-pcie.txt > - mdio-mux-meson-g12a.txt > > [...] Here is the summary with links: - [v2,01/11] dt-bindings: firmware: convert meson_sm.txt to dt-schema (no matching commit) - [v2,02/11] dt-bindings: nvmem: convert amlogic-efuse.txt to dt-schema (no matching commit) - [v2,03/11] dt-bindings: nvmem: convert amlogic-meson-mx-efuse.txt to dt-schema (no matching commit) - [v2,04/11] dt-bindings: watchdog: convert meson-wdt.txt to dt-schema (no matching commit) - [v2,05/11] dt-bindings: media: convert meson-ir.txt to dt-schema (no matching commit) - [v2,06/11] dt-bindings: power: amlogic,meson-gx-pwrc: mark bindings as deprecated (no matching commit) - [v2,07/11] dt-bindings: timer: convert timer/amlogic,meson6-timer.txt to dt-schema (no matching commit) - [v2,08/11] dt-bindings: phy: convert meson-gxl-usb2-phy.txt to dt-schema (no matching commit) - [v2,09/11] dt-bindings: mmc: convert amlogic,meson-gx.txt to dt-schema (no matching commit) - [v2,10/11] dt-bindings: PCI: convert amlogic,meson-pcie.txt to dt-schema (no matching commit) - [v2,11/11] dt-bindings: net: convert mdio-mux-meson-g12a.txt to dt-schema https://git.kernel.org/netdev/net-next/c/82fc0f87cd2c You are awesome, thank you!
Batch conversion of the following bindings: - meson_sm.txt - amlogic-efuse.txt - amlogic-meson-mx-efuse.txt - meson-wdt.txt - meson-ir.txt - rtc-meson.txt - amlogic,meson6-timer.txt - meson-gxl-usb2-phy.txt - amlogic,meson-gx.txt - amlogic,meson-pcie.txt - mdio-mux-meson-g12a.txt The amlogic,meson-gx-pwrc.txt is removed since deprecated and unused for a few releases now. Martin Blumenstingl was also added as bindings maintainer for Meson6/8/8b related bindings. Remaining conversions: - meson,pinctrl.txt - pwm-meson.txt - amlogic,meson-gpio-intc.txt - amlogic,meson-mx-sdio.txt - rtc-meson-vrtc.txt - amlogic,axg-sound-card.txt - amlogic,axg-fifo.txt - amlogic,axg-pdm.txt - amlogic,axg-spdifout.txt - amlogic,axg-tdm-formatters.txt - amlogic,axg-spdifin.txt - amlogic,axg-tdm-iface.txt - amlogic,g12a-tohdmitx.txt - amlogic,axg-audio-clkc.txt - amlogic,gxbb-clkc.txt - amlogic,gxbb-aoclkc.txt - amlogic,meson8b-clkc.txt To: Rob Herring <robh+dt@kernel.org> To: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> To: Kevin Hilman <khilman@baylibre.com> To: Jerome Brunet <jbrunet@baylibre.com> To: Martin Blumenstingl <martin.blumenstingl@googlemail.com> To: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> To: Wim Van Sebroeck <wim@linux-watchdog.org> To: Guenter Roeck <linux@roeck-us.net> To: Mauro Carvalho Chehab <mchehab@kernel.org> To: Alessandro Zummo <a.zummo@towertech.it> To: Alexandre Belloni <alexandre.belloni@bootlin.com> To: Daniel Lezcano <daniel.lezcano@linaro.org> To: Thomas Gleixner <tglx@linutronix.de> To: Vinod Koul <vkoul@kernel.org> To: Kishon Vijay Abraham I <kishon@kernel.org> To: Ulf Hansson <ulf.hansson@linaro.org> To: Bjorn Helgaas <bhelgaas@google.com> To: "David S. Miller" <davem@davemloft.net> To: Eric Dumazet <edumazet@google.com> To: Jakub Kicinski <kuba@kernel.org> To: Paolo Abeni <pabeni@redhat.com> To: Andrew Lunn <andrew@lunn.ch> To: Heiner Kallweit <hkallweit1@gmail.com> To: Russell King <linux@armlinux.org.uk> Cc: devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-amlogic@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: linux-watchdog@vger.kernel.org Cc: linux-media@vger.kernel.org Cc: linux-rtc@vger.kernel.org Cc: linux-phy@lists.infradead.org Cc: linux-mmc@vger.kernel.org Cc: linux-pci@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> --- Changes in v2: - rebased on v6.2-rc1 - patch 1: fixed power-controller, added const: amlogic,meson-gx-sm - patch 2: added const: amlogic,meson-gx-efuse, fixed secure-monitor type - patch 3: updated example subnodes to match reality - patch 4: added reviewed-by, added interrupts, added const: amlogic,meson8m2-wdt - patch 5: added reviewed-by, added const: amlogic,meson-gx-ir - patch 6: dropped applied - patch 7: dropped patch, replaced with deprecated in the title of the TXt bindings - patch 8: fixed title, added reviewed-by, added interrupt description - patch 9: fixed example indent, added reviewed-by - patch 10: fixed const: amlogic,meson-gx-mmc case, fixed indentation - patch 11: added reviewed-by, fixed title, fixed bindings after rebase, added clocks/clock-names as required - patch 12: added reviewed-by - Link to v1: https://lore.kernel.org/r/20221117-b4-amlogic-bindings-convert-v1-0-3f025599b968@linaro.org --- Neil Armstrong (11): dt-bindings: firmware: convert meson_sm.txt to dt-schema dt-bindings: nvmem: convert amlogic-efuse.txt to dt-schema dt-bindings: nvmem: convert amlogic-meson-mx-efuse.txt to dt-schema dt-bindings: watchdog: convert meson-wdt.txt to dt-schema dt-bindings: media: convert meson-ir.txt to dt-schema dt-bindings: power: amlogic,meson-gx-pwrc: mark bindings as deprecated dt-bindings: timer: convert timer/amlogic,meson6-timer.txt to dt-schema dt-bindings: phy: convert meson-gxl-usb2-phy.txt to dt-schema dt-bindings: mmc: convert amlogic,meson-gx.txt to dt-schema dt-bindings: PCI: convert amlogic,meson-pcie.txt to dt-schema dt-bindings: net: convert mdio-mux-meson-g12a.txt to dt-schema .../bindings/firmware/amlogic,meson-gxbb-sm.yaml | 39 ++++++ .../bindings/firmware/meson/meson_sm.txt | 15 --- .../bindings/media/amlogic,meson6-ir.yaml | 47 ++++++++ .../devicetree/bindings/media/meson-ir.txt | 20 --- .../bindings/mmc/amlogic,meson-gx-mmc.yaml | 75 ++++++++++++ .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 39 ------ .../bindings/net/amlogic,g12a-mdio-mux.yaml | 80 ++++++++++++ .../bindings/net/mdio-mux-meson-g12a.txt | 48 -------- .../bindings/nvmem/amlogic,meson-gxbb-efuse.yaml | 57 +++++++++ .../bindings/nvmem/amlogic,meson6-efuse.yaml | 60 +++++++++ .../devicetree/bindings/nvmem/amlogic-efuse.txt | 48 -------- .../bindings/nvmem/amlogic-meson-mx-efuse.txt | 22 ---- .../devicetree/bindings/pci/amlogic,axg-pcie.yaml | 134 +++++++++++++++++++++ .../devicetree/bindings/pci/amlogic,meson-pcie.txt | 70 ----------- .../bindings/phy/amlogic,meson-gxl-usb2-phy.yaml | 56 +++++++++ .../devicetree/bindings/phy/meson-gxl-usb2-phy.txt | 21 ---- .../bindings/power/amlogic,meson-gx-pwrc.txt | 4 +- .../bindings/timer/amlogic,meson6-timer.txt | 22 ---- .../bindings/timer/amlogic,meson6-timer.yaml | 54 +++++++++ .../bindings/watchdog/amlogic,meson6-wdt.yaml | 50 ++++++++ .../devicetree/bindings/watchdog/meson-wdt.txt | 21 ---- 21 files changed, 654 insertions(+), 328 deletions(-) --- base-commit: 1b929c02afd37871d5afb9d498426f83432e71c2 change-id: 20221117-b4-amlogic-bindings-convert-8ef1d75d426d Best regards,