diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2026-07-25 01:16:15 +0200 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2026-07-25 01:16:15 +0200 |
| commit | 058a7edafd5e74055fb993c816f3897344c8eba4 (patch) | |
| tree | 9d867b2efe830ae52b36722916fef52f382ec875 | |
| parent | 93dec601ada403f874710d321439ac210aaff0e7 (diff) | |
| parent | 39eace59ac826465fae0788d0a6b304ec94f9944 (diff) | |
| download | linux-next-058a7edafd5e74055fb993c816f3897344c8eba4.tar.gz linux-next-058a7edafd5e74055fb993c816f3897344c8eba4.zip | |
Merge branch 'v7.3-armsoc/drivers' into for-next
| -rw-r--r-- | Documentation/devicetree/bindings/arm/rockchip/pmu.yaml | 8 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/arm/rockchip/pmu.yaml b/Documentation/devicetree/bindings/arm/rockchip/pmu.yaml index 55b2200d6e75..1cff2328cd01 100644 --- a/Documentation/devicetree/bindings/arm/rockchip/pmu.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip/pmu.yaml @@ -61,7 +61,13 @@ properties: type: object reboot-mode: - type: object + $ref: /schemas/power/reset/syscon-reboot-mode.yaml + unevaluatedProperties: false + + patternProperties: + # Negative look-ahead to disallow unsupported modes. The '$' has to be + # part of lookahead group to work, instead of trailing outside of (). + "^mode-(?!(bootloader$|loader$|normal$|recovery$))": false required: - compatible diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml index 2cc43742b8e3..7bcb4e2f47ec 100644 --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml @@ -239,11 +239,14 @@ allOf: properties: reboot-mode: type: object - $ref: /schemas/power/reset/syscon-reboot-mode.yaml# - unevaluatedProperties: false + patternProperties: + # Negative look-ahead to disallow unsupported modes. The '$' has to be + # part of lookahead group to work, instead of trailing outside of (). + "^mode-(?!(bootloader$|fastboot$|loader$|normal$|recovery$))": false + - if: properties: compatible: |