Migrate SG2042 reset controller to reuse the simple device binding. Signed-off-by: Inochi Amaoto <inochiama@xxxxxxxxx> --- .../bindings/reset/reset-simple.yaml | 7 +++- .../bindings/reset/sophgo,sg2042-reset.yaml | 35 ------------------- 2 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 Documentation/devicetree/bindings/reset/sophgo,sg2042-reset.yaml diff --git a/Documentation/devicetree/bindings/reset/reset-simple.yaml b/Documentation/devicetree/bindings/reset/reset-simple.yaml index 86c33a608148..644884206ee4 100644 --- a/Documentation/devicetree/bindings/reset/reset-simple.yaml +++ b/Documentation/devicetree/bindings/reset/reset-simple.yaml @@ -30,7 +30,12 @@ description: | properties: compatible: - const: reset-simple + oneOf: + - items: + - enum: + - sophgo,sg2042-reset + - const: reset-simple + - const: reset-simple 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@xxxxxxxxxxx> - -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>; - }; -- 2.48.1