Message ID | 20250213020900.745551-4-inochiama@gmail.com (mailing list archive) |
---|---|
State | Handled Elsewhere |
Headers | show |
Series | reset: introduct generic bit reset controller | expand |
Context | Check | Description |
---|---|---|
bjorn/pre-ci_am | success | Success |
bjorn/build-rv32-defconfig | success | build-rv32-defconfig |
bjorn/build-rv64-clang-allmodconfig | success | build-rv64-clang-allmodconfig |
bjorn/build-rv64-gcc-allmodconfig | success | build-rv64-gcc-allmodconfig |
bjorn/build-rv64-nommu-k210-defconfig | success | build-rv64-nommu-k210-defconfig |
bjorn/build-rv64-nommu-k210-virt | success | build-rv64-nommu-k210-virt |
bjorn/checkpatch | warning | checkpatch |
bjorn/dtb-warn-rv64 | fail | dtb-warn-rv64 |
bjorn/header-inline | success | header-inline |
bjorn/kdoc | success | kdoc |
bjorn/module-param | success | module-param |
bjorn/verify-fixes | success | verify-fixes |
bjorn/verify-signedoff | success | verify-signedoff |
diff --git a/Documentation/devicetree/bindings/reset/reset-simple.yaml b/Documentation/devicetree/bindings/reset/reset-simple.yaml index 77584e23e8e8..1c86b67ae190 100644 --- a/Documentation/devicetree/bindings/reset/reset-simple.yaml +++ b/Documentation/devicetree/bindings/reset/reset-simple.yaml @@ -16,9 +16,13 @@ description: properties: compatible: - enum: - - reset-simple-high - - reset-simple-low + oneOf: + - items: + - enum: + - sophgo,sg2042-reset + - const: reset-simple-low + - const: reset-simple-high + - const: reset-simple-low reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/reset/sophgo,sg2042-reset.yaml b/Documentation/devicetree/bindings/reset/sophgo,sg2042-reset.yaml deleted file mode 100644 index 76e1931f0908..000000000000 --- a/Documentation/devicetree/bindings/reset/sophgo,sg2042-reset.yaml +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/reset/sophgo,sg2042-reset.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Sophgo SG2042 SoC Reset Controller - -maintainers: - - Chen Wang <unicorn_wang@outlook.com> - -properties: - compatible: - const: sophgo,sg2042-reset - - reg: - maxItems: 1 - - "#reset-cells": - const: 1 - -required: - - compatible - - reg - - "#reset-cells" - -additionalProperties: false - -examples: - - | - rstgen: reset-controller@c00 { - compatible = "sophgo,sg2042-reset"; - reg = <0xc00 0xc>; - #reset-cells = <1>; - };
Migrate SG2042 reset controller to reuse the simple device binding. Signed-off-by: Inochi Amaoto <inochiama@gmail.com> --- .../bindings/reset/reset-simple.yaml | 10 ++++-- .../bindings/reset/sophgo,sg2042-reset.yaml | 35 ------------------- 2 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 Documentation/devicetree/bindings/reset/sophgo,sg2042-reset.yaml