.../bindings/clock/amlogic,meson8-clkc.yaml | 45 +++++++++++++++++++ .../bindings/clock/amlogic,meson8b-clkc.txt | 51 ---------------------- 2 files changed, 45 insertions(+), 51 deletions(-)
Convert the Amlogic Meson8, Meson8b and Meson8m2 Clock and
Reset Controller to dt-schema.
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
.../bindings/clock/amlogic,meson8-clkc.yaml | 45 +++++++++++++++++++
.../bindings/clock/amlogic,meson8b-clkc.txt | 51 ----------------------
2 files changed, 45 insertions(+), 51 deletions(-)
diff --git a/Documentation/devicetree/bindings/clock/amlogic,meson8-clkc.yaml b/Documentation/devicetree/bindings/clock/amlogic,meson8-clkc.yaml
new file mode 100644
index 000000000000..ab73d4654171
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/amlogic,meson8-clkc.yaml
@@ -0,0 +1,45 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/amlogic,meson8-clkc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Amlogic Meson8, Meson8b and Meson8m2 Clock and Reset Controller
+
+maintainers:
+ - Neil Armstrong <neil.armstrong@linaro.org>
+
+properties:
+ compatible:
+ oneOf:
+ - enum:
+ - amlogic,meson8-clkc
+ - amlogic,meson8b-clkc
+ - items:
+ - const: amlogic,meson8m2-clkc
+ - const: amlogic,meson8-clkc
+
+ clocks:
+ minItems: 2
+ maxItems: 3
+
+ clock-names:
+ minItems: 2
+ items:
+ - const: xtal
+ - const: ddr_pll
+ - const: clk_32k
+
+ '#clock-cells':
+ const: 1
+
+ '#reset-cells':
+ const: 1
+
+required:
+ - compatible
+ - clocks
+ - clock-names
+ - '#reset-cells'
+
+additionalProperties: false
diff --git a/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt b/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt
deleted file mode 100644
index cc51e4746b3b..000000000000
--- a/Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-* Amlogic Meson8, Meson8b and Meson8m2 Clock and Reset Unit
-
-The Amlogic Meson8 / Meson8b / Meson8m2 clock controller generates and
-supplies clock to various controllers within the SoC.
-
-Required Properties:
-
-- compatible: must be one of:
- - "amlogic,meson8-clkc" for Meson8 (S802) SoCs
- - "amlogic,meson8b-clkc" for Meson8 (S805) SoCs
- - "amlogic,meson8m2-clkc" for Meson8m2 (S812) SoCs
-- #clock-cells: should be 1.
-- #reset-cells: should be 1.
-- clocks: list of clock phandles, one for each entry in clock-names
-- clock-names: should contain the following:
- * "xtal": the 24MHz system oscillator
- * "ddr_pll": the DDR PLL clock
- * "clk_32k": (if present) the 32kHz clock signal from GPIOAO_6 (CLK_32K_IN)
-
-Parent node should have the following properties :
-- compatible: "amlogic,meson-hhi-sysctrl", "simple-mfd", "syscon"
-- reg: base address and size of the HHI system control register space.
-
-Each clock is assigned an identifier and client nodes can use this identifier
-to specify the clock which they consume. All available clocks are defined as
-preprocessor macros in the dt-bindings/clock/meson8b-clkc.h header and can be
-used in device tree sources.
-
-Similarly a preprocessor macro for each reset line is defined in
-dt-bindings/reset/amlogic,meson8b-clkc-reset.h (which can be used from the
-device tree sources).
-
-
-Example: Clock controller node:
-
- clkc: clock-controller {
- compatible = "amlogic,meson8b-clkc";
- #clock-cells = <1>;
- #reset-cells = <1>;
- };
-
-
-Example: UART controller node that consumes the clock generated by the clock
- controller:
-
- uart_AO: serial@c81004c0 {
- compatible = "amlogic,meson-uart";
- reg = <0xc81004c0 0x14>;
- interrupts = <0 90 1>;
- clocks = <&clkc CLKID_CLK81>;
- };
---
base-commit: 47ac09b91befbb6a235ab620c32af719f8208399
change-id: 20240911-topic-amlogic-arm32-upstream-bindings-fixes-convert-meson8-clkc-7dec15a0a5f0
Best regards,
--
Neil Armstrong <neil.armstrong@linaro.org>Applied to clk-meson (clk-meson-next), thanks!
[1/1] dt-bindings: clock: convert amlogic,meson8b-clkc.txt to dtschema
https://github.com/BayLibre/clk-meson/commit/6bac1ffa9ca4
Best regards,
--
Jerome
On Wed, 11 Sep 2024 17:09:06 +0200, Neil Armstrong wrote: > Convert the Amlogic Meson8, Meson8b and Meson8m2 Clock and > Reset Controller to dt-schema. > > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > --- > .../bindings/clock/amlogic,meson8-clkc.yaml | 45 +++++++++++++++++++ > .../bindings/clock/amlogic,meson8b-clkc.txt | 51 ---------------------- > 2 files changed, 45 insertions(+), 51 deletions(-) > Reviewed-by: Rob Herring (Arm) <robh@kernel.org>
Hi Neil, On Wed, Sep 11, 2024 at 5:09 PM Neil Armstrong <neil.armstrong@linaro.org> wrote: > > Convert the Amlogic Meson8, Meson8b and Meson8m2 Clock and > Reset Controller to dt-schema. > > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Thank you for working on this! First of all this patch is: Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Do you want me to send a patch to document the "amlogic,meson-hhi-sysctrl" compatible string next? We either have to update Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-hhi-sysctrl.yaml or create a similar binding file for the older SoCs. Also I think when documenting that compatible string we'll have to add per-SoC compatibles as I think this generic one is not enough. Best regards, Martin
Hi, On 15/09/2024 21:25, Martin Blumenstingl wrote: > Hi Neil, > > On Wed, Sep 11, 2024 at 5:09 PM Neil Armstrong > <neil.armstrong@linaro.org> wrote: >> >> Convert the Amlogic Meson8, Meson8b and Meson8m2 Clock and >> Reset Controller to dt-schema. >> >> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > Thank you for working on this! First of all this patch is: > Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > > Do you want me to send a patch to document the > "amlogic,meson-hhi-sysctrl" compatible string next? > We either have to update > Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-hhi-sysctrl.yaml > or create a similar binding file for the older SoCs. > Also I think when documenting that compatible string we'll have to add > per-SoC compatibles as I think this generic one is not enough. I have it ready already, waiting for this one to go upstream first! https://git.codelinaro.org/neil.armstrong/linux/-/commit/1be8f8c67e5b83fa4069ccbcfa80d0614f668a65 Neil > > Best regards, > Martin
© 2016 - 2024 Red Hat, Inc.