| Message ID | 20230707210700.869060-1-robh@kernel.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | dt-bindings: arm: hisilicon,cpuctrl: Merge "hisilicon,hix5hd2-clock" into parent binding | expand |
On Fri, Jul 07, 2023 at 03:07:00PM -0600, Rob Herring wrote: > -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/hix5hd2-clock.h>. Might've been nice to preserve the reference to the header containing the defines? Either way, this seems to have sat for a bit so, Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Cheers, Conor.
Quoting Rob Herring (2023-07-07 14:07:00) > The "hisilicon,hix5hd2-clock" is simple enough to just add it into its > parent node binding, "hisilicon,cpuctrl". > > This fixes a warning that "hisilicon,hix5hd2-clock" is missing a schema. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- Applied to clk-next
diff --git a/Documentation/devicetree/bindings/arm/hisilicon/controller/cpuctrl.yaml b/Documentation/devicetree/bindings/arm/hisilicon/controller/cpuctrl.yaml index 528dad4cde3c..4fc208d3995e 100644 --- a/Documentation/devicetree/bindings/arm/hisilicon/controller/cpuctrl.yaml +++ b/Documentation/devicetree/bindings/arm/hisilicon/controller/cpuctrl.yaml @@ -29,6 +29,26 @@ properties: ranges: true +patternProperties: + "^clock@[0-9a-f]+$": + type: object + additionalProperties: false + + properties: + compatible: + const: hisilicon,hix5hd2-clock + + reg: + maxItems: 1 + + "#clock-cells": + const: 1 + + required: + - compatible + - reg + - "#clock-cells" + required: - compatible - reg diff --git a/Documentation/devicetree/bindings/clock/hix5hd2-clock.txt b/Documentation/devicetree/bindings/clock/hix5hd2-clock.txt deleted file mode 100644 index 4733e58e491b..000000000000 --- a/Documentation/devicetree/bindings/clock/hix5hd2-clock.txt +++ /dev/null @@ -1,30 +0,0 @@ -* Hisilicon Hix5hd2 Clock Controller - -The hix5hd2 clock controller generates and supplies clock to various -controllers within the hix5hd2 SoC. - -Required Properties: - -- compatible: should be "hisilicon,hix5hd2-clock" -- reg: Address and length of the register set -- #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/hix5hd2-clock.h>. - -Examples: - clock: clock@f8a22000 { - compatible = "hisilicon,hix5hd2-clock"; - reg = <0xf8a22000 0x1000>; - #clock-cells = <1>; - }; - - uart0: uart@f8b00000 { - compatible = "arm,pl011", "arm,primecell"; - reg = <0xf8b00000 0x1000>; - interrupts = <0 49 4>; - clocks = <&clock HIX5HD2_FIXED_83M>; - clock-names = "apb_pclk"; - };
The "hisilicon,hix5hd2-clock" is simple enough to just add it into its parent node binding, "hisilicon,cpuctrl". This fixes a warning that "hisilicon,hix5hd2-clock" is missing a schema. Signed-off-by: Rob Herring <robh@kernel.org> --- .../arm/hisilicon/controller/cpuctrl.yaml | 20 +++++++++++++ .../bindings/clock/hix5hd2-clock.txt | 30 ------------------- 2 files changed, 20 insertions(+), 30 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/hix5hd2-clock.txt