[PATCH 03/10] dt-bindings: mfd: rockchip,rk8x: Use generic power-controller schema

["Peng Fan (OSS)" <peng.fan@oss.nxp.com>]

From: Peng Fan <peng.fan@nxp.com>

Convert the binding to use the generic power-controller schema instead by
referencing power-controller.yaml and removing the local
`system-power-controller` property.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 Documentation/devicetree/bindings/mfd/rockchip,rk801.yaml | 10 ++++------
 Documentation/devicetree/bindings/mfd/rockchip,rk805.yaml |  7 +++----
 Documentation/devicetree/bindings/mfd/rockchip,rk806.yaml |  3 +--
 Documentation/devicetree/bindings/mfd/rockchip,rk808.yaml |  9 +++++----
 Documentation/devicetree/bindings/mfd/rockchip,rk816.yaml | 10 ++++------
 Documentation/devicetree/bindings/mfd/rockchip,rk817.yaml |  5 ++---
 Documentation/devicetree/bindings/mfd/rockchip,rk818.yaml |  9 +++++----
 7 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/Documentation/devicetree/bindings/mfd/rockchip,rk801.yaml b/Documentation/devicetree/bindings/mfd/rockchip,rk801.yaml
index 7c71447200ba..5d644f3fbe1b 100644
--- a/Documentation/devicetree/bindings/mfd/rockchip,rk801.yaml
+++ b/Documentation/devicetree/bindings/mfd/rockchip,rk801.yaml
@@ -13,6 +13,9 @@ description: |
   Rockchip RK801 series PMIC. This device consists of an i2c controlled MFD
   that includes multiple switchable regulators.
 
+allOf:
+  - $ref: /schemas/power/power-controller.yaml#
+
 properties:
   compatible:
     enum:
@@ -24,11 +27,6 @@ properties:
   interrupts:
     maxItems: 1
 
-  system-power-controller:
-    type: boolean
-    description:
-      Telling whether or not this PMIC is controlling the system power.
-
   wakeup-source:
     type: boolean
     description:
@@ -76,7 +74,7 @@ required:
   - reg
   - interrupts
 
-additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
diff --git a/Documentation/devicetree/bindings/mfd/rockchip,rk805.yaml b/Documentation/devicetree/bindings/mfd/rockchip,rk805.yaml
index da2391530c16..7a123bcd4320 100644
--- a/Documentation/devicetree/bindings/mfd/rockchip,rk805.yaml
+++ b/Documentation/devicetree/bindings/mfd/rockchip,rk805.yaml
@@ -46,8 +46,6 @@ properties:
     description:
       Telling whether or not this PMIC is controlling the system power.
 
-  system-power-controller: true
-
   wakeup-source:
     type: boolean
     description:
@@ -87,6 +85,7 @@ properties:
     unevaluatedProperties: false
 
 allOf:
+  - $ref: /schemas/power/power-controller.yaml#
   - if:
       properties:
         '#clock-cells':
@@ -108,7 +107,7 @@ required:
   - interrupts
   - "#clock-cells"
 
-additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
@@ -126,7 +125,7 @@ examples:
             interrupts = <RK_PA6 IRQ_TYPE_LEVEL_LOW>;
             pinctrl-names = "default";
             pinctrl-0 = <&pmic_int_l>;
-            rockchip,system-power-controller;
+            system-power-controller;
             wakeup-source;
             #clock-cells = <0>;
 
diff --git a/Documentation/devicetree/bindings/mfd/rockchip,rk806.yaml b/Documentation/devicetree/bindings/mfd/rockchip,rk806.yaml
index eb5bca31948e..e441c6489699 100644
--- a/Documentation/devicetree/bindings/mfd/rockchip,rk806.yaml
+++ b/Documentation/devicetree/bindings/mfd/rockchip,rk806.yaml
@@ -29,8 +29,6 @@ properties:
   '#gpio-cells':
     const: 2
 
-  system-power-controller: true
-
   rockchip,reset-mode:
     $ref: /schemas/types.yaml#/definitions/uint32
     enum: [0, 1, 2]
@@ -136,6 +134,7 @@ patternProperties:
         enum: [gpio_pwrctrl1, gpio_pwrctrl2, gpio_pwrctrl3]
 
 allOf:
+  - $ref: /schemas/power/power-controller.yaml#
   - $ref: /schemas/spi/spi-peripheral-props.yaml
 
 required:
