diff mbox series

[1/3] dt-bindings: power: reset: Convert qcom,pon to DT schema

Message ID 20210705025032.12804-2-shawn.guo@linaro.org
State Superseded
Headers show
Series Add 'qcom,pon-reboot-not-used' support in PON driver | expand

Commit Message

Shawn Guo July 5, 2021, 2:50 a.m. UTC
It converts qcom,pon DT bindings from legacy bare text to YAML format.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

---
 .../bindings/power/reset/qcom,pon.txt         | 49 -------------------
 .../bindings/power/reset/qcom,pon.yaml        | 49 +++++++++++++++++++
 2 files changed, 49 insertions(+), 49 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/power/reset/qcom,pon.txt
 create mode 100644 Documentation/devicetree/bindings/power/reset/qcom,pon.yaml

-- 
2.17.1

Comments

Rob Herring July 12, 2021, 3:45 p.m. UTC | #1
On Mon, Jul 05, 2021 at 10:50:30AM +0800, Shawn Guo wrote:
> It converts qcom,pon DT bindings from legacy bare text to YAML format.

> 

> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

> ---

>  .../bindings/power/reset/qcom,pon.txt         | 49 -------------------

>  .../bindings/power/reset/qcom,pon.yaml        | 49 +++++++++++++++++++

>  2 files changed, 49 insertions(+), 49 deletions(-)

>  delete mode 100644 Documentation/devicetree/bindings/power/reset/qcom,pon.txt

>  create mode 100644 Documentation/devicetree/bindings/power/reset/qcom,pon.yaml

> 

> diff --git a/Documentation/devicetree/bindings/power/reset/qcom,pon.txt b/Documentation/devicetree/bindings/power/reset/qcom,pon.txt

> deleted file mode 100644

> index 0c0dc3a1e693..000000000000

> --- a/Documentation/devicetree/bindings/power/reset/qcom,pon.txt

> +++ /dev/null

> @@ -1,49 +0,0 @@

> -Qualcomm PON Device

> -

> -The Power On device for Qualcomm PM8xxx is MFD supporting pwrkey

> -and resin along with the Android reboot-mode.

> -

> -This DT node has pwrkey and resin as sub nodes.

> -

> -Required Properties:

> --compatible: Must be one of:

> -	"qcom,pm8916-pon"

> -	"qcom,pms405-pon"

> -	"qcom,pm8998-pon"

> -

> --reg: Specifies the physical address of the pon register

> -

> -Optional subnode:

> --pwrkey: Specifies the subnode pwrkey and should follow the

> - qcom,pm8941-pwrkey.txt description.

> --resin: Specifies the subnode resin and should follow the

> - qcom,pm8xxx-pwrkey.txt description.

> -

> -The rest of the properties should follow the generic reboot-mode description

> -found in reboot-mode.txt

> -

> -Example:

> -

> -	pon@800 {

> -		compatible = "qcom,pm8916-pon";

> -

> -		reg = <0x800>;

> -		mode-bootloader = <0x2>;

> -		mode-recovery = <0x1>;

> -

> -		pwrkey {

> -			compatible = "qcom,pm8941-pwrkey";

> -			interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;

> -			debounce = <15625>;

> -			bias-pull-up;

> -			linux,code = <KEY_POWER>;

> -		};

> -

> -		resin {

> -			compatible = "qcom,pm8941-resin";

> -			interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;

> -			debounce = <15625>;

> -			bias-pull-up;

> -			linux,code = <KEY_VOLUMEDOWN>;

> -		};

> -	};

> diff --git a/Documentation/devicetree/bindings/power/reset/qcom,pon.yaml b/Documentation/devicetree/bindings/power/reset/qcom,pon.yaml

> new file mode 100644

> index 000000000000..7764c804af1d

> --- /dev/null

> +++ b/Documentation/devicetree/bindings/power/reset/qcom,pon.yaml

> @@ -0,0 +1,49 @@

> +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

> +%YAML 1.2

> +---

> +$id: http://devicetree.org/schemas/power/reset/qcom,pon.yaml#

> +$schema: http://devicetree.org/meta-schemas/core.yaml#

> +

> +title: Qualcomm PON Device

> +

> +maintainers:

> +  - Vinod Koul <vkoul@kernel.org>

> +

> +description: |

> +  The Power On device for Qualcomm PM8xxx is MFD supporting pwrkey

> +  and resin along with the Android reboot-mode.


allOf:
  - $ref: /schemas/power/reset/reboot-mode.yaml#

