| Message ID | 20221117-b4-amlogic-bindings-convert-v4-1-34e623dbf789@linaro.org |
|---|---|
| State | Accepted |
| Commit | ce030eb191b7bf4af32fd76f7456d2291e292e2e |
| Headers | show |
| Series | dt-bindings: first batch of dt-schema conversions for Amlogic Meson bindings | expand |
Neil, On 08/03/2023 13:27, Neil Armstrong wrote: > Convert the Amlogic Meson GX eFuse bindings to dt-schema. > > Take in account the used variant with amlogic,meson-gx-efuse. > > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > --- Applied 1/5 and 2/5 --srini > .../bindings/nvmem/amlogic,meson-gxbb-efuse.yaml | 57 ++++++++++++++++++++++ > .../devicetree/bindings/nvmem/amlogic-efuse.txt | 48 ------------------ > 2 files changed, 57 insertions(+), 48 deletions(-) > > diff --git a/Documentation/devicetree/bindings/nvmem/amlogic,meson-gxbb-efuse.yaml b/Documentation/devicetree/bindings/nvmem/amlogic,meson-gxbb-efuse.yaml > new file mode 100644 > index 000000000000..e49c2754ff55 > --- /dev/null > +++ b/Documentation/devicetree/bindings/nvmem/amlogic,meson-gxbb-efuse.yaml > @@ -0,0 +1,57 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/nvmem/amlogic,meson-gxbb-efuse.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Amlogic Meson GX eFuse > + > +maintainers: > + - Neil Armstrong <neil.armstrong@linaro.org> > + > +allOf: > + - $ref: nvmem.yaml# > + > +properties: > + compatible: > + oneOf: > + - const: amlogic,meson-gxbb-efuse > + - items: > + - const: amlogic,meson-gx-efuse > + - const: amlogic,meson-gxbb-efuse > + > + clocks: > + maxItems: 1 > + > + secure-monitor: > + description: phandle to the secure-monitor node > + $ref: /schemas/types.yaml#/definitions/phandle > + > +required: > + - compatible > + - clocks > + - secure-monitor > + > +unevaluatedProperties: false > + > +examples: > + - | > + efuse: efuse { > + compatible = "amlogic,meson-gxbb-efuse"; > + clocks = <&clk_efuse>; > + #address-cells = <1>; > + #size-cells = <1>; > + secure-monitor = <&sm>; > + > + sn: sn@14 { > + reg = <0x14 0x10>; > + }; > + > + eth_mac: mac@34 { > + reg = <0x34 0x10>; > + }; > + > + bid: bid@46 { > + reg = <0x46 0x30>; > + }; > + }; > diff --git a/Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt b/Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt > deleted file mode 100644 > index f7b3ed74db54..000000000000 > --- a/Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt > +++ /dev/null > @@ -1,48 +0,0 @@ > -= Amlogic Meson GX eFuse device tree bindings = > - > -Required properties: > -- compatible: should be "amlogic,meson-gxbb-efuse" > -- clocks: phandle to the efuse peripheral clock provided by the > - clock controller. > -- secure-monitor: phandle to the secure-monitor node > - > -= Data cells = > -Are child nodes of eFuse, bindings of which as described in > -bindings/nvmem/nvmem.txt > - > -Example: > - > - efuse: efuse { > - compatible = "amlogic,meson-gxbb-efuse"; > - clocks = <&clkc CLKID_EFUSE>; > - #address-cells = <1>; > - #size-cells = <1>; > - secure-monitor = <&sm>; > - > - sn: sn@14 { > - reg = <0x14 0x10>; > - }; > - > - eth_mac: eth_mac@34 { > - reg = <0x34 0x10>; > - }; > - > - bid: bid@46 { > - reg = <0x46 0x30>; > - }; > - }; > - > - sm: secure-monitor { > - compatible = "amlogic,meson-gxbb-sm"; > - }; > - > -= Data consumers = > -Are device nodes which consume nvmem data cells. > - > -For example: > - > - eth_mac { > - ... > - nvmem-cells = <ð_mac>; > - nvmem-cell-names = "eth_mac"; > - }; >
diff --git a/Documentation/devicetree/bindings/nvmem/amlogic,meson-gxbb-efuse.yaml b/Documentation/devicetree/bindings/nvmem/amlogic,meson-gxbb-efuse.yaml new file mode 100644 index 000000000000..e49c2754ff55 --- /dev/null +++ b/Documentation/devicetree/bindings/nvmem/amlogic,meson-gxbb-efuse.yaml @@ -0,0 +1,57 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/nvmem/amlogic,meson-gxbb-efuse.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Amlogic Meson GX eFuse + +maintainers: + - Neil Armstrong <neil.armstrong@linaro.org> + +allOf: + - $ref: nvmem.yaml# + +properties: + compatible: + oneOf: + - const: amlogic,meson-gxbb-efuse + - items: + - const: amlogic,meson-gx-efuse + - const: amlogic,meson-gxbb-efuse + + clocks: + maxItems: 1 + + secure-monitor: + description: phandle to the secure-monitor node + $ref: /schemas/types.yaml#/definitions/phandle + +required: + - compatible + - clocks + - secure-monitor + +unevaluatedProperties: false + +examples: + - | + efuse: efuse { + compatible = "amlogic,meson-gxbb-efuse"; + clocks = <&clk_efuse>; + #address-cells = <1>; + #size-cells = <1>; + secure-monitor = <&sm>; + + sn: sn@14 { + reg = <0x14 0x10>; + }; + + eth_mac: mac@34 { + reg = <0x34 0x10>; + }; + + bid: bid@46 { + reg = <0x46 0x30>; + }; + }; diff --git a/Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt b/Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt deleted file mode 100644 index f7b3ed74db54..000000000000 --- a/Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt +++ /dev/null @@ -1,48 +0,0 @@ -= Amlogic Meson GX eFuse device tree bindings = - -Required properties: -- compatible: should be "amlogic,meson-gxbb-efuse" -- clocks: phandle to the efuse peripheral clock provided by the - clock controller. -- secure-monitor: phandle to the secure-monitor node - -= Data cells = -Are child nodes of eFuse, bindings of which as described in -bindings/nvmem/nvmem.txt - -Example: - - efuse: efuse { - compatible = "amlogic,meson-gxbb-efuse"; - clocks = <&clkc CLKID_EFUSE>; - #address-cells = <1>; - #size-cells = <1>; - secure-monitor = <&sm>; - - sn: sn@14 { - reg = <0x14 0x10>; - }; - - eth_mac: eth_mac@34 { - reg = <0x34 0x10>; - }; - - bid: bid@46 { - reg = <0x46 0x30>; - }; - }; - - sm: secure-monitor { - compatible = "amlogic,meson-gxbb-sm"; - }; - -= Data consumers = -Are device nodes which consume nvmem data cells. - -For example: - - eth_mac { - ... - nvmem-cells = <ð_mac>; - nvmem-cell-names = "eth_mac"; - };