Convert the Amlogic Meson6 SoCs Timer Controller bindings to dt-schema. Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> Reviewed-by: Martin Blumenstingl <martin.blumenstingl@xxxxxxxxxxxxxx> Signed-off-by: Neil Armstrong <neil.armstrong@xxxxxxxxxx> --- Batch conversion of the following bindings: - amlogic-efuse.txt - amlogic-meson-mx-efuse.txt - meson-wdt.txt - meson-ir.txt - rtc-meson.txt - amlogic,meson6-timer.txt - amlogic,meson-pcie.txt 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 --- Changes in v5: - Removed applied patches - Link to v4: https://lore.kernel.org/r/20221117-b4-amlogic-bindings-convert-v4-0-34e623dbf789@xxxxxxxxxx Changes in v4: - Rebased on v6.3-rc1 - Added Reviewed-by - Removed applied patch - Link to v3: https://lore.kernel.org/r/20221117-b4-amlogic-bindings-convert-v3-0-e28dd31e3bed@xxxxxxxxxx Changes in v3: - Dropped applied patches - Added acked/reviewed-by tags - patch 3: removed invalid secure-monitor property - patch 4: added a note on the commit message about the meson8 compatible - patch 9: fixed mmc compatible bindings - patch 1-: unified PCIe instead on PCIE + PCIe - Link to v2: https://lore.kernel.org/r/20221117-b4-amlogic-bindings-convert-v2-0-36ad050bb625@xxxxxxxxxx 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@xxxxxxxxxx --- .../bindings/timer/amlogic,meson6-timer.txt | 22 --------- .../bindings/timer/amlogic,meson6-timer.yaml | 54 ++++++++++++++++++++++ 2 files changed, 54 insertions(+), 22 deletions(-) diff --git a/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt b/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt deleted file mode 100644 index a9da22bda912..000000000000 --- a/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt +++ /dev/null @@ -1,22 +0,0 @@ -Amlogic Meson6 SoCs Timer Controller - -Required properties: - -- compatible : should be "amlogic,meson6-timer" -- reg : Specifies base physical address and size of the registers. -- interrupts : The four interrupts, one for each timer event -- clocks : phandles to the pclk (system clock) and XTAL clocks -- clock-names : must contain "pclk" and "xtal" - -Example: - -timer@c1109940 { - compatible = "amlogic,meson6-timer"; - reg = <0xc1109940 0x14>; - interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE_RISING>, - <GIC_SPI 11 IRQ_TYPE_EDGE_RISING>, - <GIC_SPI 6 IRQ_TYPE_EDGE_RISING>, - <GIC_SPI 29 IRQ_TYPE_EDGE_RISING>; - clocks = <&xtal>, <&clk81>; - clock-names = "xtal", "pclk"; -}; diff --git a/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.yaml b/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.yaml new file mode 100644 index 000000000000..8381a5404ef7 --- /dev/null +++ b/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.yaml @@ -0,0 +1,54 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/timer/amlogic,meson6-timer.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Amlogic Meson6 SoCs Timer Controller + +maintainers: + - Neil Armstrong <neil.armstrong@xxxxxxxxxx> + - Martin Blumenstingl <martin.blumenstingl@xxxxxxxxxxxxxx> + +properties: + compatible: + const: amlogic,meson6-timer + + reg: + maxItems: 1 + + interrupts: + maxItems: 4 + description: per-timer event interrupts + + clocks: + maxItems: 2 + + clock-names: + items: + - const: xtal + - const: pclk + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + timer@c1109940 { + compatible = "amlogic,meson6-timer"; + reg = <0xc1109940 0x14>; + interrupts = <GIC_SPI 10 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 11 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 6 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 29 IRQ_TYPE_EDGE_RISING>; + clocks = <&xtal>, <&clk81>; + clock-names = "xtal", "pclk"; + }; --- base-commit: 4b0f4525dc4fe8af17b3daefe585f0c2eb0fe0a5 change-id: 20221117-b4-amlogic-bindings-convert-8ef1d75d426d Best regards, -- Neil Armstrong <neil.armstrong@xxxxxxxxxx>