16 files changed, 32 insertions, 32 deletions
diff --git a/dts/Bindings/regulator/fixed-regulator.yaml b/dts/Bindings/regulator/fixed-regulator.yaml
index 9b131c6fac..84eeaef179 100644
--- a/dts/Bindings/regulator/fixed-regulator.yaml
+++ b/dts/Bindings/regulator/fixed-regulator.yaml
@@ -18,23 +18,23 @@ description:
 
 allOf:
   - $ref: "regulator.yaml#"
-
-if:
-  properties:
-    compatible:
-      contains:
-        const: regulator-fixed-clock
-  required:
-    - clocks
-else:
-  if:
-    properties:
-      compatible:
-        contains:
-          const: regulator-fixed-domain
-    required:
-      - power-domains
-      - required-opps
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: regulator-fixed-clock
+    then:
+      required:
+        - clocks
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: regulator-fixed-domain
+    then:
+      required:
+        - power-domains
+        - required-opps
 
 properties:
   compatible:
diff --git a/dts/Bindings/regulator/maxim,max14577.yaml b/dts/Bindings/regulator/maxim,max14577.yaml
index 16f01886a6..285dc71229 100644
--- a/dts/Bindings/regulator/maxim,max14577.yaml
+++ b/dts/Bindings/regulator/maxim,max14577.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: Maxim MAX14577/MAX77836 MicroUSB and Companion Power Management IC regulators
 
 maintainers:
-  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+  - Krzysztof Kozlowski <krzk@kernel.org>
 
 description: |
   This is a part of device tree bindings for Maxim MAX14577/MAX77836 MicroUSB
diff --git a/dts/Bindings/regulator/maxim,max77686.yaml b/dts/Bindings/regulator/maxim,max77686.yaml
index bb64b679f7..0e7cd4b3ac 100644
--- a/dts/Bindings/regulator/maxim,max77686.yaml
+++ b/dts/Bindings/regulator/maxim,max77686.yaml
@@ -8,7 +8,7 @@ title: Maxim MAX77686 Power Management IC regulators
 
 maintainers:
   - Chanwoo Choi <cw00.choi@samsung.com>
-  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+  - Krzysztof Kozlowski <krzk@kernel.org>
 
 description: |
   This is a part of device tree bindings for Maxim MAX77686 Power Management
diff --git a/dts/Bindings/regulator/maxim,max77693.yaml b/dts/Bindings/regulator/maxim,max77693.yaml
index 20d8559bdc..945a539749 100644
--- a/dts/Bindings/regulator/maxim,max77693.yaml
+++ b/dts/Bindings/regulator/maxim,max77693.yaml
@@ -8,7 +8,7 @@ title: Maxim MAX77693 MicroUSB and Companion Power Management IC regulators
 
 maintainers:
   - Chanwoo Choi <cw00.choi@samsung.com>
-  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+  - Krzysztof Kozlowski <krzk@kernel.org>
 
 description: |
   This is a part of device tree bindings for Maxim MAX77693 MicroUSB Integrated
diff --git a/dts/Bindings/regulator/maxim,max77802.yaml b/dts/Bindings/regulator/maxim,max77802.yaml
index f2b4dd15a0..236348c471 100644
--- a/dts/Bindings/regulator/maxim,max77802.yaml
+++ b/dts/Bindings/regulator/maxim,max77802.yaml
@@ -8,7 +8,7 @@ title: Maxim MAX77802 Power Management IC regulators
 
 maintainers:
   - Javier Martinez Canillas <javier@dowhile0.org>
-  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+  - Krzysztof Kozlowski <krzk@kernel.org>
 
 description: |
   This is a part of device tree bindings for Maxim MAX77802 Power Management
diff --git a/dts/Bindings/regulator/maxim,max77843.yaml b/dts/Bindings/regulator/maxim,max77843.yaml
index a963025e96..9695e72428 100644
--- a/dts/Bindings/regulator/maxim,max77843.yaml
+++ b/dts/Bindings/regulator/maxim,max77843.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: Maxim MAX77843 MicroUSB and Companion Power Management IC regulators
 
 maintainers:
-  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+  - Krzysztof Kozlowski <krzk@kernel.org>
 
 description: |
   This is a part of device tree bindings for Maxim MAX77843 MicroUSB Integrated
diff --git a/dts/Bindings/regulator/maxim,max8952.yaml b/dts/Bindings/regulator/maxim,max8952.yaml
index e4e8c58f60..3ff0d7d980 100644
--- a/dts/Bindings/regulator/maxim,max8952.yaml
+++ b/dts/Bindings/regulator/maxim,max8952.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: Maxim MAX8952 voltage regulator
 
 maintainers:
-  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+  - Krzysztof Kozlowski <krzk@kernel.org>
 
 allOf:
   - $ref: regulator.yaml#
