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.
On 2024/9/18 16:01, Conor Dooley wrote: > 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. Hello Philipp, Conor, Sorry for the late reply. Do you mean to use 'amlogic,meson-s4-reset' for A4 and A5 directly, without the fallback? -- Best regards, Kelvin Zhang
On Tue, Mar 11, 2025 at 05:48:26PM +0800, Kelvin Zhang wrote: > > > On 2024/9/18 16:01, Conor Dooley wrote: > > 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. > > Hello Philipp, Conor, > Sorry for the late reply. > > Do you mean to use 'amlogic,meson-s4-reset' for A4 and A5 directly, without > the fallback? No. We are saying that + - items: + - enum: + - amlogic,meson8b-reset # Reset Controller on Meson8b and compatible SoCs is pointless duplication, because your "items" list only has only entry in it (the enum) and you could just remove the "- items" line entirely and have the same outcome.
On 2025/3/13 04:31, Conor Dooley wrote: > On Tue, Mar 11, 2025 at 05:48:26PM +0800, Kelvin Zhang wrote: >> >> On 2024/9/18 16:01, Conor Dooley wrote: >>> 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. >> Hello Philipp, Conor, >> Sorry for the late reply. >> >> Do you mean to use 'amlogic,meson-s4-reset' for A4 and A5 directly, without >> the fallback? > No. We are saying that > > + - items: > + - enum: > + - amlogic,meson8b-reset # Reset Controller on Meson8b and compatible SoCs > > is pointless duplication, because your "items" list only has only > entry in it (the enum) and you could just remove the "- items" line > entirely and have the same outcome. Got it. Thanks! -- Best regards, Kelvin Zhang
© 2016 - 2026 Red Hat, Inc.