From: Zelong Dong <zelong.dong@amlogic.com>
Add new compatible for Amlogic A4/A5 Reset Controller
Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
---
.../bindings/reset/amlogic,meson-reset.yaml | 23 ++++++++++++-------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
index 695ef38a7bb3..0ad81fe7b629 100644
--- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
+++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
@@ -12,14 +12,21 @@ maintainers:
properties:
compatible:
- enum:
- - amlogic,meson8b-reset # Reset Controller on Meson8b and compatible SoCs
- - amlogic,meson-gxbb-reset # Reset Controller on GXBB and compatible SoCs
- - amlogic,meson-axg-reset # Reset Controller on AXG and compatible SoCs
- - amlogic,meson-a1-reset # Reset Controller on A1 and compatible SoCs
- - amlogic,meson-s4-reset # Reset Controller on S4 and compatible SoCs
- - amlogic,c3-reset # Reset Controller on C3 and compatible SoCs
- - amlogic,t7-reset
+ oneOf:
+ - items:
+ - enum:
+ - amlogic,meson8b-reset # Reset Controller on Meson8b and compatible SoCs
+ - amlogic,meson-gxbb-reset # Reset Controller on GXBB and compatible SoCs
+ - amlogic,meson-axg-reset # Reset Controller on AXG and compatible SoCs
+ - amlogic,meson-a1-reset # Reset Controller on A1 and compatible SoCs
+ - amlogic,meson-s4-reset # Reset Controller on S4 and compatible SoCs
+ - amlogic,c3-reset # Reset Controller on C3 and compatible SoCs
+ - amlogic,t7-reset
+ - items:
+ - enum:
+ - amlogic,a4-reset
+ - amlogic,a5-reset
+ - const: amlogic,meson-s4-reset
reg:
maxItems: 1
--
2.35.1
On Mi, 2024-09-18 at 15:42 +0800, zelong dong wrote: > From: Zelong Dong <zelong.dong@amlogic.com> > > Add new compatible for Amlogic A4/A5 Reset Controller > > Signed-off-by: Zelong Dong <zelong.dong@amlogic.com> > Acked-by: Conor Dooley <conor.dooley@microchip.com> > --- > .../bindings/reset/amlogic,meson-reset.yaml | 23 ++++++++++++------- > 1 file changed, 15 insertions(+), 8 deletions(-) > > diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > index 695ef38a7bb3..0ad81fe7b629 100644 > --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > @@ -12,14 +12,21 @@ maintainers: > > properties: > compatible: > - enum: > - - amlogic,meson8b-reset # Reset Controller on Meson8b and compatible SoCs > - - amlogic,meson-gxbb-reset # Reset Controller on GXBB and compatible SoCs > - - amlogic,meson-axg-reset # Reset Controller on AXG and compatible SoCs > - - amlogic,meson-a1-reset # Reset Controller on A1 and compatible SoCs > - - amlogic,meson-s4-reset # Reset Controller on S4 and compatible SoCs > - - amlogic,c3-reset # Reset Controller on C3 and compatible SoCs > - - amlogic,t7-reset > + oneOf: > + - items: I'm not well versed in preferred dt-bindings style, but this items looks superfluous to me. It only contains a single enum. > + - enum: > + - amlogic,meson8b-reset # Reset Controller on Meson8b and compatible SoCs > + - amlogic,meson-gxbb-reset # Reset Controller on GXBB and compatible SoCs > + - amlogic,meson-axg-reset # Reset Controller on AXG and compatible SoCs > + - amlogic,meson-a1-reset # Reset Controller on A1 and compatible SoCs > + - amlogic,meson-s4-reset # Reset Controller on S4 and compatible SoCs > + - amlogic,c3-reset # Reset Controller on C3 and compatible SoCs > + - amlogic,t7-reset > + - items: > + - enum: > + - amlogic,a4-reset > + - amlogic,a5-reset > + - const: amlogic,meson-s4-reset > > reg: > maxItems: 1 I think this can be merged together with the dts patches. Acked-by: Philipp Zabel <p.zabel@pengutronix.de> regards Philipp
On Wed, Sep 18, 2024 at 09:51:28AM +0200, Philipp Zabel wrote: > On Mi, 2024-09-18 at 15:42 +0800, zelong dong wrote: > > From: Zelong Dong <zelong.dong@amlogic.com> > > > > Add new compatible for Amlogic A4/A5 Reset Controller > > > > Signed-off-by: Zelong Dong <zelong.dong@amlogic.com> > > Acked-by: Conor Dooley <conor.dooley@microchip.com> > > --- > > .../bindings/reset/amlogic,meson-reset.yaml | 23 ++++++++++++------- > > 1 file changed, 15 insertions(+), 8 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > > index 695ef38a7bb3..0ad81fe7b629 100644 > > --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > > +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > > @@ -12,14 +12,21 @@ maintainers: > > > > properties: > > compatible: > > - enum: > > - - amlogic,meson8b-reset # Reset Controller on Meson8b and compatible SoCs > > - - amlogic,meson-gxbb-reset # Reset Controller on GXBB and compatible SoCs > > - - amlogic,meson-axg-reset # Reset Controller on AXG and compatible SoCs > > - - amlogic,meson-a1-reset # Reset Controller on A1 and compatible SoCs > > - - amlogic,meson-s4-reset # Reset Controller on S4 and compatible SoCs > > - - amlogic,c3-reset # Reset Controller on C3 and compatible SoCs > > - - amlogic,t7-reset > > + oneOf: > > + - items: > > I'm not well versed in preferred dt-bindings style, but this items > looks superfluous to me. It only contains a single enum. Oh, ye. Good spot.
© 2016 - 2024 Red Hat, Inc.