Skip to contentSkip to conversation

dt-bindings: hisilicon: Merge hi3620-clock into hisilicon,sysctrl binding

PATCH Applied Rob Herring 3 participants 3 messages Nov 22, 2023 – Dec 8, 2023

Subsystems (2)
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 dt-bindings: hisilicon: Merge hi3620-clock into hisilicon,sysctrl binding

The hi3620-clock binding is simple and always a child of the "hisilicon,sysctrl" node, so just add it into the hisilicon,sysctrl binding and drop the old txt binding.

---
 .../arm/hisilicon/controller/sysctrl.yaml     | 17 ++++++++++++++++
 .../bindings/clock/hi3620-clock.txt           | 20 -------------------
 2 files changed, 17 insertions(+), 20 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/hi3620-clock.txt
Documentation/devicetree/bindings/arm/hisilicon/controller/sysctrl.yaml +17 -0
index 5a53d433b6f0..7a221e1c09df 100644
@@ -82,6 +82,23 @@ properties:
 
   ranges: true
 
+patternProperties:
+  '^clock@':
+    type: object
+    additionalProperties: false
+
+    properties:
+      compatible:
+        enum:
+          - hisilicon,hi3620-clock
+          - hisilicon,hi3620-mmc-clock
+
+      reg:
+        maxItems: 1
+
+      '#clock-cells':
+        const: 1
+
 required:
   - compatible
   - reg
Documentation/devicetree/bindings/clock/hi3620-clock.txt deleted +0 -20
deleted file mode 100644
index dad6269f52c5..000000000000
@@ -1,20 +0,0 @@
-* Hisilicon Hi3620 Clock Controller
-
-The Hi3620 clock controller generates and supplies clock to various
-controllers within the Hi3620 SoC.
-
-Required Properties:
-
-- compatible: should be one of the following.
-  - "hisilicon,hi3620-clock" - controller compatible with Hi3620 SoC.
-  - "hisilicon,hi3620-mmc-clock" - controller specific for Hi3620 mmc.
-
-- reg: physical base address of the controller and length of memory mapped
-  region.
-
-- #clock-cells: should be 1.
-
-Each clock is assigned an identifier and client nodes use this identifier
-to specify the clock which they consume.
-
-All these identifier could be found in <dt-bindings/clock/hi3620-clock.h>.
Signature · 1 line
2.42.0
Applied
#2 lore raw
In reply to Rob Herring

Hi Rob,

Quoted 6 lines · Rob Herring

The hi3620-clock binding is simple and always a child of the "hisilicon,sysctrl" node, so just add it into the hisilicon,sysctrl binding and drop the old txt binding.

---

Applied to the HiSilicon arm64 dt tree.
Thanks!

Best Regards,
Wei

Quoted 60 lines
 .../arm/hisilicon/controller/sysctrl.yaml     | 17 ++++++++++++++++
 .../bindings/clock/hi3620-clock.txt           | 20 -------------------
 2 files changed, 17 insertions(+), 20 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/hi3620-clock.txt
Documentation/devicetree/bindings/arm/hisilicon/controller/sysctrl.yaml +17 -0
index 5a53d433b6f0..7a221e1c09df 100644
@@ -82,6 +82,23 @@ properties:
 
   ranges: true
 
+patternProperties:
+  '^clock@':
+    type: object
+    additionalProperties: false
+
+    properties:
+      compatible:
+        enum:
+          - hisilicon,hi3620-clock
+          - hisilicon,hi3620-mmc-clock
+
+      reg:
+        maxItems: 1
+
+      '#clock-cells':
+        const: 1
+
 required:
   - compatible
   - reg
Documentation/devicetree/bindings/clock/hi3620-clock.txt deleted +0 -20
deleted file mode 100644
index dad6269f52c5..000000000000
@@ -1,20 +0,0 @@
-* Hisilicon Hi3620 Clock Controller
-
-The Hi3620 clock controller generates and supplies clock to various
-controllers within the Hi3620 SoC.
-
-Required Properties:
-
-- compatible: should be one of the following.
-  - "hisilicon,hi3620-clock" - controller compatible with Hi3620 SoC.
-  - "hisilicon,hi3620-mmc-clock" - controller specific for Hi3620 mmc.
-
-- reg: physical base address of the controller and length of memory mapped
-  region.
-
-- #clock-cells: should be 1.
-
-Each clock is assigned an identifier and client nodes use this identifier
-to specify the clock which they consume.
-
-All these identifier could be found in <dt-bindings/clock/hi3620-clock.h>.