drivers: regulator: pca9420: use standard regulator-min|max-microvolt

regulator.yaml provides now standard properties for minimum/maximum voltage. Signed-off-by: Gerard Marull-Paretas <[email protected]>
chrta · Nov 29, 2022 · f89405c · f89405c
1 parent a175e68
commit f89405c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 28 deletions.
diff --git a/boards/arm/mimxrt595_evk/mimxrt595_evk_cm33.dts b/boards/arm/mimxrt595_evk/mimxrt595_evk_cm33.dts
@@ -193,8 +193,8 @@ arduino_serial: &flexcomm12 {
 			enable-reg = <PCA9420_MODECFG_0_2>;
 			enable-mask = <PCA9420_MODECFG_2_SW1_EN_MASK>;
 			enable-val = <PCA9420_MODECFG_2_SW1_EN_VAL>;
-			min-uV = <500000>;
-			max-uV = <1800000>;
+			regulator-min-microvolt = <500000>;
+			regulator-max-microvolt = <1800000>;
 			regulator-boot-on;
 		};
 
@@ -210,8 +210,8 @@ arduino_serial: &flexcomm12 {
 			enable-reg = <PCA9420_MODECFG_0_2>;
 			enable-mask = <PCA9420_MODECFG_2_SW2_EN_MASK>;
 			enable-val = <PCA9420_MODECFG_2_SW2_EN_VAL>;
-			min-uV = <1500000>;
-			max-uV = <3300000>;
+			regulator-min-microvolt = <1500000>;
+			regulator-max-microvolt = <3300000>;
 			regulator-boot-on;
 		};
 
@@ -227,8 +227,8 @@ arduino_serial: &flexcomm12 {
 			enable-reg = <PCA9420_MODECFG_0_2>;
 			enable-mask = <PCA9420_MODECFG_2_LDO1_EN_MASK>;
 			enable-val = <PCA9420_MODECFG_2_LDO1_EN_VAL>;
-			min-uV = <1700000>;
-			max-uV = <1900000>;
+			regulator-min-microvolt = <1700000>;
+			regulator-max-microvolt = <1900000>;
 			regulator-boot-on;
 		};
 
@@ -244,8 +244,8 @@ arduino_serial: &flexcomm12 {
 			enable-reg = <PCA9420_MODECFG_0_2>;
 			enable-mask = <PCA9420_MODECFG_2_LDO2_EN_MASK>;
 			enable-val = <PCA9420_MODECFG_2_LDO2_EN_VAL>;
-			min-uV = <1500000>;
-			max-uV = <3300000>;
+			regulator-min-microvolt = <1500000>;
+			regulator-max-microvolt = <3300000>;
 			regulator-boot-on;
 		};
 

diff --git a/boards/arm/mimxrt685_evk/mimxrt685_evk_cm33.dts b/boards/arm/mimxrt685_evk/mimxrt685_evk_cm33.dts
@@ -263,8 +263,8 @@ i2s1: &flexcomm3 {
 			enable-reg = <PCA9420_MODECFG_0_2>;
 			enable-mask = <PCA9420_MODECFG_2_SW1_EN_MASK>;
 			enable-val = <PCA9420_MODECFG_2_SW1_EN_VAL>;
-			min-uV = <500000>;
-			max-uV = <1800000>;
+			regulator-min-microvolt = <500000>;
+			regulator-max-microvolt = <1800000>;
 			regulator-boot-on;
 		};
 
@@ -280,8 +280,8 @@ i2s1: &flexcomm3 {
 			enable-reg = <PCA9420_MODECFG_0_2>;
 			enable-mask = <PCA9420_MODECFG_2_SW2_EN_MASK>;
 			enable-val = <PCA9420_MODECFG_2_SW2_EN_VAL>;
-			min-uV = <1500000>;
-			max-uV = <3300000>;
+			regulator-min-microvolt = <1500000>;
+			regulator-max-microvolt = <3300000>;
 			regulator-boot-on;
 		};
 
@@ -297,8 +297,8 @@ i2s1: &flexcomm3 {
 			enable-reg = <PCA9420_MODECFG_0_2>;
 			enable-mask = <PCA9420_MODECFG_2_LDO1_EN_MASK>;
 			enable-val = <PCA9420_MODECFG_2_LDO1_EN_VAL>;
-			min-uV = <1700000>;
-			max-uV = <1900000>;
+			regulator-min-microvolt = <1700000>;
+			regulator-max-microvolt = <1900000>;
 			regulator-boot-on;
 		};
 
@@ -314,8 +314,8 @@ i2s1: &flexcomm3 {
 			enable-reg = <PCA9420_MODECFG_0_2>;
 			enable-mask = <PCA9420_MODECFG_2_LDO2_EN_MASK>;
 			enable-val = <PCA9420_MODECFG_2_LDO2_EN_VAL>;
-			min-uV = <1500000>;
-			max-uV = <3300000>;
+			regulator-min-microvolt = <1500000>;
+			regulator-max-microvolt = <3300000>;
 			regulator-boot-on;
 		};
 

diff --git a/drivers/regulator/regulator_pca9420.c b/drivers/regulator/regulator_pca9420.c
@@ -574,8 +574,8 @@ static const struct regulator_driver_api api = {
 		.enable_reg = DT_PROP(node_id, enable_reg),                    \
 		.enable_mask = DT_PROP(node_id, enable_mask),                  \
 		.enable_val = DT_PROP(node_id, enable_val),                    \
-		.min_uv = DT_PROP(node_id, min_uv),                            \
-		.max_uv = DT_PROP(node_id, max_uv),                            \
+		.min_uv = DT_PROP(node_id, regulator_min_microvolt),           \
+		.max_uv = DT_PROP(node_id, regulator_max_microvolt),           \
 		.ilim_reg = DT_PROP_OR(node_id, ilim_reg, 0),                  \
 		.ilim_mask = DT_PROP_OR(node_id, ilim_mask, 0),                \
 		.enable_inverted = DT_PROP(node_id, enable_inverted),          \

diff --git a/dts/bindings/regulator/nxp,pca9420.yaml b/dts/bindings/regulator/nxp,pca9420.yaml
@@ -39,8 +39,17 @@ child-binding:
     - name: regulator.yaml
       property-allowlist:
         - regulator-boot-on
+        - regulator-min-microvolt
+        - regulator-max-microvolt
+
   description: Voltage output of PMIC controller regulator
   properties:
+      regulator-min-microvolt:
+        required: true
+
+      regulator-max-microvolt:
+          required: true
+
       voltage-range:
           type: array
           required: true
@@ -78,16 +87,6 @@ child-binding:
           description: |
             value to apply enable-mask to, and write to enable-reg in order
             to enable the regulator output.
-      min-uV:
-          type: int
-          required: true
-          description: |
-             Minimum voltage in microvolts that this regulator supports
-      max-uV:
-          type: int
-          required: true
-          description: |
-             Maximum voltage in microvolts that this regulator supports
       enable-inverted:
           type: boolean
           description: |