| Message ID | 20231202192536.266885-1-biju.das.jz@bp.renesas.com |
|---|---|
| Headers | show |
| Series | Convert DA906{1,2} bindings to json-schema | expand |
On Sat, 02 Dec 2023 19:25:35 +0000, Biju Das wrote: > Convert the da9062 PMIC device tree binding documentation to json-schema. > > Update the example to match reality. > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > --- > .../devicetree/bindings/mfd/da9062.txt | 124 ------------ > .../devicetree/bindings/mfd/dlg,da9063.yaml | 184 +++++++++++++++++- > 2 files changed, 178 insertions(+), 130 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/mfd/da9062.txt > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/thermal/dlg,da9062-thermal.example.dtb: pmic@58: 'gpio' is a required property from schema $id: http://devicetree.org/schemas/mfd/dlg,da9063.yaml# /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/thermal/dlg,da9062-thermal.example.dtb: pmic@58: 'onkey' is a required property from schema $id: http://devicetree.org/schemas/mfd/dlg,da9063.yaml# /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/thermal/dlg,da9062-thermal.example.dtb: pmic@58: 'rtc' is a required property from schema $id: http://devicetree.org/schemas/mfd/dlg,da9063.yaml# /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/thermal/dlg,da9062-thermal.example.dtb: pmic@58: 'watchdog' is a required property from schema $id: http://devicetree.org/schemas/mfd/dlg,da9063.yaml# doc reference errors (make refcheckdocs): Warning: Documentation/devicetree/bindings/input/dlg,da9062-onkey.yaml references a file that doesn't exist: Documentation/devicetree/bindings/mfd/da9062.txt Warning: Documentation/devicetree/bindings/thermal/dlg,da9062-thermal.yaml references a file that doesn't exist: Documentation/devicetree/bindings/mfd/da9062.txt Documentation/devicetree/bindings/input/dlg,da9062-onkey.yaml: Documentation/devicetree/bindings/mfd/da9062.txt Documentation/devicetree/bindings/thermal/dlg,da9062-thermal.yaml: Documentation/devicetree/bindings/mfd/da9062.txt See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20231202192536.266885-12-biju.das.jz@bp.renesas.com The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
On Sat, Dec 02, 2023 at 07:25:25PM +0000, Biju Das wrote: > The DA9061 watchdog is identical to DA9062 watchdog, so no driver changes > are required. The fallback compatible string "dlg,da9062-watchdog" will be > used on DA9061 watchdog. > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > --- > v2: > * New patch > --- > .../bindings/watchdog/dlg,da9062-watchdog.yaml | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/watchdog/dlg,da9062-watchdog.yaml b/Documentation/devicetree/bindings/watchdog/dlg,da9062-watchdog.yaml > index f058628bb632..2b71fdb9251c 100644 > --- a/Documentation/devicetree/bindings/watchdog/dlg,da9062-watchdog.yaml > +++ b/Documentation/devicetree/bindings/watchdog/dlg,da9062-watchdog.yaml > @@ -14,9 +14,14 @@ allOf: > > properties: > compatible: > - enum: > - - dlg,da9061-watchdog > - - dlg,da9062-watchdog > + oneOf: > + - items: > + - enum: > + - dlg,da9062-watchdog > + - items: > + - enum: > + - dlg,da9061-watchdog If there is no da9064 on the horizon, I'd just make this const. > + - const: dlg,da9062-watchdog # da9062-watchdog fallback The comment here is just noise IMO. Otherwise, LGTM.
On Sat, Dec 02, 2023 at 07:25:27PM +0000, Biju Das wrote: > diff --git a/Documentation/devicetree/bindings/input/dlg,da9062-onkey.yaml b/Documentation/devicetree/bindings/input/dlg,da9062-onkey.yaml > new file mode 100644 > index 000000000000..34f2e00cf045 > --- /dev/null > +++ b/Documentation/devicetree/bindings/input/dlg,da9062-onkey.yaml > @@ -0,0 +1,61 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/input/dlg,da9062-onkey.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Dialog DA9061/62/63 OnKey Module > + > +maintainers: > + - Biju Das <biju.das.jz@bp.renesas.com> > + > +description: | > + This module is part of the DA9061/DA9062/DA9063. For more details about entire > + DA9062 and DA9061 chips see Documentation/devicetree/bindings/mfd/da9062.txt > + For DA906{1,2,3} see Documentation/devicetree/bindings/mfd/dlg,da9063.yaml > + > + This module provides the KEY_POWER event. > + > +properties: > + compatible: > + oneOf: > + - items: > + - enum: > + - dlg,da9062-onkey > + - dlg,da9063-onkey > + - items: > + - enum: > + - dlg,da9061-onkey > + - const: dlg,da9062-onkey # da9062-onkey fallback Same comments here. Cheers, Conor. > + dlg,disable-key-power: > + type: boolean > + description: > + Disable power-down using a long key-press. If this entry exists > + the OnKey driver will remove support for the KEY_POWER key press > + when triggered using a long press of the OnKey. > + > +required: > + - compatible > + > +additionalProperties: false > + > +examples: > + - | > + #include <dt-bindings/interrupt-controller/irq.h> > + i2c { > + #address-cells = <1>; > + #size-cells = <0>; > + pmic@58 { > + compatible = "dlg,da9063"; > + reg = <0x58>; > + interrupt-parent = <&gpio6>; > + interrupts = <11 IRQ_TYPE_LEVEL_LOW>; > + interrupt-controller; > + > + onkey { > + compatible = "dlg,da9063-onkey"; > + dlg,disable-key-power; > + }; > + }; > + }; > -- > 2.39.2 >
On Sat, Dec 02, 2023 at 07:25:31PM +0000, Biju Das wrote: > Sort child devices alphabetically. > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> Acked-by: Conor Dooley <conor.dooley@microchip.com> Cheers, Conor. > --- > .../devicetree/bindings/mfd/dlg,da9063.yaml | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/Documentation/devicetree/bindings/mfd/dlg,da9063.yaml b/Documentation/devicetree/bindings/mfd/dlg,da9063.yaml > index 468d31b1135b..ecdef322723d 100644 > --- a/Documentation/devicetree/bindings/mfd/dlg,da9063.yaml > +++ b/Documentation/devicetree/bindings/mfd/dlg,da9063.yaml > @@ -38,14 +38,6 @@ properties: > "#interrupt-cells": > const: 2 > > - rtc: > - type: object > - $ref: /schemas/rtc/rtc.yaml# > - unevaluatedProperties: false > - properties: > - compatible: > - const: dlg,da9063-rtc > - > onkey: > $ref: /schemas/input/dlg,da9062-onkey.yaml > > @@ -57,6 +49,14 @@ properties: > $ref: /schemas/regulator/regulator.yaml > unevaluatedProperties: false > > + rtc: > + type: object > + $ref: /schemas/rtc/rtc.yaml# > + unevaluatedProperties: false > + properties: > + compatible: > + const: dlg,da9063-rtc > + > watchdog: > $ref: /schemas/watchdog/dlg,da9062-watchdog.yaml > > -- > 2.39.2 >
Hi Conor Dooley, Thanks for the feedback. > Subject: Re: [PATCH v2 01/11] dt-bindings: watchdog: dlg,da9062-watchdog: > Add fallback for DA9061 watchdog > > On Sat, Dec 02, 2023 at 07:25:25PM +0000, Biju Das wrote: > > The DA9061 watchdog is identical to DA9062 watchdog, so no driver > > changes are required. The fallback compatible string > > "dlg,da9062-watchdog" will be used on DA9061 watchdog. > > > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > > --- > > v2: > > * New patch > > --- > > .../bindings/watchdog/dlg,da9062-watchdog.yaml | 11 ++++++++--- > > 1 file changed, 8 insertions(+), 3 deletions(-) > > > > diff --git > > a/Documentation/devicetree/bindings/watchdog/dlg,da9062-watchdog.yaml > > b/Documentation/devicetree/bindings/watchdog/dlg,da9062-watchdog.yaml > > index f058628bb632..2b71fdb9251c 100644 > > --- > > a/Documentation/devicetree/bindings/watchdog/dlg,da9062-watchdog.yaml > > +++ b/Documentation/devicetree/bindings/watchdog/dlg,da9062-watchdog.y > > +++ aml > > @@ -14,9 +14,14 @@ allOf: > > > > properties: > > compatible: > > - enum: > > - - dlg,da9061-watchdog > > - - dlg,da9062-watchdog > > + oneOf: > > + - items: > > + - enum: > > + - dlg,da9062-watchdog > > + - items: > > + - enum: > > + - dlg,da9061-watchdog > > If there is no da9064 on the horizon, I'd just make this const. You mean since it is single device having a fallback, define both device compatible and fallback as const instead of enum and const?? > > > + - const: dlg,da9062-watchdog # da9062-watchdog fallback > > The comment here is just noise IMO. OK, will change the comment as generic fallback. Is it ok? Or you want to drop completely?? Cheers, Biju
Hi Conor Dooley, > Subject: Re: [PATCH v2 03/11] dt-bindings: input: Convert da906{1,2,3} > onkey to json-schema > > On Sat, Dec 02, 2023 at 07:25:27PM +0000, Biju Das wrote: > > diff --git > > a/Documentation/devicetree/bindings/input/dlg,da9062-onkey.yaml > > b/Documentation/devicetree/bindings/input/dlg,da9062-onkey.yaml > > new file mode 100644 > > index 000000000000..34f2e00cf045 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/input/dlg,da9062-onkey.yaml > > @@ -0,0 +1,61 @@ > > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) %YAML 1.2 > > +--- > > +$id: http://devicetree.org/schemas/input/dlg,da9062-onkey.yaml# > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > + > > +title: Dialog DA9061/62/63 OnKey Module > > + > > +maintainers: > > + - Biju Das <biju.das.jz@bp.renesas.com> > > + > > +description: | > > + This module is part of the DA9061/DA9062/DA9063. For more details > > +about entire > > + DA9062 and DA9061 chips see > > +Documentation/devicetree/bindings/mfd/da9062.txt > > + For DA906{1,2,3} see > > +Documentation/devicetree/bindings/mfd/dlg,da9063.yaml > > + > > + This module provides the KEY_POWER event. > > + > > +properties: > > + compatible: > > + oneOf: > > + - items: > > + - enum: > > + - dlg,da9062-onkey > > + - dlg,da9063-onkey > > + - items: > > + - enum: > > + - dlg,da9061-onkey > > + - const: dlg,da9062-onkey # da9062-onkey fallback > > Same comments here. Agreed, it will be like oneOf: - items: - enum: - dlg,da9062-onkey - dlg,da9063-onkey - items: - const: dlg,da9061-onkey - const: dlg,da9062-onkey > > Cheers, > Conor. > > > + dlg,disable-key-power: > > + type: boolean > > + description: > > + Disable power-down using a long key-press. If this entry exists > > + the OnKey driver will remove support for the KEY_POWER key press > > + when triggered using a long press of the OnKey. > > + > > +required: > > + - compatible > > + > > +additionalProperties: false > > + > > +examples: > > + - | > > + #include <dt-bindings/interrupt-controller/irq.h> > > + i2c { > > + #address-cells = <1>; > > + #size-cells = <0>; > > + pmic@58 { > > + compatible = "dlg,da9063"; > > + reg = <0x58>; > > + interrupt-parent = <&gpio6>; > > + interrupts = <11 IRQ_TYPE_LEVEL_LOW>; > > + interrupt-controller; > > + > > + onkey { > > + compatible = "dlg,da9063-onkey"; > > + dlg,disable-key-power; > > + }; > > + }; > > + }; For consistency, I have updated the example similar to watchdog. Same case for thermal. examples: - | onkey { compatible = "dlg,da9063-onkey"; dlg,disable-key-power; }; Cheers, Biju
Convert the below bindings to json-schema 1) DA906{1,2} mfd bindings 2) DA906{1,2,3} onkey bindings 3) DA906{1,2,3} thermal bindings Also add fallback for DA9061 watchdog device and document DA9063 watchdog device. v1->v2: Ref : https://lore.kernel.org/all/20231201110840.37408-5-biju.das.jz@bp.renesas.com/ * Made as a separate series * DA9062 and DA9061 merged with DA9063 * Sorted the child devices * mfd,onkey and thermal are pointing to child bindings Biju Das (11): dt-bindings: watchdog: dlg,da9062-watchdog: Add fallback for DA9061 watchdog dt-bindings: watchdog: dlg,da9062-watchdog: Document DA9063 watchdog dt-bindings: input: Convert da906{1,2,3} onkey to json-schema dt-bindings: thermal: Convert da906{1,2} thermal to json-schema dt-bindings: mfd: dlg,da9063: Update watchdog property dt-bindings: mfd: dlg,da9063: Update onkey property dt-bindings: mfd: dlg,da9063: Sort child devices dt-bindings: mfd: da9062: Update watchdog description dt-bindings: mfd: da9062: Update onkey description dt-bindings: mfd: da9062: Update thermal description dt-bindings: mfd: dlg,da9063: Convert da9062 to json-schema .../bindings/input/da9062-onkey.txt | 47 ---- .../bindings/input/dlg,da9062-onkey.yaml | 61 +++++ .../devicetree/bindings/mfd/da9062.txt | 124 ---------- .../devicetree/bindings/mfd/dlg,da9063.yaml | 220 +++++++++++++++--- .../bindings/thermal/da9062-thermal.txt | 36 --- .../bindings/thermal/dlg,da9062-thermal.yaml | 58 +++++ .../watchdog/dlg,da9062-watchdog.yaml | 12 +- 7 files changed, 313 insertions(+), 245 deletions(-) delete mode 100644 Documentation/devicetree/bindings/input/da9062-onkey.txt create mode 100644 Documentation/devicetree/bindings/input/dlg,da9062-onkey.yaml delete mode 100644 Documentation/devicetree/bindings/mfd/da9062.txt delete mode 100644 Documentation/devicetree/bindings/thermal/da9062-thermal.txt create mode 100644 Documentation/devicetree/bindings/thermal/dlg,da9062-thermal.yaml