[PATCH] dt-bindings: mfd: convert rk805 pinctrl to DT schema
Quchaosheng
quchaosheng000406 at 163.com
Tue Sep 22 19:53:02 PDT 2026
pinctrl-rk805.txt describes the pinmux controller that is part of the
Rockchip RK805 PMIC. The PMIC itself is already described by
rockchip,rk805.yaml, so the pinmux part belongs there as well: the
pinctrl node is a child of the PMIC node, not a separate device.
Fold the pinmux description into rockchip,rk805.yaml and drop the
standalone text binding.
While doing so, add the missing '-pins$' child node schema. The
rockchip,rk805.yaml schema ends with 'additionalProperties: false' but did
not describe the pin configuration child nodes at all, so a valid pinmux
node like the one shown in pinctrl-rk805.txt was rejected:
pmic at 18 (rockchip,rk805): 'rk805-default-pins' does not match any of
the regexes: '^pinctrl-[0-9]+$'
The RK805 exposes two output-only GPIOs. Encode this as an enum on the
'pins' property so that a typo such as "gpio2" is caught.
Assisted-by: LLM
Signed-off-by: Quchaosheng <quchaosheng000406 at 163.com>
---
.../bindings/mfd/rockchip,rk805.yaml | 33 +++++++++-
.../bindings/pinctrl/pinctrl-rk805.txt | 63 -------------------
2 files changed, 32 insertions(+), 64 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-rk805.txt
diff --git a/Documentation/devicetree/bindings/mfd/rockchip,rk805.yaml b/Documentation/devicetree/bindings/mfd/rockchip,rk805.yaml
index da2391530c16..fdc34e0902d9 100644
--- a/Documentation/devicetree/bindings/mfd/rockchip,rk805.yaml
+++ b/Documentation/devicetree/bindings/mfd/rockchip,rk805.yaml
@@ -86,6 +86,31 @@ properties:
unevaluatedProperties: false
unevaluatedProperties: false
+patternProperties:
+ '-pins$':
+ type: object
+ description:
+ The RK805 has two output-only GPIOs which can be muxed to the GPIO
+ function and driven low or high at boot.
+ additionalProperties: false
+
+ properties:
+ pins:
+ description:
+ List of GPIO pins to configure.
+ items:
+ enum: [gpio0, gpio1]
+ minItems: 1
+ maxItems: 2
+
+ function:
+ description:
+ The RK805 only supports the GPIO function.
+ enum: [gpio]
+
+ output-low: true
+ output-high: true
+
allOf:
- if:
properties:
@@ -125,7 +150,7 @@ examples:
interrupt-parent = <&gpio2>;
interrupts = <RK_PA6 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
- pinctrl-0 = <&pmic_int_l>;
+ pinctrl-0 = <&pmic_int_l>, <&rk805_default>;
rockchip,system-power-controller;
wakeup-source;
#clock-cells = <0>;
@@ -137,6 +162,12 @@ examples:
vcc5-supply = <&vcc_io>;
vcc6-supply = <&vcc_io>;
+ rk805_default: rk805-default-pins {
+ pins = "gpio0", "gpio1";
+ function = "gpio";
+ output-high;
+ };
+
regulators {
vdd_logic: DCDC_REG1 {
regulator-name = "vdd_logic";
diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-rk805.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-rk805.txt
deleted file mode 100644
index 6ad49e51c72e..000000000000
--- a/Documentation/devicetree/bindings/pinctrl/pinctrl-rk805.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-Pincontrol driver for RK805 Power management IC.
-
-RK805 has 2 pins which can be configured as GPIO output only.
-
-Please refer file <devicetree/bindings/pinctrl/pinctrl-bindings.txt>
-for details of the common pinctrl bindings used by client devices,
-including the meaning of the phrase "pin configuration node".
-
-Optional Pinmux properties:
---------------------------
-Following properties are required if default setting of pins are required
-at boot.
-- pinctrl-names: A pinctrl state named per <pinctrl-bindings.txt>.
-- pinctrl[0...n]: Properties to contain the phandle for pinctrl states per
- <pinctrl-bindings.txt>.
-
-The pin configurations are defined as child of the pinctrl states node. Each
-sub-node have following properties:
-
-Required properties:
-------------------
-- #gpio-cells: Should be two. The first cell is the pin number and the
- second is the GPIO flags.
-
-- gpio-controller: Marks the device node as a GPIO controller.
-
-- pins: List of pins. Valid values of pins properties are: gpio0, gpio1.
-
-First 2 properties must be added in the RK805 PMIC node, documented in
-Documentation/devicetree/bindings/mfd/rockchip,rk808.yaml
-
-Optional properties:
--------------------
-Following are optional properties defined as pinmux DT binding document
-<pinctrl-bindings.txt>. Absence of properties will leave the configuration
-on default.
- function,
- output-low,
- output-high.
-
-Valid values for function properties are: gpio.
-
-There are also not customised properties for any GPIO.
-
-Example:
---------
-rk805: rk805 at 18 {
- compatible = "rockchip,rk805";
- ...
- gpio-controller;
- #gpio-cells = <2>;
-
- pinctrl-names = "default";
- pinctrl-0 = <&pmic_int_l>, <&rk805_default>;
-
- rk805_default: pinmux {
- gpio01 {
- pins = "gpio0", "gpio1";
- function = "gpio";
- output-high;
- };
- };
-};
--
2.43.0
More information about the linux-arm-kernel
mailing list