| Message ID | 20231209142723.2060196-3-jisheng.teoh@starfivetech.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add StarFive JH8100 watchdog | expand |
On 09/12/2023 15:27, 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 | 29 ++++++++++++++----- > 1 file changed, 21 insertions(+), 8 deletions(-) > > diff --git a/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml b/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml > index 68f3f6fd08a6..eec182317219 100644 > --- a/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml > +++ b/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml > @@ -19,14 +19,12 @@ 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 > + - starfive,jh8100-wdt > > reg: > maxItems: 1 > @@ -44,11 +42,6 @@ properties: > - const: apb > - const: core > > - resets: No, keep it here with min/maxItems. > - items: > - - description: APB reset > - - description: Core reset > - > required: > - compatible > - reg > @@ -56,6 +49,26 @@ required: > - clock-names > - resets > > +allOf: > + - $ref: watchdog.yaml# > + - if: > + properties: > + compatible: > + contains: > + enum: > + - starfive,jh8100-wdt > + then: > + properties: > + resets: > + items: > + - description: Watchdog reset Why is it called "Watchdog"? How is it different from "Core"? Best regards, Krzysztof
On Mon, 11 Dec 2023 11:06:09 +0100 Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > On 09/12/2023 15:27, 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 | 29 > > ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) > > > > diff --git > > a/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml > > b/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml > > index 68f3f6fd08a6..eec182317219 100644 --- > > a/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml > > +++ > > b/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml > > @@ -19,14 +19,12 @@ 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 > > + - starfive,jh8100-wdt > > > > reg: > > maxItems: 1 > > @@ -44,11 +42,6 @@ properties: > > - const: apb > > - const: core > > > > - resets: > > No, keep it here with min/maxItems. > Ok, will change it up to use min/maxItems. > > - items: > > - - description: APB reset > > - - description: Core reset > > - > > required: > > - compatible > > - reg > > @@ -56,6 +49,26 @@ required: > > - clock-names > > - resets > > > > +allOf: > > + - $ref: watchdog.yaml# > > + - if: > > + properties: > > + compatible: > > + contains: > > + enum: > > + - starfive,jh8100-wdt > > + then: > > + properties: > > + resets: > > + items: > > + - description: Watchdog reset > > Why is it called "Watchdog"? How is it different from "Core"? Will standardize them to use "Core" instead. Thanks. > > Best regards, > Krzysztof >
diff --git a/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml b/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml index 68f3f6fd08a6..eec182317219 100644 --- a/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/starfive,jh7100-wdt.yaml @@ -19,14 +19,12 @@ 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 + - starfive,jh8100-wdt reg: maxItems: 1 @@ -44,11 +42,6 @@ properties: - const: apb - const: core - resets: - items: - - description: APB reset - - description: Core reset - required: - compatible - reg @@ -56,6 +49,26 @@ required: - clock-names - resets +allOf: + - $ref: watchdog.yaml# + - if: + properties: + compatible: + contains: + enum: + - starfive,jh8100-wdt + then: + properties: + resets: + items: + - description: Watchdog reset + else: + properties: + resets: + items: + - description: APB reset + - description: Core reset + unevaluatedProperties: false examples: