diff mbox series

dt-bindings: regulator: mediatek,mt6397-regulator: convert to YAML

Message ID 20240806122507.2766-1-macpaul.lin@mediatek.com (mailing list archive)
State New
Headers show
Series dt-bindings: regulator: mediatek,mt6397-regulator: convert to YAML | expand

Commit Message

Macpaul Lin Aug. 6, 2024, 12:25 p.m. UTC
Convert the MediaTek MT6397 regulator bindings to DT schema.

Signed-off-by: Sen Chu <sen.chu@mediatek.com>
Signed-off-by: Macpaul Lin <macpaul.lin@mediatek.com>
---
 .../regulator/mediatek,mt6397-regulator.yaml  | 275 ++++++++++++++++++
 .../bindings/regulator/mt6397-regulator.txt   | 220 --------------
 2 files changed, 275 insertions(+), 220 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/regulator/mediatek,mt6397-regulator.yaml
 delete mode 100644 Documentation/devicetree/bindings/regulator/mt6397-regulator.txt

Comments

Krzysztof Kozlowski Aug. 6, 2024, 1:41 p.m. UTC | #1
On 06/08/2024 14:25, Macpaul Lin wrote:
> Convert the MediaTek MT6397 regulator bindings to DT schema.
> 
> Signed-off-by: Sen Chu <sen.chu@mediatek.com>
> Signed-off-by: Macpaul Lin <macpaul.lin@mediatek.com>


> +
> +patternProperties:
> +  "^(buck_)?v(core|drm|gpu|io18|pca(7|15)|sramca(7|15))$":
> +    description: Buck regulators
> +    type: object
> +    $ref: regulator.yaml#
> +    properties:
> +      regulator-allowed-modes:
> +        description: |
> +          BUCK regulators can set regulator-initial-mode and regulator-allowed-modes to
> +          values specified in dt-bindings/regulator/mediatek,mt6397-regulator.h
> +        items:
> +          enum: [0, 1]
> +      regulator-compatible:
> +        pattern: "^(buck_)?v(core|drm|gpu|io18|pca(7|15)|sramca(7|15))$"

This should not be needed. Same in every other place.

> +    unevaluatedProperties: false
> +
> +  "^(ldo_)?v(tcxo|(a|io)28)$":
> +    description: LDOs with fixed 2.8V output and 0~100/10mV tuning
> +    type: object
> +    $ref: regulator.yaml#
> +    properties:
> +      regulator-allowed-modes: false
> +      regulator-compatible:
> +        pattern: "^(ldo_)?v(tcxo|(a|io)28)$"
> +    unevaluatedProperties: false
> +
> +  "^(ldo_)?vusb$":
> +    description: LDOs with fixed 3.0V output and 0~100/10mV tuning
> +    type: object
> +    $ref: regulator.yaml#
> +    properties:
> +      regulator-allowed-modes: false
> +      regulator-compatible:
> +        pattern: "^(ldo_)?vusb$"
> +    unevaluatedProperties: false
> +
> +  "^(ldo_)?v(cama|emc3v3|gp[123456]|ibr|mc|mch)$":
> +    description: LDOs with variable output and 0~100/10mV tuning
> +    type: object
> +    $ref: regulator.yaml#
> +    properties:
> +      regulator-allowed-modes: false
> +      regulator-compatible:
> +        pattern: "^(ldo_)?v(cama|emc3v3|gp[123456]|ibr|mc|mch)$"
> +    unevaluatedProperties: false
> +
> +required:
> +  - compatible
> +
> +additionalProperties: false
> +
> +examples:
> +  - |
> +    #include <dt-bindings/interrupt-controller/arm-gic.h>
> +
> +    pwrap {
> +       	pmic {
> +            compatible = "mediatek,mt6397";

Messed indentation.

Use 4 spaces for example indentation.

Anyway, drop top node or better move the example to the parent device
schema making it complete.

> +
> +            mt6397regulator: mt6397regulator {

Node names should be generic. See also an explanation and list of
examples (not exhaustive) in DT specification:
https://devicetree-specification.readthedocs.io/en/latest/chapter2-devicetree-basics.html#generic-names-recommendation


> +                compatible = "mediatek,mt6397-regulator";
> +
> +                mt6397_vpca15_reg: buck_vpca15 {
> +                    regulator-compatible = "buck_vpca15";

Drop, same in other places

> +                    regulator-name = "vpca15";
> +                    regulator-min-microvolt = < 850000>;
> +                    regulator-max-microvolt = <1350000>;
> +                    regulator-ramp-delay = <12500>;
> +                    regulator-enable-ramp-delay = <200>;
> +                };
> +


;

Best regards,
Krzysztof
Rob Herring (Arm) Aug. 6, 2024, 1:49 p.m. UTC | #2
On Tue, 06 Aug 2024 20:25:07 +0800, Macpaul Lin wrote:
> Convert the MediaTek MT6397 regulator bindings to DT schema.
> 
> Signed-off-by: Sen Chu <sen.chu@mediatek.com>
> Signed-off-by: Macpaul Lin <macpaul.lin@mediatek.com>
> ---
>  .../regulator/mediatek,mt6397-regulator.yaml  | 275 ++++++++++++++++++
>  .../bindings/regulator/mt6397-regulator.txt   | 220 --------------
>  2 files changed, 275 insertions(+), 220 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/regulator/mediatek,mt6397-regulator.yaml
>  delete mode 100644 Documentation/devicetree/bindings/regulator/mt6397-regulator.txt
> 

My bot found errors running 'make dt_binding_check' on your patch:

yamllint warnings/errors:

dtschema/dtc warnings/errors:
Documentation/devicetree/bindings/regulator/mediatek,mt6397-regulator.example.dtb: /example-0/pwrap/pmic: failed to match any schema with compatible: ['mediatek,mt6397']

doc reference errors (make refcheckdocs):

See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20240806122507.2766-1-macpaul.lin@mediatek.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.
Mark Brown Aug. 6, 2024, 8:45 p.m. UTC | #3
On Tue, Aug 06, 2024 at 08:25:07PM +0800, Macpaul Lin wrote:
> Convert the MediaTek MT6397 regulator bindings to DT schema.

As documented in submitting-patches.rst please send patches to the 
maintainers for the code you would like to change.  The normal kernel
workflow is that people apply patches from their inboxes, if they aren't
copied they are likely to not see the patch at all and it is much more
difficult to apply patches.
Macpaul Lin Aug. 7, 2024, 4:09 a.m. UTC | #4
On 8/6/24 21:49, Rob Herring (Arm) wrote:
> 	
> 
> External email : Please do not click links or open attachments until you 
> have verified the sender or the content.
> 
> On Tue, 06 Aug 2024 20:25:07 +0800, Macpaul Lin wrote:
>> Convert the MediaTek MT6397 regulator bindings to DT schema.
>> 
>> Signed-off-by: Sen Chu <sen.chu@mediatek.com>
>> Signed-off-by: Macpaul Lin <macpaul.lin@mediatek.com>
>> ---
>>  .../regulator/mediatek,mt6397-regulator.yaml  | 275 ++++++++++++++++++
>>  .../bindings/regulator/mt6397-regulator.txt   | 220 --------------
>>  2 files changed, 275 insertions(+), 220 deletions(-)
>>  create mode 100644 Documentation/devicetree/bindings/regulator/mediatek,mt6397-regulator.yaml
>>  delete mode 100644 Documentation/devicetree/bindings/regulator/mt6397-regulator.txt
>> 
> 
> My bot found errors running 'make dt_binding_check' on your patch:
> 
> yamllint warnings/errors:
> 
> dtschema/dtc warnings/errors:
> Documentation/devicetree/bindings/regulator/mediatek,mt6397-regulator.example.dtb: /example-0/pwrap/pmic: failed to match any schema with compatible: ['mediatek,mt6397']

Thanks for the reminding.

I'm already using the latest dtschema (2024.05).
I've found the difference that I find this error because I'm always 
using the command to run dt_binding_check.
"make dt_binding_check DT_SCHEMA_FILES=mediatek,mt6397-regulator.yaml"

After I've replace the command to full dt_binding_check, I can find this 
error now with "make dt_binding_check".

Just report the difference of running checking tools.
I'll fix this error in the next patch. Thanks!

> doc reference errors (make refcheckdocs):
> 
> See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20240806122507.2766-1-macpaul.lin@mediatek.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.
> 

Best regards,
Macpaul Lin
Macpaul Lin Aug. 7, 2024, 10:32 a.m. UTC | #5
On 8/6/24 21:41, Krzysztof Kozlowski wrote:
> 	
> 
> External email : Please do not click links or open attachments until you 
> have verified the sender or the content.
> 
> On 06/08/2024 14:25, Macpaul Lin wrote:
>> Convert the MediaTek MT6397 regulator bindings to DT schema.
>> 
>> Signed-off-by: Sen Chu <sen.chu@mediatek.com>
>> Signed-off-by: Macpaul Lin <macpaul.lin@mediatek.com>
> 
> 
>> +
>> +patternProperties:
>> +  "^(buck_)?v(core|drm|gpu|io18|pca(7|15)|sramca(7|15))$":
>> +    description: Buck regulators
>> +    type: object
>> +    $ref: regulator.yaml#
>> +    properties:
>> +      regulator-allowed-modes:
>> +        description: |
>> +          BUCK regulators can set regulator-initial-mode and regulator-allowed-modes to
>> +          values specified in dt-bindings/regulator/mediatek,mt6397-regulator.h
>> +        items:
>> +          enum: [0, 1]
>> +      regulator-compatible:
>> +        pattern: "^(buck_)?v(core|drm|gpu|io18|pca(7|15)|sramca(7|15))$"
> 
> This should not be needed. Same in every other place.
> 
>> +    unevaluatedProperties: false
>> +
>> +  "^(ldo_)?v(tcxo|(a|io)28)$":
>> +    description: LDOs with fixed 2.8V output and 0~100/10mV tuning
>> +    type: object
>> +    $ref: regulator.yaml#
>> +    properties:
>> +      regulator-allowed-modes: false
>> +      regulator-compatible:
>> +        pattern: "^(ldo_)?v(tcxo|(a|io)28)$"
>> +    unevaluatedProperties: false
>> +
>> +  "^(ldo_)?vusb$":
>> +    description: LDOs with fixed 3.0V output and 0~100/10mV tuning
>> +    type: object
>> +    $ref: regulator.yaml#
>> +    properties:
>> +      regulator-allowed-modes: false
>> +      regulator-compatible:
>> +        pattern: "^(ldo_)?vusb$"
>> +    unevaluatedProperties: false
>> +
>> +  "^(ldo_)?v(cama|emc3v3|gp[123456]|ibr|mc|mch)$":
>> +    description: LDOs with variable output and 0~100/10mV tuning
>> +    type: object
>> +    $ref: regulator.yaml#
>> +    properties:
>> +      regulator-allowed-modes: false
>> +      regulator-compatible:
>> +        pattern: "^(ldo_)?v(cama|emc3v3|gp[123456]|ibr|mc|mch)$"
>> +    unevaluatedProperties: false
>> +
>> +required:
>> +  - compatible
>> +
>> +additionalProperties: false
>> +
>> +examples:
>> +  - |
>> +    #include <dt-bindings/interrupt-controller/arm-gic.h>
>> +
>> +    pwrap {
>> +       pmic {
>> +            compatible = "mediatek,mt6397";
> 
> Messed indentation.
> 
> Use 4 spaces for example indentation.
> 
> Anyway, drop top node or better move the example to the parent device
> schema making it complete.
> 
>> +
>> +            mt6397regulator: mt6397regulator {
> 
> Node names should be generic. See also an explanation and list of
> examples (not exhaustive) in DT specification:
> https://devicetree-specification.readthedocs.io/en/latest/chapter2-devicetree-basics.html#generic-names-recommendation  <https://urldefense.com/v3/__https://devicetree-specification.readthedocs.io/en/latest/chapter2-devicetree-basics.html*generic-names-recommendation__;Iw!!CTRNKA9wMg0ARbw!ngXiiQwr5k1xuQ409K5BEaN120H9jRtwvbdy_u_VFuelciqoBoAYCD6Pi09Sy5YS3wfeZ5m876QLGXgDi-Pm8V4O08-MZ7s$>
> 
> 
>> +                compatible = "mediatek,mt6397-regulator";
>> +
>> +                mt6397_vpca15_reg: buck_vpca15 {
>> +                    regulator-compatible = "buck_vpca15";
> 
> Drop, same in other places
> 
>> +                    regulator-name = "vpca15";
>> +                    regulator-min-microvolt = < 850000>;
>> +                    regulator-max-microvolt = <1350000>;
>> +                    regulator-ramp-delay = <12500>;
>> +                    regulator-enable-ramp-delay = <200>;
>> +                };
>> +
> 
> 
> ;
> 
> Best regards,
> Krzysztof
> 

Thanks for the review.
All above issues should be fixed in patch v2 [1]
[1] https://lkml.org/lkml/2024/8/7/520

Best regards,
Macpaul Lin
Krzysztof Kozlowski Aug. 8, 2024, 12:05 p.m. UTC | #6
On 07/08/2024 12:32, Macpaul Lin wrote:
>>> +  - |
>>> +    #include <dt-bindings/interrupt-controller/arm-gic.h>
>>> +
>>> +    pwrap {
>>> +       pmic {
>>> +            compatible = "mediatek,mt6397";
>>
>> Messed indentation.
>>
>> Use 4 spaces for example indentation.
>>
>> Anyway, drop top node or better move the example to the parent device
>> schema making it complete.

Look at this comment. I asked you to move to the parent device schema...

Best regards,
Krzysztof
Macpaul Lin Aug. 9, 2024, 5:59 a.m. UTC | #7
On 8/8/24 20:05, Krzysztof Kozlowski wrote:
> 	
> 
> External email : Please do not click links or open attachments until you 
> have verified the sender or the content.
> 
> On 07/08/2024 12:32, Macpaul Lin wrote:
>>>> +  - |
>>>> +    #include <dt-bindings/interrupt-controller/arm-gic.h>
>>>> +
>>>> +    pwrap {
>>>> +       pmic {
>>>> +            compatible = "mediatek,mt6397";
>>>
>>> Messed indentation.
>>>
>>> Use 4 spaces for example indentation.
>>>
>>> Anyway, drop top node or better move the example to the parent device
>>> schema making it complete.
> 
> Look at this comment. I asked you to move to the parent device schema...
> 
> Best regards,
> Krzysztof
> 

I would like to ensure that the progress can be made step by step.

Since I am not specifically responsible for this driver, I cannot 
determine when I will be able to modify the next file after completing 
one today.
Will it be tomorrow? Perhaps in a few months?
There is also the possibility that I might have to pause midway due to 
other job assignments.

Additionally, I need to obtain approval from other internal colleagues.
I am pleased to have received permission to modify 
mfd/mediatek,mt6397.yaml the day after I submitted this conversion of 
mt6397-regulator.

I was intend to split the example parts of the patches into 3 parts 
seprately, mt6397-regulator.yaml, mfd/mediatek,mt6397.yaml,i
then moving the examples from mt6397-regulator.yaml to 
mfd/mediatek,mt6397.yaml, move the content to parent device step by step.

I will include the example part in next version patch in 
mfd/mediatek,mt6397.yaml.

Thanks for the reminder.
Macpaul Lin
Krzysztof Kozlowski Aug. 10, 2024, 1:23 p.m. UTC | #8
On 09/08/2024 07:59, Macpaul Lin wrote:
> 
> 
> On 8/8/24 20:05, Krzysztof Kozlowski wrote:
>> 	
>>
>> External email : Please do not click links or open attachments until you 
>> have verified the sender or the content.
>>
>> On 07/08/2024 12:32, Macpaul Lin wrote:
>>>>> +  - |
>>>>> +    #include <dt-bindings/interrupt-controller/arm-gic.h>
>>>>> +
>>>>> +    pwrap {
>>>>> +       pmic {
>>>>> +            compatible = "mediatek,mt6397";
>>>>
>>>> Messed indentation.
>>>>
>>>> Use 4 spaces for example indentation.
>>>>
>>>> Anyway, drop top node or better move the example to the parent device
>>>> schema making it complete.
>>
>> Look at this comment. I asked you to move to the parent device schema...
>>
>> Best regards,
>> Krzysztof
>>
> 
> I would like to ensure that the progress can be made step by step.
> 
> Since I am not specifically responsible for this driver, I cannot 
> determine when I will be able to modify the next file after completing 
> one today.
> Will it be tomorrow? Perhaps in a few months?
> There is also the possibility that I might have to pause midway due to 
> other job assignments.
> 
> Additionally, I need to obtain approval from other internal colleagues.
> I am pleased to have received permission to modify 
> mfd/mediatek,mt6397.yaml the day after I submitted this conversion of 
> mt6397-regulator.

Heh, that's surprising. Anyone can change any piece of code, that's the
beauty of open-source.

> 
> I was intend to split the example parts of the patches into 3 parts 
> seprately, mt6397-regulator.yaml, mfd/mediatek,mt6397.yaml,i
> then moving the examples from mt6397-regulator.yaml to 
> mfd/mediatek,mt6397.yaml, move the content to parent device step by step.
> 
> I will include the example part in next version patch in 
> mfd/mediatek,mt6397.yaml.

Sure, do it step-by-step, but then due to dependencies wait till each
one gets into released kernel...


Best regards,
Krzysztof
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/regulator/mediatek,mt6397-regulator.yaml b/Documentation/devicetree/bindings/regulator/mediatek,mt6397-regulator.yaml
new file mode 100644
index 0000000..c5e8df0
--- /dev/null
+++ b/Documentation/devicetree/bindings/regulator/mediatek,mt6397-regulator.yaml
@@ -0,0 +1,275 @@ 
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/regulator/mediatek,mt6397-regulator.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: MediaTek MT6397 Regulator
+
+maintainers:
+  - Sen Chu <sen.chu@mediatek.com>
+  - Macpaul Lin <macpaul.lin@mediatek.com>
+
+description:
+  Regulator node of the PMIC. This node should under the PMIC's device node.
+  All voltage regulators provided by the PMIC are described as sub-nodes of
+  this node.
+
+properties:
+  compatible:
+    items:
+      - const: mediatek,mt6397-regulator
+
+patternProperties:
+  "^(buck_)?v(core|drm|gpu|io18|pca(7|15)|sramca(7|15))$":
+    description: Buck regulators
+    type: object
+    $ref: regulator.yaml#
+    properties:
+      regulator-allowed-modes:
+        description: |
+          BUCK regulators can set regulator-initial-mode and regulator-allowed-modes to
+          values specified in dt-bindings/regulator/mediatek,mt6397-regulator.h
+        items:
+          enum: [0, 1]
+      regulator-compatible:
+        pattern: "^(buck_)?v(core|drm|gpu|io18|pca(7|15)|sramca(7|15))$"
+    unevaluatedProperties: false
+
+  "^(ldo_)?v(tcxo|(a|io)28)$":
+    description: LDOs with fixed 2.8V output and 0~100/10mV tuning
+    type: object
+    $ref: regulator.yaml#
+    properties:
+      regulator-allowed-modes: false
+      regulator-compatible:
+        pattern: "^(ldo_)?v(tcxo|(a|io)28)$"
+    unevaluatedProperties: false
+
+  "^(ldo_)?vusb$":
+    description: LDOs with fixed 3.0V output and 0~100/10mV tuning
+    type: object
+    $ref: regulator.yaml#
+    properties:
+      regulator-allowed-modes: false
+      regulator-compatible:
+        pattern: "^(ldo_)?vusb$"
+    unevaluatedProperties: false
+
+  "^(ldo_)?v(cama|emc3v3|gp[123456]|ibr|mc|mch)$":
+    description: LDOs with variable output and 0~100/10mV tuning
+    type: object
+    $ref: regulator.yaml#
+    properties:
+      regulator-allowed-modes: false
+      regulator-compatible:
+        pattern: "^(ldo_)?v(cama|emc3v3|gp[123456]|ibr|mc|mch)$"
+    unevaluatedProperties: false
+
+required:
+  - compatible
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+    pwrap {
+       	pmic {
+            compatible = "mediatek,mt6397";
+
+            mt6397regulator: mt6397regulator {
+                compatible = "mediatek,mt6397-regulator";
+
+                mt6397_vpca15_reg: buck_vpca15 {
+                    regulator-compatible = "buck_vpca15";
+                    regulator-name = "vpca15";
+                    regulator-min-microvolt = < 850000>;
+                    regulator-max-microvolt = <1350000>;
+                    regulator-ramp-delay = <12500>;
+                    regulator-enable-ramp-delay = <200>;
+                };
+
+                mt6397_vpca7_reg: buck_vpca7 {
+                    regulator-compatible = "buck_vpca7";
+                    regulator-name = "vpca7";
+                    regulator-min-microvolt = < 850000>;
+                    regulator-max-microvolt = <1350000>;
+                    regulator-ramp-delay = <12500>;
+                    regulator-enable-ramp-delay = <115>;
+                };
+
+                mt6397_vsramca15_reg: buck_vsramca15 {
+                    regulator-compatible = "buck_vsramca15";
+                    regulator-name = "vsramca15";
+                    regulator-min-microvolt = < 850000>;
+                    regulator-max-microvolt = <1350000>;
+                    regulator-ramp-delay = <12500>;
+                    regulator-enable-ramp-delay = <115>;
+                };
+
+                mt6397_vsramca7_reg: buck_vsramca7 {
+                    regulator-compatible = "buck_vsramca7";
+                    regulator-name = "vsramca7";
+                    regulator-min-microvolt = < 850000>;
+                    regulator-max-microvolt = <1350000>;
+                    regulator-ramp-delay = <12500>;
+                    regulator-enable-ramp-delay = <115>;
+                };
+
+                mt6397_vcore_reg: buck_vcore {
+                    regulator-compatible = "buck_vcore";
+                    regulator-name = "vcore";
+                    regulator-min-microvolt = < 850000>;
+                    regulator-max-microvolt = <1350000>;
+                    regulator-ramp-delay = <12500>;
+                    regulator-enable-ramp-delay = <115>;
+                };
+
+                mt6397_vgpu_reg: buck_vgpu {
+                    regulator-compatible = "buck_vgpu";
+                    regulator-name = "vgpu";
+                    regulator-min-microvolt = < 700000>;
+                    regulator-max-microvolt = <1350000>;
+                    regulator-ramp-delay = <12500>;
+                    regulator-enable-ramp-delay = <115>;
+                };
+
+                mt6397_vdrm_reg: buck_vdrm {
+                    regulator-compatible = "buck_vdrm";
+                    regulator-name = "vdrm";
+                    regulator-min-microvolt = < 800000>;
+                    regulator-max-microvolt = <1400000>;
+                    regulator-ramp-delay = <12500>;
+                    regulator-enable-ramp-delay = <500>;
+                };
+
+                mt6397_vio18_reg: buck_vio18 {
+                    regulator-compatible = "buck_vio18";
+                    regulator-name = "vio18";
+                    regulator-min-microvolt = <1500000>;
+                    regulator-max-microvolt = <2120000>;
+                    regulator-ramp-delay = <12500>;
+                    regulator-enable-ramp-delay = <500>;
+                };
+
+                mt6397_vtcxo_reg: ldo_vtcxo {
+                    regulator-compatible = "ldo_vtcxo";
+                    regulator-name = "vtcxo";
+                    regulator-min-microvolt = <2800000>;
+                    regulator-max-microvolt = <2800000>;
+                    regulator-enable-ramp-delay = <90>;
+                };
+
+                mt6397_va28_reg: ldo_va28 {
+                    regulator-compatible = "ldo_va28";
+                    regulator-name = "va28";
+                    /* fixed output 2.8 V */
+                    regulator-enable-ramp-delay = <218>;
+                };
+
+                mt6397_vcama_reg: ldo_vcama {
+                    regulator-compatible = "ldo_vcama";
+                    regulator-name = "vcama";
+                    regulator-min-microvolt = <1500000>;
+                    regulator-max-microvolt = <2800000>;
+                    regulator-enable-ramp-delay = <218>;
+                };
+
+                mt6397_vio28_reg: ldo_vio28 {
+                    regulator-compatible = "ldo_vio28";
+                    regulator-name = "vio28";
+                    /* fixed output 2.8 V */
+                    regulator-enable-ramp-delay = <240>;
+                };
+
+                mt6397_usb_reg: ldo_vusb {
+                    regulator-compatible = "ldo_vusb";
+                    regulator-name = "vusb";
+                    /* fixed output 3.3 V */
+                    regulator-enable-ramp-delay = <218>;
+                };
+
+                mt6397_vmc_reg: ldo_vmc {
+                    regulator-compatible = "ldo_vmc";
+                    regulator-name = "vmc";
+                    regulator-min-microvolt = <1800000>;
+                    regulator-max-microvolt = <3300000>;
+                    regulator-enable-ramp-delay = <218>;
+                };
+
+                mt6397_vmch_reg: ldo_vmch {
+                    regulator-compatible = "ldo_vmch";
+                    regulator-name = "vmch";
+                    regulator-min-microvolt = <3000000>;
+                    regulator-max-microvolt = <3300000>;
+                    regulator-enable-ramp-delay = <218>;
+                };
+
+                mt6397_vemc_3v3_reg: ldo_vemc3v3 {
+                    regulator-compatible = "ldo_vemc3v3";
+                    regulator-name = "vemc_3v3";
+                    regulator-min-microvolt = <3000000>;
+                    regulator-max-microvolt = <3300000>;
+                    regulator-enable-ramp-delay = <218>;
+                };
+
+                mt6397_vgp1_reg: ldo_vgp1 {
+                    regulator-compatible = "ldo_vgp1";
+                    regulator-name = "vcamd";
+                    regulator-min-microvolt = <1220000>;
+                    regulator-max-microvolt = <3300000>;
+                    regulator-enable-ramp-delay = <240>;
+                };
+
+                mt6397_vgp2_reg: ldo_vgp2 {
+                    regulator-compatible = "ldo_vgp2";
+                    regulator-name = "vcamio";
+                    regulator-min-microvolt = <1000000>;
+                    regulator-max-microvolt = <3300000>;
+                    regulator-enable-ramp-delay = <218>;
+                };
+
+                mt6397_vgp3_reg: ldo_vgp3 {
+                    regulator-compatible = "ldo_vgp3";
+                    regulator-name = "vcamaf";
+                    regulator-min-microvolt = <1200000>;
+                    regulator-max-microvolt = <3300000>;
+                    regulator-enable-ramp-delay = <218>;
+                };
+
+                mt6397_vgp4_reg: ldo_vgp4 {
+                    regulator-compatible = "ldo_vgp4";
+                    regulator-name = "vgp4";
+                    regulator-min-microvolt = <1200000>;
+                    regulator-max-microvolt = <3300000>;
+                    regulator-enable-ramp-delay = <218>;
+                };
+
+                mt6397_vgp5_reg: ldo_vgp5 {
+                    regulator-compatible = "ldo_vgp5";
+                    regulator-name = "vgp5";
+                    regulator-min-microvolt = <1200000>;
+                    regulator-max-microvolt = <3000000>;
+                    regulator-enable-ramp-delay = <218>;
+                };
+
+                mt6397_vgp6_reg: ldo_vgp6 {
+                    regulator-compatible = "ldo_vgp6";
+                    regulator-name = "vgp6";
+                    regulator-min-microvolt = <1200000>;
+                    regulator-max-microvolt = <3300000>;
+                    regulator-enable-ramp-delay = <218>;
+                };
+
+                mt6397_vibr_reg: ldo_vibr {
+                    regulator-compatible = "ldo_vibr";
+                    regulator-name = "vibr";
+                    regulator-min-microvolt = <1200000>;
+                    regulator-max-microvolt = <3300000>;
+                    regulator-enable-ramp-delay = <218>;
+                };
+            };
+        };
+    };
diff --git a/Documentation/devicetree/bindings/regulator/mt6397-regulator.txt b/Documentation/devicetree/bindings/regulator/mt6397-regulator.txt
deleted file mode 100644
index c080086..0000000
--- a/Documentation/devicetree/bindings/regulator/mt6397-regulator.txt
+++ /dev/null
@@ -1,220 +0,0 @@ 
-Mediatek MT6397 Regulator
-
-Required properties:
-- compatible: "mediatek,mt6397-regulator"
-- mt6397regulator: List of regulators provided by this controller. It is named
-  according to its regulator type, buck_<name> and ldo_<name>.
-  The definition for each of these nodes is defined using the standard binding
-  for regulators at Documentation/devicetree/bindings/regulator/regulator.txt.
-
-The valid names for regulators are::
-BUCK:
-  buck_vpca15, buck_vpca7, buck_vsramca15, buck_vsramca7, buck_vcore, buck_vgpu,
-  buck_vdrm, buck_vio18
-LDO:
-  ldo_vtcxo, ldo_va28, ldo_vcama, ldo_vio28, ldo_vusb, ldo_vmc, ldo_vmch,
-  ldo_vemc3v3, ldo_vgp1, ldo_vgp2, ldo_vgp3, ldo_vgp4, ldo_vgp5, ldo_vgp6,
-  ldo_vibr
-
-BUCK regulators can set regulator-initial-mode and regulator-allowed-modes to
-values specified in dt-bindings/regulator/mediatek,mt6397-regulator.h
-
-Example:
-	pmic {
-		compatible = "mediatek,mt6397";
-
-		mt6397regulator: mt6397regulator {
-			compatible = "mediatek,mt6397-regulator";
-
-			mt6397_vpca15_reg: buck_vpca15 {
-				regulator-compatible = "buck_vpca15";
-				regulator-name = "vpca15";
-				regulator-min-microvolt = < 850000>;
-				regulator-max-microvolt = <1350000>;
-				regulator-ramp-delay = <12500>;
-				regulator-enable-ramp-delay = <200>;
-			};
-
-			mt6397_vpca7_reg: buck_vpca7 {
-				regulator-compatible = "buck_vpca7";
-				regulator-name = "vpca7";
-				regulator-min-microvolt = < 850000>;
-				regulator-max-microvolt = <1350000>;
-				regulator-ramp-delay = <12500>;
-				regulator-enable-ramp-delay = <115>;
-			};
-
-			mt6397_vsramca15_reg: buck_vsramca15 {
-				regulator-compatible = "buck_vsramca15";
-				regulator-name = "vsramca15";
-				regulator-min-microvolt = < 850000>;
-				regulator-max-microvolt = <1350000>;
-				regulator-ramp-delay = <12500>;
-				regulator-enable-ramp-delay = <115>;
-
-			};
-
-			mt6397_vsramca7_reg: buck_vsramca7 {
-				regulator-compatible = "buck_vsramca7";
-				regulator-name = "vsramca7";
-				regulator-min-microvolt = < 850000>;
-				regulator-max-microvolt = <1350000>;
-				regulator-ramp-delay = <12500>;
-				regulator-enable-ramp-delay = <115>;
-
-			};
-
-			mt6397_vcore_reg: buck_vcore {
-				regulator-compatible = "buck_vcore";
-				regulator-name = "vcore";
-				regulator-min-microvolt = < 850000>;
-				regulator-max-microvolt = <1350000>;
-				regulator-ramp-delay = <12500>;
-				regulator-enable-ramp-delay = <115>;
-			};
-
-			mt6397_vgpu_reg: buck_vgpu {
-				regulator-compatible = "buck_vgpu";
-				regulator-name = "vgpu";
-				regulator-min-microvolt = < 700000>;
-				regulator-max-microvolt = <1350000>;
-				regulator-ramp-delay = <12500>;
-				regulator-enable-ramp-delay = <115>;
-			};
-
-			mt6397_vdrm_reg: buck_vdrm {
-				regulator-compatible = "buck_vdrm";
-				regulator-name = "vdrm";
-				regulator-min-microvolt = < 800000>;
-				regulator-max-microvolt = <1400000>;
-				regulator-ramp-delay = <12500>;
-				regulator-enable-ramp-delay = <500>;
-			};
-
-			mt6397_vio18_reg: buck_vio18 {
-				regulator-compatible = "buck_vio18";
-				regulator-name = "vio18";
-				regulator-min-microvolt = <1500000>;
-				regulator-max-microvolt = <2120000>;
-				regulator-ramp-delay = <12500>;
-				regulator-enable-ramp-delay = <500>;
-			};
-
-			mt6397_vtcxo_reg: ldo_vtcxo {
-				regulator-compatible = "ldo_vtcxo";
-				regulator-name = "vtcxo";
-				regulator-min-microvolt = <2800000>;
-				regulator-max-microvolt = <2800000>;
-				regulator-enable-ramp-delay = <90>;
-			};
-
-			mt6397_va28_reg: ldo_va28 {
-				regulator-compatible = "ldo_va28";
-				regulator-name = "va28";
-				/* fixed output 2.8 V */
-				regulator-enable-ramp-delay = <218>;
-			};
-
-			mt6397_vcama_reg: ldo_vcama {
-				regulator-compatible = "ldo_vcama";
-				regulator-name = "vcama";
-				regulator-min-microvolt = <1500000>;
-				regulator-max-microvolt = <2800000>;
-				regulator-enable-ramp-delay = <218>;
-			};
-
-			mt6397_vio28_reg: ldo_vio28 {
-				regulator-compatible = "ldo_vio28";
-				regulator-name = "vio28";
-				/* fixed output 2.8 V */
-				regulator-enable-ramp-delay = <240>;
-			};
-
-			mt6397_usb_reg: ldo_vusb {
-				regulator-compatible = "ldo_vusb";
-				regulator-name = "vusb";
-				/* fixed output 3.3 V */
-				regulator-enable-ramp-delay = <218>;
-			};
-
-			mt6397_vmc_reg: ldo_vmc {
-				regulator-compatible = "ldo_vmc";
-				regulator-name = "vmc";
-				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-enable-ramp-delay = <218>;
-			};
-
-			mt6397_vmch_reg: ldo_vmch {
-				regulator-compatible = "ldo_vmch";
-				regulator-name = "vmch";
-				regulator-min-microvolt = <3000000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-enable-ramp-delay = <218>;
-			};
-
-			mt6397_vemc_3v3_reg: ldo_vemc3v3 {
-				regulator-compatible = "ldo_vemc3v3";
-				regulator-name = "vemc_3v3";
-				regulator-min-microvolt = <3000000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-enable-ramp-delay = <218>;
-			};
-
-			mt6397_vgp1_reg: ldo_vgp1 {
-				regulator-compatible = "ldo_vgp1";
-				regulator-name = "vcamd";
-				regulator-min-microvolt = <1220000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-enable-ramp-delay = <240>;
-			};
-
-			mt6397_vgp2_reg: ldo_vgp2 {
-				egulator-compatible = "ldo_vgp2";
-				regulator-name = "vcamio";
-				regulator-min-microvolt = <1000000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-enable-ramp-delay = <218>;
-			};
-
-			mt6397_vgp3_reg: ldo_vgp3 {
-				regulator-compatible = "ldo_vgp3";
-				regulator-name = "vcamaf";
-				regulator-min-microvolt = <1200000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-enable-ramp-delay = <218>;
-			};
-
-			mt6397_vgp4_reg: ldo_vgp4 {
-				regulator-compatible = "ldo_vgp4";
-				regulator-name = "vgp4";
-				regulator-min-microvolt = <1200000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-enable-ramp-delay = <218>;
-			};
-
-			mt6397_vgp5_reg: ldo_vgp5 {
-				regulator-compatible = "ldo_vgp5";
-				regulator-name = "vgp5";
-				regulator-min-microvolt = <1200000>;
-				regulator-max-microvolt = <3000000>;
-				regulator-enable-ramp-delay = <218>;
-			};
-
-			mt6397_vgp6_reg: ldo_vgp6 {
-				regulator-compatible = "ldo_vgp6";
-				regulator-name = "vgp6";
-				regulator-min-microvolt = <1200000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-enable-ramp-delay = <218>;
-			};
-
-			mt6397_vibr_reg: ldo_vibr {
-				regulator-compatible = "ldo_vibr";
-				regulator-name = "vibr";
-				regulator-min-microvolt = <1200000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-enable-ramp-delay = <218>;
-			};
-		};
-	};