diff --git a/Documentation/devicetree/bindings/mfd/rockchip,rk808.yaml b/Documentation/devicetree/bindings/mfd/rockchip,rk808.yaml
index 50dfffac8fbf..9bb1467bf5ff 100644
--- a/Documentation/devicetree/bindings/mfd/rockchip,rk808.yaml
+++ b/Documentation/devicetree/bindings/mfd/rockchip,rk808.yaml
@@ -14,6 +14,9 @@ description: |
   Rockchip RK808 series PMIC. This device consists of an i2c controlled MFD
   that includes regulators, an RTC, and a power button.
 
+allOf:
+  - $ref: /schemas/power/power-controller.yaml#
+
 properties:
   compatible:
     enum:
@@ -41,8 +44,6 @@ properties:
     description:
       Telling whether or not this PMIC is controlling the system power.
 
-  system-power-controller: true
-
   wakeup-source:
     type: boolean
     description:
@@ -119,7 +120,7 @@ required:
   - interrupts
   - "#clock-cells"
 
-additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
@@ -140,7 +141,7 @@ examples:
             dvs-gpios = <&gpio7 11 GPIO_ACTIVE_HIGH>,
                 <&gpio7 15 GPIO_ACTIVE_HIGH>;
             reg = <0x1b>;
-            rockchip,system-power-controller;
+            system-power-controller;
             wakeup-source;
             #clock-cells = <1>;
 
diff --git a/Documentation/devicetree/bindings/mfd/rockchip,rk816.yaml b/Documentation/devicetree/bindings/mfd/rockchip,rk816.yaml
index a58d9455a1a5..aa2e3ac1794e 100644
--- a/Documentation/devicetree/bindings/mfd/rockchip,rk816.yaml
+++ b/Documentation/devicetree/bindings/mfd/rockchip,rk816.yaml
@@ -15,6 +15,9 @@ description:
   that includes regulators, a RTC, a GPIO controller, a power button, and a
   battery charger manager with fuel gauge.
 
+allOf:
+  - $ref: /schemas/power/power-controller.yaml#
+
 properties:
   compatible:
     enum:
@@ -39,11 +42,6 @@ properties:
   '#gpio-cells':
     const: 2
 
-  system-power-controller:
-    type: boolean
-    description:
-      Telling whether or not this PMIC is controlling the system power.
-
   wakeup-source: true
 
   vcc1-supply:
@@ -107,7 +105,7 @@ required:
   - interrupts
   - '#clock-cells'
 
-additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
diff --git a/Documentation/devicetree/bindings/mfd/rockchip,rk817.yaml b/Documentation/devicetree/bindings/mfd/rockchip,rk817.yaml
index 2cb6d176a84c..4c5d2f43a6f1 100644
--- a/Documentation/devicetree/bindings/mfd/rockchip,rk817.yaml
+++ b/Documentation/devicetree/bindings/mfd/rockchip,rk817.yaml
@@ -53,8 +53,6 @@ properties:
   '#sound-dai-cells':
     const: 0
 
-  system-power-controller: true
-
   wakeup-source:
     type: boolean
     description:
@@ -157,6 +155,7 @@ properties:
     additionalProperties: false
 
 allOf:
+  - $ref: /schemas/power/power-controller.yaml#
   - $ref: /schemas/sound/dai-common.yaml#
   - if:
       properties:
@@ -195,7 +194,7 @@ required:
   - interrupts
   - "#clock-cells"
 
-additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
diff --git a/Documentation/devicetree/bindings/mfd/rockchip,rk818.yaml b/Documentation/devicetree/bindings/mfd/rockchip,rk818.yaml
index 90d944c27ba1..d1ca8b447034 100644
--- a/Documentation/devicetree/bindings/mfd/rockchip,rk818.yaml
+++ b/Documentation/devicetree/bindings/mfd/rockchip,rk818.yaml
@@ -14,6 +14,9 @@ description: |
   Rockchip RK818 series PMIC. This device consists of an i2c controlled MFD
   that includes regulators, an RTC, and a power button.
 
+allOf:
+  - $ref: /schemas/power/power-controller.yaml#
+
 properties:
   compatible:
     enum:
@@ -41,8 +44,6 @@ properties:
     description:
       Telling whether or not this PMIC is controlling the system power.
 
-  system-power-controller: true
-
   wakeup-source:
     type: boolean
     description:
@@ -111,7 +112,7 @@ required:
   - interrupts
   - "#clock-cells"
 
-additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
@@ -130,7 +131,7 @@ examples:
             interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
             pinctrl-names = "default";
             pinctrl-0 = <&pmic_int>;
-            rockchip,system-power-controller;
+            system-power-controller;
             wakeup-source;
             #clock-cells = <1>;
 

-- 
2.51.0