And then...

> +

> +properties:

> +  compatible:

> +    enum:

> +      - qcom,pm8916-pon

> +      - qcom,pms405-pon

> +      - qcom,pm8998-pon

> +

> +  reg:

> +    maxItems: 1

> +

> +patternProperties:

> +  "^mode-.+":

> +    $ref: /schemas/types.yaml#/definitions/uint32

> +    description: Vendor-specific mode value written to the mode register


Drop this.

> +

> +required:

> +  - compatible

> +  - reg

> +

> +additionalProperties: false


unevaluatedProperties: false

> +

> +examples:

> +  - |

> +    pmic {

> +        #address-cells = <1>;

> +        #size-cells = <0>;

> +

> +        pon@800 {

> +            compatible = "qcom,pm8916-pon";

> +            reg = <0x800>;

> +            mode-bootloader = <0x2>;

> +            mode-recovery = <0x1>;

> +        };

> +    };

> -- 

> 2.17.1

> 

>
Shawn Guo July 14, 2021, 11:47 a.m. UTC | #2
On Mon, Jul 12, 2021 at 09:45:21AM -0600, Rob Herring wrote:
> On Mon, Jul 05, 2021 at 10:50:30AM +0800, Shawn Guo wrote:
> > It converts qcom,pon DT bindings from legacy bare text to YAML format.
> > 
> > Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> > ---
> >  .../bindings/power/reset/qcom,pon.txt         | 49 -------------------
> >  .../bindings/power/reset/qcom,pon.yaml        | 49 +++++++++++++++++++
> >  2 files changed, 49 insertions(+), 49 deletions(-)
> >  delete mode 100644 Documentation/devicetree/bindings/power/reset/qcom,pon.txt
> >  create mode 100644 Documentation/devicetree/bindings/power/reset/qcom,pon.yaml
> > 
> > diff --git a/Documentation/devicetree/bindings/power/reset/qcom,pon.txt b/Documentation/devicetree/bindings/power/reset/qcom,pon.txt
> > deleted file mode 100644
> > index 0c0dc3a1e693..000000000000
> > --- a/Documentation/devicetree/bindings/power/reset/qcom,pon.txt
> > +++ /dev/null
> > @@ -1,49 +0,0 @@
> > -Qualcomm PON Device
> > -
> > -The Power On device for Qualcomm PM8xxx is MFD supporting pwrkey
> > -and resin along with the Android reboot-mode.
> > -
> > -This DT node has pwrkey and resin as sub nodes.
> > -
> > -Required Properties:
> > --compatible: Must be one of:
> > -	"qcom,pm8916-pon"
> > -	"qcom,pms405-pon"
> > -	"qcom,pm8998-pon"
> > -
> > --reg: Specifies the physical address of the pon register
> > -
> > -Optional subnode:
> > --pwrkey: Specifies the subnode pwrkey and should follow the
> > - qcom,pm8941-pwrkey.txt description.
> > --resin: Specifies the subnode resin and should follow the
> > - qcom,pm8xxx-pwrkey.txt description.
> > -
> > -The rest of the properties should follow the generic reboot-mode description
> > -found in reboot-mode.txt
> > -
> > -Example:
> > -
> > -	pon@800 {
> > -		compatible = "qcom,pm8916-pon";
> > -
> > -		reg = <0x800>;
> > -		mode-bootloader = <0x2>;
> > -		mode-recovery = <0x1>;
> > -
> > -		pwrkey {
> > -			compatible = "qcom,pm8941-pwrkey";
> > -			interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;
> > -			debounce = <15625>;
> > -			bias-pull-up;
> > -			linux,code = <KEY_POWER>;
> > -		};
> > -
> > -		resin {
> > -			compatible = "qcom,pm8941-resin";
> > -			interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
> > -			debounce = <15625>;
> > -			bias-pull-up;
> > -			linux,code = <KEY_VOLUMEDOWN>;
> > -		};
> > -	};
> > diff --git a/Documentation/devicetree/bindings/power/reset/qcom,pon.yaml b/Documentation/devicetree/bindings/power/reset/qcom,pon.yaml
> > new file mode 100644
> > index 000000000000..7764c804af1d
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/power/reset/qcom,pon.yaml
> > @@ -0,0 +1,49 @@
> > +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
> > +%YAML 1.2
> > +---
> > +$id: http://devicetree.org/schemas/power/reset/qcom,pon.yaml#
> > +$schema: http://devicetree.org/meta-schemas/core.yaml#
> > +
> > +title: Qualcomm PON Device
> > +
> > +maintainers:
> > +  - Vinod Koul <vkoul@kernel.org>
> > +
> > +description: |
> > +  The Power On device for Qualcomm PM8xxx is MFD supporting pwrkey
> > +  and resin along with the Android reboot-mode.
> 
> allOf:
>   - $ref: /schemas/power/reset/reboot-mode.yaml#
> 
> And then...
> 
> > +
> > +properties:
> > +  compatible:
> > +    enum:
> > +      - qcom,pm8916-pon
> > +      - qcom,pms405-pon
> > +      - qcom,pm8998-pon
> > +
> > +  reg:
> > +    maxItems: 1
> > +
> > +patternProperties:
> > +  "^mode-.+":
> > +    $ref: /schemas/types.yaml#/definitions/uint32
> > +    description: Vendor-specific mode value written to the mode register
> 
> Drop this.

