Skip to contentSkip to conversation

dt-bindings: Add missing 'unevaluatedProperties' to regulator nodes

PATCH In review Rob Herring 5 participants 5 messages Dec 6, 2022 – Dec 8, 2022

Subsystems (6)
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 dt-bindings: Add missing 'unevaluatedProperties' to regulator nodes

Several regulator schemas are missing 'unevaluatedProperties' constraint which means any extra properties are allowed. Upon adding the constraint, there's numerous warnings from using the deprecated 'regulator-compatible' property. Remove the usage as examples shouldn't be using long since deprecated properties.

---
I'd suggest that Mark take this if that's okay with Lee. Or I can take it.

 Documentation/devicetree/bindings/mfd/max77650.yaml  |  2 --
 .../devicetree/bindings/mfd/mediatek,mt6360.yaml     |  9 ---------
 .../bindings/power/supply/mt6360_charger.yaml        |  2 +-
 .../bindings/regulator/max77650-regulator.yaml       |  1 +
 .../devicetree/bindings/regulator/max8660.yaml       |  6 +-----
 .../bindings/regulator/mt6360-regulator.yaml         | 12 +++---------
 6 files changed, 6 insertions(+), 26 deletions(-)
Documentation/devicetree/bindings/mfd/max77650.yaml +0 -2
index b0a0f0d3d9d4..4181174fcf58 100644
@@ -100,14 +100,12 @@ examples:
                 compatible = "maxim,max77650-regulator";
 
                 max77650_ldo: regulator-ldo {
-                    regulator-compatible = "ldo";
                     regulator-name = "max77650-ldo";
                     regulator-min-microvolt = <1350000>;
                     regulator-max-microvolt = <2937500>;
                 };
 
                 max77650_sbb0: regulator-sbb0 {
-                    regulator-compatible = "sbb0";
                     regulator-name = "max77650-sbb0";
                     regulator-min-microvolt = <800000>;
                     regulator-max-microvolt = <1587500>;
Documentation/devicetree/bindings/mfd/mediatek,mt6360.yaml +0 -9
index 28eee02441ee..fb65abf30d57 100644
@@ -83,7 +83,6 @@ examples:
                 richtek,vinovp-microvolt = <14500000>;
 
                 otg_vbus_regulator: usb-otg-vbus-regulator {
-                    regulator-compatible = "usb-otg-vbus";
                     regulator-name = "usb-otg-vbus";
                     regulator-min-microvolt = <4425000>;
                     regulator-max-microvolt = <5825000>;
@@ -145,7 +144,6 @@ examples:
                 compatible = "mediatek,mt6360-regulator";
                 LDO_VIN3-supply = <&BUCK2>;
                 buck1 {
-                    regulator-compatible = "BUCK1";
                     regulator-name = "mt6360,buck1";
                     regulator-min-microvolt = <300000>;
                     regulator-max-microvolt = <1300000>;
@@ -154,7 +152,6 @@ examples:
                          MT6360_OPMODE_ULP>;
                 };
                 BUCK2: buck2 {
-                    regulator-compatible = "BUCK2";
                     regulator-name = "mt6360,buck2";
                     regulator-min-microvolt = <300000>;
                     regulator-max-microvolt = <1300000>;
@@ -163,7 +160,6 @@ examples:
                          MT6360_OPMODE_ULP>;
                 };
                 ldo6 {
-                    regulator-compatible = "LDO6";
                     regulator-name = "mt6360,ldo6";
                     regulator-min-microvolt = <500000>;
                     regulator-max-microvolt = <2100000>;
@@ -171,7 +167,6 @@ examples:
                          MT6360_OPMODE_LP>;
                 };
                 ldo7 {
-                    regulator-compatible = "LDO7";
                     regulator-name = "mt6360,ldo7";
                     regulator-min-microvolt = <500000>;
                     regulator-max-microvolt = <2100000>;
@@ -179,7 +174,6 @@ examples:
                          MT6360_OPMODE_LP>;
                 };
                 ldo1 {
-                    regulator-compatible = "LDO1";
                     regulator-name = "mt6360,ldo1";
                     regulator-min-microvolt = <1200000>;
                     regulator-max-microvolt = <3600000>;
@@ -187,7 +181,6 @@ examples:
                          MT6360_OPMODE_LP>;
                 };
                 ldo2 {
-                    regulator-compatible = "LDO2";
                     regulator-name = "mt6360,ldo2";
                     regulator-min-microvolt = <1200000>;
                     regulator-max-microvolt = <3600000>;
@@ -195,7 +188,6 @@ examples:
                          MT6360_OPMODE_LP>;
                 };
                 ldo3 {
-                    regulator-compatible = "LDO3";
                     regulator-name = "mt6360,ldo3";
                     regulator-min-microvolt = <1200000>;
                     regulator-max-microvolt = <3600000>;
@@ -203,7 +195,6 @@ examples:
                          MT6360_OPMODE_LP>;
                 };
                 ldo5 {
-                    regulator-compatible = "LDO5";
                     regulator-name = "mt6360,ldo5";
                     regulator-min-microvolt = <2700000>;
                     regulator-max-microvolt = <3600000>;
Documentation/devicetree/bindings/power/supply/mt6360_charger.yaml +1 -1
index b89b15a5bfa4..4c74cc78729e 100644
@@ -26,6 +26,7 @@ properties:
     type: object
     description: OTG boost regulator.
     $ref: /schemas/regulator/regulator.yaml#
+    unevaluatedProperties: false
 
 required:
   - compatible
@@ -39,7 +40,6 @@ examples:
       richtek,vinovp-microvolt = <14500000>;
 
       otg_vbus_regulator: usb-otg-vbus-regulator {
-        regulator-compatible = "usb-otg-vbus";
         regulator-name = "usb-otg-vbus";
         regulator-min-microvolt = <4425000>;
         regulator-max-microvolt = <5825000>;
Documentation/devicetree/bindings/regulator/max77650-regulator.yaml +1 -0
index ce0a4021ae7f..01b9775a92d1 100644
@@ -26,6 +26,7 @@ properties:
 patternProperties:
   "^regulator-(ldo|sbb[0-2])$":
     $ref: "regulator.yaml#"
+    unevaluatedProperties: false
 
 required:
   - compatible
Documentation/devicetree/bindings/regulator/max8660.yaml +1 -5
index 4d550ca396eb..35792a927b03 100644
@@ -26,6 +26,7 @@ properties:
     patternProperties:
       "^regulator-.+$":
         $ref: "regulator.yaml#"
+        unevaluatedProperties: false
 
     additionalProperties: false
 
@@ -43,31 +44,26 @@ examples:
 
         regulators {
           regulator-V3 {
-            regulator-compatible= "V3(DCDC)";
             regulator-min-microvolt = <725000>;
             regulator-max-microvolt = <1800000>;
           };
 
           regulator-V4 {
-            regulator-compatible= "V4(DCDC)";
             regulator-min-microvolt = <725000>;
             regulator-max-microvolt = <1800000>;
           };
 
           regulator-V5 {
-            regulator-compatible= "V5(LDO)";
             regulator-min-microvolt = <1700000>;
             regulator-max-microvolt = <2000000>;
           };
 
           regulator-V6 {
-            regulator-compatible= "V6(LDO)";
             regulator-min-microvolt = <1800000>;
             regulator-max-microvolt = <3300000>;
           };
 
           regulator-V7 {
-            regulator-compatible= "V7(LDO)";
             regulator-min-microvolt = <1800000>;
             regulator-max-microvolt = <3300000>;
           };
Documentation/devicetree/bindings/regulator/mt6360-regulator.yaml +3 -9
index a462d99a25cc..8a0931dc2f30 100644
@@ -27,9 +27,11 @@ properties:
 patternProperties:
   "^buck[12]$":
     $ref: "regulator.yaml#"
+    unevaluatedProperties: false
 
   "^ldo[123567]$":
     $ref: "regulator.yaml#"
+    unevaluatedProperties: false
 
 required:
   - compatible
@@ -44,7 +46,6 @@ examples:
       compatible = "mediatek,mt6360-regulator";
       LDO_VIN3-supply = <&BUCK2>;
       buck1 {
-        regulator-compatible = "BUCK1";
         regulator-name = "mt6360,buck1";
         regulator-min-microvolt = <300000>;
         regulator-max-microvolt = <1300000>;
@@ -53,7 +54,6 @@ examples:
              MT6360_OPMODE_ULP>;
       };
       BUCK2: buck2 {
-        regulator-compatible = "BUCK2";
         regulator-name = "mt6360,buck2";
         regulator-min-microvolt = <300000>;
         regulator-max-microvolt = <1300000>;
@@ -62,7 +62,6 @@ examples:
              MT6360_OPMODE_ULP>;
       };
       ldo6 {
-        regulator-compatible = "LDO6";
         regulator-name = "mt6360,ldo6";
         regulator-min-microvolt = <500000>;
         regulator-max-microvolt = <2100000>;
@@ -70,7 +69,6 @@ examples:
              MT6360_OPMODE_LP>;
       };
       ldo7 {
-        regulator-compatible = "LDO7";
         regulator-name = "mt6360,ldo7";
         regulator-min-microvolt = <500000>;
         regulator-max-microvolt = <2100000>;
@@ -78,15 +76,13 @@ examples:
              MT6360_OPMODE_LP>;
       };
       ldo1 {
-        regulator-compatible = "LDO1";
         regulator-name = "mt6360,ldo1";
         regulator-min-microvolt = <1200000>;
         regulator-max-microvolt = <3600000>;
         regulator-allowed-modes = <MT6360_OPMODE_NORMAL
              MT6360_OPMODE_LP>;
       };
-        ldo2 {
-        regulator-compatible = "LDO2";
+      ldo2 {
         regulator-name = "mt6360,ldo2";
         regulator-min-microvolt = <1200000>;
         regulator-max-microvolt = <3600000>;
@@ -94,7 +90,6 @@ examples:
              MT6360_OPMODE_LP>;
       };
       ldo3 {
-        regulator-compatible = "LDO3";
         regulator-name = "mt6360,ldo3";
         regulator-min-microvolt = <1200000>;
         regulator-max-microvolt = <3600000>;
@@ -102,7 +97,6 @@ examples:
              MT6360_OPMODE_LP>;
       };
       ldo5 {
-        regulator-compatible = "LDO5";
         regulator-name = "mt6360,ldo5";
         regulator-min-microvolt = <2700000>;
         regulator-max-microvolt = <3600000>;
Signature · 1 line
2.35.1
Acked-by on v1 1/1
#1 lore raw
Quoted 29 lines · Rob Herring

Several regulator schemas are missing 'unevaluatedProperties' constraint which means any extra properties are allowed. Upon adding the constraint, there's numerous warnings from using the deprecated 'regulator-compatible' property. Remove the usage as examples shouldn't be using long since deprecated properties.

---
I'd suggest that Mark take this if that's okay with Lee. Or I can take it.

 Documentation/devicetree/bindings/mfd/max77650.yaml  |  2 --
 .../devicetree/bindings/mfd/mediatek,mt6360.yaml     |  9 ---------
 .../bindings/power/supply/mt6360_charger.yaml        |  2 +-
 .../bindings/regulator/max77650-regulator.yaml       |  1 +
 .../devicetree/bindings/regulator/max8660.yaml       |  6 +-----
 .../bindings/regulator/mt6360-regulator.yaml         | 12 +++---------
 6 files changed, 6 insertions(+), 26 deletions(-)
Documentation/devicetree/bindings/mfd/max77650.yaml +0 -1
index b0a0f0d3d9d4..4181174fcf58 100644
@@ -100,14 +100,12 @@ examples:
                 compatible = "maxim,max77650-regulator";
 
                 max77650_ldo: regulator-ldo {
-                    regulator-compatible = "ldo";

Documentation/devicetree/bindings/mfd/max77650.yaml examples: · line 111

Quoted 10 lines
Documentation/devicetree/bindings/mfd/max77650.yaml +0 -1
                     regulator-name = "max77650-ldo";
                     regulator-min-microvolt = <1350000>;
                     regulator-max-microvolt = <2937500>;
                 };
 
                 max77650_sbb0: regulator-sbb0 {
-                    regulator-compatible = "sbb0";
                     regulator-name = "max77650-sbb0";
                     regulator-min-microvolt = <800000>;
                     regulator-max-microvolt = <1587500>;
Acked-by on v1 1/1
#2 lore raw
In reply to Rob Herring

Hi,

Quoted 34 lines · Rob Herring

Several regulator schemas are missing 'unevaluatedProperties' constraint which means any extra properties are allowed. Upon adding the constraint, there's numerous warnings from using the deprecated 'regulator-compatible' property. Remove the usage as examples shouldn't be using long since deprecated properties.

---
I'd suggest that Mark take this if that's okay with Lee. Or I can take it.

 Documentation/devicetree/bindings/mfd/max77650.yaml  |  2 --
 .../devicetree/bindings/mfd/mediatek,mt6360.yaml     |  9 ---------
 .../bindings/power/supply/mt6360_charger.yaml        |  2 +-
 .../bindings/regulator/max77650-regulator.yaml       |  1 +
 .../devicetree/bindings/regulator/max8660.yaml       |  6 +-----
 .../bindings/regulator/mt6360-regulator.yaml         | 12 +++---------
 6 files changed, 6 insertions(+), 26 deletions(-)

[...]

Documentation/devicetree/bindings/power/supply/mt6360_charger.yaml +1 -0
index b89b15a5bfa4..4c74cc78729e 100644
@@ -26,6 +26,7 @@ properties:
     type: object
     description: OTG boost regulator.
     $ref: /schemas/regulator/regulator.yaml#
+    unevaluatedProperties: false
 
 required:
   - compatible

Documentation/devicetree/bindings/power/supply/mt6360_charger.yaml examples: · line 45

Quoted 7 lines
Documentation/devicetree/bindings/power/supply/mt6360_charger.yaml +0 -1
@@ -39,7 +40,6 @@ examples:
       richtek,vinovp-microvolt = <14500000>;
 
       otg_vbus_regulator: usb-otg-vbus-regulator {
-        regulator-compatible = "usb-otg-vbus";
         regulator-name = "usb-otg-vbus";
         regulator-min-microvolt = <4425000>;
         regulator-max-microvolt = <5825000>;
Quoted 1 line

[...]

-- Sebastian

maintainer Acked-by on v1 1/1
#3 lore raw
In reply to Rob Herring
Quoted 10 lines · Rob Herring

Several regulator schemas are missing 'unevaluatedProperties' constraint which means any extra properties are allowed. Upon adding the constraint, there's numerous warnings from using the deprecated 'regulator-compatible' property. Remove the usage as examples shouldn't be using long since deprecated properties.

---
I'd suggest that Mark take this if that's okay with Lee. Or I can take it.

No problem from my side.

Quoted 7 lines
 Documentation/devicetree/bindings/mfd/max77650.yaml  |  2 --
 .../devicetree/bindings/mfd/mediatek,mt6360.yaml     |  9 ---------
 .../bindings/power/supply/mt6360_charger.yaml        |  2 +-
 .../bindings/regulator/max77650-regulator.yaml       |  1 +
 .../devicetree/bindings/regulator/max8660.yaml       |  6 +-----
 .../bindings/regulator/mt6360-regulator.yaml         | 12 +++---------
 6 files changed, 6 insertions(+), 26 deletions(-)
Signature · 1 line
Lee Jones [李琼斯]
maintainer
#4 lore raw
In reply to Rob Herring
Quoted 8 lines · Rob Herring

Several regulator schemas are missing 'unevaluatedProperties' constraint which means any extra properties are allowed. Upon adding the constraint, there's numerous warnings from using the deprecated 'regulator-compatible' property. Remove the usage as examples shouldn't be using long since deprecated properties.

[...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next

Thanks!

[1/1] dt-bindings: Add missing 'unevaluatedProperties' to regulator nodes

      commit: 2a17ddfdca25ac4cbb0d317362608ec32f98fd82

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark