| Message ID | 20220317162349.739636-3-andre.przywara@arm.com |
|---|---|
| State | Accepted |
| Commit | 42b91bb160815d82d36cc1cfe28f1edd9079d912 |
| Headers | show |
| Series | ARM: suniv: dts: update Allwinner F1C100 | expand |
On Thu, 17 Mar 2022 16:23:39 +0000, Andre Przywara wrote: > Most Allwinner SoCs have just one input clock to drive the watchdog > peripheral. So far this is the 24 MHz "HOSC" oscillator, divided down > internally to 32 KHz. > The F1C100 series watchdog however uses the unchanged 32 KHz "LOSC" as > its only clock input, which has the same effect, but let's the binding > description mismatch. > > Change the binding description to name the clocks more loosely, so both > the LOSC and divided HOSC match the description. As the fixed clock names > now make less sense, drop them from SoCs supporting just one clock > input, they were not used by any DT anyway. > > For the newer SoCs, supporting a choice of two input clocks, we keep > both the description and clock-names requirement. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > --- > .../watchdog/allwinner,sun4i-a10-wdt.yaml | 20 ++++++++----------- > 1 file changed, 8 insertions(+), 12 deletions(-) > Reviewed-by: Rob Herring <robh@kernel.org>
diff --git a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml index 7a26cde0afdd..cbcf19f51411 100644 --- a/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/allwinner,sun4i-a10-wdt.yaml @@ -39,14 +39,8 @@ properties: clocks: minItems: 1 items: - - description: High-frequency oscillator input, divided internally - - description: Low-frequency oscillator input, only found on some variants - - clock-names: - minItems: 1 - items: - - const: hosc - - const: losc + - description: 32 KHz input clock + - description: secondary clock source interrupts: maxItems: 1 @@ -71,9 +65,14 @@ then: properties: clocks: minItems: 2 + items: + - description: High-frequency oscillator input, divided internally + - description: Low-frequency oscillator input clock-names: - minItems: 2 + items: + - const: hosc + - const: losc required: - clock-names @@ -83,9 +82,6 @@ else: clocks: maxItems: 1 - clock-names: - maxItems: 1 - unevaluatedProperties: false examples:
Most Allwinner SoCs have just one input clock to drive the watchdog peripheral. So far this is the 24 MHz "HOSC" oscillator, divided down internally to 32 KHz. The F1C100 series watchdog however uses the unchanged 32 KHz "LOSC" as its only clock input, which has the same effect, but let's the binding description mismatch. Change the binding description to name the clocks more loosely, so both the LOSC and divided HOSC match the description. As the fixed clock names now make less sense, drop them from SoCs supporting just one clock input, they were not used by any DT anyway. For the newer SoCs, supporting a choice of two input clocks, we keep both the description and clock-names requirement. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- .../watchdog/allwinner,sun4i-a10-wdt.yaml | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-)