diff --git a/dts/Bindings/regulator/maxim,max8973.yaml b/dts/Bindings/regulator/maxim,max8973.yaml
index 5898dcf10f..b92eef68c1 100644
--- a/dts/Bindings/regulator/maxim,max8973.yaml
+++ b/dts/Bindings/regulator/maxim,max8973.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: Maxim MAX8973/MAX77621 voltage regulator
 
 maintainers:
-  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+  - Krzysztof Kozlowski <krzk@kernel.org>
 
 allOf:
   - $ref: regulator.yaml#
diff --git a/dts/Bindings/regulator/maxim,max8997.yaml b/dts/Bindings/regulator/maxim,max8997.yaml
index d5a44ca3df..4321f061a7 100644
--- a/dts/Bindings/regulator/maxim,max8997.yaml
+++ b/dts/Bindings/regulator/maxim,max8997.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: Maxim MAX8997 Power Management IC
 
 maintainers:
-  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+  - Krzysztof Kozlowski <krzk@kernel.org>
 
 description: |
   The Maxim MAX8997 is a Power Management IC which includes voltage and current
diff --git a/dts/Bindings/regulator/samsung,s2mpa01.yaml b/dts/Bindings/regulator/samsung,s2mpa01.yaml
index 0627dec513..0f9eb317ba 100644
--- a/dts/Bindings/regulator/samsung,s2mpa01.yaml
+++ b/dts/Bindings/regulator/samsung,s2mpa01.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: Samsung S2MPA01 Power Management IC regulators
 
 maintainers:
-  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+  - Krzysztof Kozlowski <krzk@kernel.org>
 
 description: |
   This is a part of device tree bindings for S2M and S5M family of Power
diff --git a/dts/Bindings/regulator/samsung,s2mps11.yaml b/dts/Bindings/regulator/samsung,s2mps11.yaml
index e3b780715f..f1c50dcd0b 100644
--- a/dts/Bindings/regulator/samsung,s2mps11.yaml
+++ b/dts/Bindings/regulator/samsung,s2mps11.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: Samsung S2MPS11 Power Management IC regulators
 
 maintainers:
-  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+  - Krzysztof Kozlowski <krzk@kernel.org>
 
 description: |
   This is a part of device tree bindings for S2M and S5M family of Power
diff --git a/dts/Bindings/regulator/samsung,s2mps13.yaml b/dts/Bindings/regulator/samsung,s2mps13.yaml
index 579d77aefc..53b105a4ea 100644
--- a/dts/Bindings/regulator/samsung,s2mps13.yaml
+++ b/dts/Bindings/regulator/samsung,s2mps13.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: Samsung S2MPS13 Power Management IC regulators
 
 maintainers:
-  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+  - Krzysztof Kozlowski <krzk@kernel.org>
 
 description: |
   This is a part of device tree bindings for S2M and S5M family of Power
diff --git a/dts/Bindings/regulator/samsung,s2mps14.yaml b/dts/Bindings/regulator/samsung,s2mps14.yaml
index fdea290b3e..01f9d4e236 100644
--- a/dts/Bindings/regulator/samsung,s2mps14.yaml
+++ b/dts/Bindings/regulator/samsung,s2mps14.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: Samsung S2MPS14 Power Management IC regulators
 
 maintainers:
-  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+  - Krzysztof Kozlowski <krzk@kernel.org>
 
 description: |
   This is a part of device tree bindings for S2M and S5M family of Power
diff --git a/dts/Bindings/regulator/samsung,s2mps15.yaml b/dts/Bindings/regulator/samsung,s2mps15.yaml
index b3a883c946..9576c2df45 100644
--- a/dts/Bindings/regulator/samsung,s2mps15.yaml
+++ b/dts/Bindings/regulator/samsung,s2mps15.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: Samsung S2MPS15 Power Management IC regulators
 
 maintainers:
-  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+  - Krzysztof Kozlowski <krzk@kernel.org>
 
 description: |
   This is a part of device tree bindings for S2M and S5M family of Power
diff --git a/dts/Bindings/regulator/samsung,s2mpu02.yaml b/dts/Bindings/regulator/samsung,s2mpu02.yaml
index 0ded6953e3..39b652c3c3 100644
--- a/dts/Bindings/regulator/samsung,s2mpu02.yaml
+++ b/dts/Bindings/regulator/samsung,s2mpu02.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: Samsung S2MPU02 Power Management IC regulators
 
 maintainers:
-  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+  - Krzysztof Kozlowski <krzk@kernel.org>
 
 description: |
   This is a part of device tree bindings for S2M and S5M family of Power
diff --git a/dts/Bindings/regulator/samsung,s5m8767.yaml b/dts/Bindings/regulator/samsung,s5m8767.yaml
index 3c1617b668..172631ca3c 100644
--- a/dts/Bindings/regulator/samsung,s5m8767.yaml
+++ b/dts/Bindings/regulator/samsung,s5m8767.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: Samsung S5M8767 Power Management IC regulators
 
 maintainers:
-  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+  - Krzysztof Kozlowski <krzk@kernel.org>
 
 description: |
   This is a part of device tree bindings for S2M and S5M family of Power