Add "starfive,jh8100-wdt" compatible string for StarFive's JH8100
watchdog.
Since JH8100 watchdog only has 1 reset signal, update binding
document to support one reset for "starfive,jh8100-wdt" compatible.
Signed-off-by: Ley Foon Tan <[email protected]>
Signed-off-by: Ji Sheng Teoh <[email protected]>
---
.../watchdog/starfive,jh7100-wdt.yaml | 40 ++++++++++++++-----
1 file changed, 31 insertions(+), 9 deletions(-)
diff --git a/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml b/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml
index 68f3f6fd08a6..e21f807b0b69 100644
--- a/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml
@@ -19,14 +19,16 @@ description:
isn't cleared, the watchdog will reset the system unless the watchdog
reset is disabled.
-allOf:
- - $ref: watchdog.yaml#
-
properties:
compatible:
- enum:
- - starfive,jh7100-wdt
- - starfive,jh7110-wdt
+ oneOf:
+ - enum:
+ - starfive,jh7100-wdt
+ - starfive,jh7110-wdt
+ - items:
+ - enum:
+ - starfive,jh8100-wdt
+ - const: starfive,jh7110-wdt
reg:
maxItems: 1
@@ -45,9 +47,8 @@ properties:
- const: core
resets:
- items:
- - description: APB reset
- - description: Core reset
+ minItems: 1
+ maxItems: 2
required:
- compatible
@@ -56,6 +57,27 @@ required:
- clock-names
- resets
+allOf:
+ - $ref: watchdog.yaml#
+
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - starfive,jh8100-wdt
+ then:
+ properties:
+ resets:
+ items:
+ - description: Core reset
+ else:
+ properties:
+ resets:
+ items:
+ - description: APB reset
+ - description: Core reset
+
unevaluatedProperties: false
examples:
--
2.25.1
On Thu, 21 Dec 2023 16:43:57 +0800, Ji Sheng Teoh wrote:
> Add "starfive,jh8100-wdt" compatible string for StarFive's JH8100
> watchdog.
> Since JH8100 watchdog only has 1 reset signal, update binding
> document to support one reset for "starfive,jh8100-wdt" compatible.
>
> Signed-off-by: Ley Foon Tan <[email protected]>
> Signed-off-by: Ji Sheng Teoh <[email protected]>
> ---
> .../watchdog/starfive,jh7100-wdt.yaml | 40 ++++++++++++++-----
> 1 file changed, 31 insertions(+), 9 deletions(-)
>
Reviewed-by: Rob Herring <[email protected]>
> On Thu, 21 Dec 2023 16:43:57 +0800, Ji Sheng Teoh wrote:
> > Add "starfive,jh8100-wdt" compatible string for StarFive's JH8100
> > watchdog.
> > Since JH8100 watchdog only has 1 reset signal, update binding document
> > to support one reset for "starfive,jh8100-wdt" compatible.
> >
> > Signed-off-by: Ley Foon Tan <[email protected]>
> > Signed-off-by: Ji Sheng Teoh <[email protected]>
> > ---
> > .../watchdog/starfive,jh7100-wdt.yaml | 40 ++++++++++++++-----
> > 1 file changed, 31 insertions(+), 9 deletions(-)
> >
>
> Reviewed-by: Rob Herring <[email protected]>
Hi Conor, since this patch is reviewed, could you help to pick this dt-bindings patch for riscv-dt-for-next branch?
Thanks,
Ji Sheng
On Tue, Feb 27, 2024 at 01:57:43AM +0000, JiSheng Teoh wrote:
> > On Thu, 21 Dec 2023 16:43:57 +0800, Ji Sheng Teoh wrote:
> > > Add "starfive,jh8100-wdt" compatible string for StarFive's JH8100
> > > watchdog.
> > > Since JH8100 watchdog only has 1 reset signal, update binding document
> > > to support one reset for "starfive,jh8100-wdt" compatible.
> > >
> > > Signed-off-by: Ley Foon Tan <[email protected]>
> > > Signed-off-by: Ji Sheng Teoh <[email protected]>
> > > ---
> > > .../watchdog/starfive,jh7100-wdt.yaml | 40 ++++++++++++++-----
> > > 1 file changed, 31 insertions(+), 9 deletions(-)
> > >
> >
> > Reviewed-by: Rob Herring <[email protected]>
>
> Hi Conor, since this patch is reviewed, could you help to pick this
> dt-bindings patch for riscv-dt-for-next branch?
Ideally I would not and it would go via the watchdog tree.
Failing that, I'd rather Rob take it.
Thanks,
Conor.
Hi Rob,
> On Tue, Feb 27, 2024 at 01:57:43AM +0000, JiSheng Teoh wrote:
> > > On Thu, 21 Dec 2023 16:43:57 +0800, Ji Sheng Teoh wrote:
> > > > Add "starfive,jh8100-wdt" compatible string for StarFive's JH8100
> > > > watchdog.
> > > > Since JH8100 watchdog only has 1 reset signal, update binding
> > > > document to support one reset for "starfive,jh8100-wdt" compatible.
> > > >
> > > > Signed-off-by: Ley Foon Tan <[email protected]>
> > > > Signed-off-by: Ji Sheng Teoh <[email protected]>
> > > > ---
> > > > .../watchdog/starfive,jh7100-wdt.yaml | 40 ++++++++++++++-----
> > > > 1 file changed, 31 insertions(+), 9 deletions(-)
> > > >
> > >
> > > Reviewed-by: Rob Herring <[email protected]>
> >
> > Hi Conor, since this patch is reviewed, could you help to pick this
> > dt-bindings patch for riscv-dt-for-next branch?
>
> Ideally I would not and it would go via the watchdog tree.
>
> Failing that, I'd rather Rob take it.
Could you help to pick this dt-bindings patch for dt/next branch?
Thanks,
JiSheng
>
> Thanks,
> Conor.