diff options
| author | Rob Herring <robh@kernel.org> | 2023-11-22 16:50:58 -0700 |
|---|---|---|
| committer | Wei Xu <xuwei5@hisilicon.com> | 2023-12-08 06:13:38 +0000 |
| commit | e6fe33c66d69385a67b1b03f93641aa264fbb75a (patch) | |
| tree | b0d2ca22a1916ab53bd6737f7f5bc6ecd6def2c4 | |
| parent | b85ea95d086471afb4ad062012a4d73cd328fa86 (diff) | |
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.
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
| -rw-r--r-- | Documentation/devicetree/bindings/arm/hisilicon/controller/sysctrl.yaml | 17 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/clock/hi3620-clock.txt | 20 |
2 files changed, 17 insertions, 20 deletions
diff --git a/Documentation/devicetree/bindings/arm/hisilicon/controller/sysctrl.yaml b/Documentation/devicetree/bindings/arm/hisilicon/controller/sysctrl.yaml index 5a53d433b6f08..7a221e1c09dfe 100644 --- a/Documentation/devicetree/bindings/arm/hisilicon/controller/sysctrl.yaml +++ b/Documentation/devicetree/bindings/arm/hisilicon/controller/sysctrl.yaml @@ -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 diff --git a/Documentation/devicetree/bindings/clock/hi3620-clock.txt b/Documentation/devicetree/bindings/clock/hi3620-clock.txt deleted file mode 100644 index dad6269f52c5a..0000000000000 --- a/Documentation/devicetree/bindings/clock/hi3620-clock.txt +++ /dev/null @@ -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>. |