Drop the description line only or the whole "^mode-.+" block?  I got the
following from dt_binding_check if dropping the whole block.

 pon@800: 'compatible', 'reg' do not match any of the regexes: '^mode-.*$', 'pinctrl-[0-9]+'

> 
> > +
> > +required:
> > +  - compatible
> > +  - reg
> > +
> > +additionalProperties: false
> 
> unevaluatedProperties: false

Replace additionalProperties with unevaluatedProperties, right?

Shawn
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/power/reset/qcom,pon.txt b/Documentation/devicetree/bindings/power/reset/qcom,pon.txt
deleted file mode 100644
index 0c0dc3a1e693..000000000000
--- a/Documentation/devicetree/bindings/power/reset/qcom,pon.txt
+++ /dev/null
@@ -1,49 +0,0 @@ 
-Qualcomm PON Device
-
-The Power On device for Qualcomm PM8xxx is MFD supporting pwrkey
-and resin along with the Android reboot-mode.
-
-This DT node has pwrkey and resin as sub nodes.
-
-Required Properties:
--compatible: Must be one of:
-	"qcom,pm8916-pon"
-	"qcom,pms405-pon"
-	"qcom,pm8998-pon"
-
--reg: Specifies the physical address of the pon register
-
-Optional subnode:
--pwrkey: Specifies the subnode pwrkey and should follow the
- qcom,pm8941-pwrkey.txt description.
--resin: Specifies the subnode resin and should follow the
- qcom,pm8xxx-pwrkey.txt description.
-
-The rest of the properties should follow the generic reboot-mode description
-found in reboot-mode.txt
-
-Example:
-
-	pon@800 {
-		compatible = "qcom,pm8916-pon";
-
-		reg = <0x800>;
-		mode-bootloader = <0x2>;
-		mode-recovery = <0x1>;
-
-		pwrkey {
-			compatible = "qcom,pm8941-pwrkey";
-			interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;
-			debounce = <15625>;
-			bias-pull-up;
-			linux,code = <KEY_POWER>;
-		};
-
-		resin {
-			compatible = "qcom,pm8941-resin";
-			interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>;
-			debounce = <15625>;
-			bias-pull-up;
-			linux,code = <KEY_VOLUMEDOWN>;
-		};
-	};
diff --git a/Documentation/devicetree/bindings/power/reset/qcom,pon.yaml b/Documentation/devicetree/bindings/power/reset/qcom,pon.yaml
new file mode 100644
index 000000000000..7764c804af1d
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/reset/qcom,pon.yaml
@@ -0,0 +1,49 @@ 
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/power/reset/qcom,pon.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm PON Device
+
+maintainers:
+  - Vinod Koul <vkoul@kernel.org>
+
+description: |
+  The Power On device for Qualcomm PM8xxx is MFD supporting pwrkey
+  and resin along with the Android reboot-mode.
+
+properties:
+  compatible:
+    enum:
+      - qcom,pm8916-pon
+      - qcom,pms405-pon
+      - qcom,pm8998-pon
+
+  reg:
+    maxItems: 1
+
+patternProperties:
+  "^mode-.+":
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description: Vendor-specific mode value written to the mode register
+
+required:
+  - compatible
+  - reg
+
+additionalProperties: false
+
+examples:
+  - |
+    pmic {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        pon@800 {
+            compatible = "qcom,pm8916-pon";
+            reg = <0x800>;
+            mode-bootloader = <0x2>;
+            mode-recovery = <0x1>;
+        };
+    };