diff mbox series

[v5,1/2] dt-bindings: watchdog: starfive,jh7100-wdt: Add compatible for JH8100

Message ID 20231221084358.3458713-2-jisheng.teoh@starfivetech.com (mailing list archive)
State Handled Elsewhere
Headers show
Series Add StarFive JH8100 watchdog | expand

Checks

Context Check Description
conchuod/vmtest-fixes-PR fail merge-conflict

Commit Message

Ji Sheng Teoh Dec. 21, 2023, 8:43 a.m. UTC
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 <leyfoon.tan@starfivetech.com>
Signed-off-by: Ji Sheng Teoh <jisheng.teoh@starfivetech.com>
---
 .../watchdog/starfive,jh7100-wdt.yaml         | 40 ++++++++++++++-----
 1 file changed, 31 insertions(+), 9 deletions(-)

Comments

Rob Herring (Arm) Dec. 21, 2023, 9:02 p.m. UTC | #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 <leyfoon.tan@starfivetech.com>
> Signed-off-by: Ji Sheng Teoh <jisheng.teoh@starfivetech.com>
> ---
>  .../watchdog/starfive,jh7100-wdt.yaml         | 40 ++++++++++++++-----
>  1 file changed, 31 insertions(+), 9 deletions(-)
> 

Reviewed-by: Rob Herring <robh@kernel.org>
Ji Sheng Teoh Feb. 27, 2024, 1:57 a.m. UTC | #2
> 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 <leyfoon.tan@starfivetech.com>
> > Signed-off-by: Ji Sheng Teoh <jisheng.teoh@starfivetech.com>
> > ---
> >  .../watchdog/starfive,jh7100-wdt.yaml         | 40 ++++++++++++++-----
> >  1 file changed, 31 insertions(+), 9 deletions(-)
> >
> 
> Reviewed-by: Rob Herring <robh@kernel.org>

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
Conor Dooley Feb. 27, 2024, 8:54 a.m. UTC | #3
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 <leyfoon.tan@starfivetech.com>
> > > Signed-off-by: Ji Sheng Teoh <jisheng.teoh@starfivetech.com>
> > > ---
> > >  .../watchdog/starfive,jh7100-wdt.yaml         | 40 ++++++++++++++-----
> > >  1 file changed, 31 insertions(+), 9 deletions(-)
> > >
> > 
> > Reviewed-by: Rob Herring <robh@kernel.org>
> 
> 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.
Ji Sheng Teoh March 4, 2024, 2:09 a.m. UTC | #4
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 <leyfoon.tan@starfivetech.com>
> > > > Signed-off-by: Ji Sheng Teoh <jisheng.teoh@starfivetech.com>
> > > > ---
> > > >  .../watchdog/starfive,jh7100-wdt.yaml         | 40 ++++++++++++++-----
> > > >  1 file changed, 31 insertions(+), 9 deletions(-)
> > > >
> > >
> > > Reviewed-by: Rob Herring <robh@kernel.org>
> >
> > 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.
diff mbox series

Patch

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: