From: Zelong Dong <zelong.dong@amlogic.com>
Add compatibles for Amlogic A4 and A5 reset controllers,
which fall back to 'amlogic,meson-s4-reset'.
Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Link: https://lore.kernel.org/r/20240918074211.8067-2-zelong.dong@amlogic.com
Signed-off-by: Kelvin Zhang <kelvin.zhang@amlogic.com>
---
.../bindings/reset/amlogic,meson-reset.yaml | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
index 695ef38a7bb346c92b4cf428e7615d45682c940a..150e95c0d9bed74c7045942610a311114a257889 100644
--- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
+++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
@@ -12,14 +12,20 @@ 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:
+ - 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.37.1
Hi Philipp, On 11/04/2025 13:38, Kelvin Zhang via B4 Relay wrote: > From: Zelong Dong <zelong.dong@amlogic.com> > > Add compatibles for Amlogic A4 and A5 reset controllers, > which fall back to 'amlogic,meson-s4-reset'. > > Signed-off-by: Zelong Dong <zelong.dong@amlogic.com> > Acked-by: Conor Dooley <conor.dooley@microchip.com> > Acked-by: Philipp Zabel <p.zabel@pengutronix.de> > Link: https://lore.kernel.org/r/20240918074211.8067-2-zelong.dong@amlogic.com > Signed-off-by: Kelvin Zhang <kelvin.zhang@amlogic.com> > --- > .../bindings/reset/amlogic,meson-reset.yaml | 22 ++++++++++++++-------- > 1 file changed, 14 insertions(+), 8 deletions(-) > > diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > index 695ef38a7bb346c92b4cf428e7615d45682c940a..150e95c0d9bed74c7045942610a311114a257889 100644 > --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > @@ -12,14 +12,20 @@ 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: > + - 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 > Do you plan to take this change ? It has been laying around on the list for a while now, I plan to apply it in my amlogic/drivers tree at the end of the week. Thanks, Neil
Hi Neil, On Mo, 2025-05-05 at 14:30 +0200, Neil Armstrong wrote: > Hi Philipp, > > On 11/04/2025 13:38, Kelvin Zhang via B4 Relay wrote: > > From: Zelong Dong <zelong.dong@amlogic.com> > > > > Add compatibles for Amlogic A4 and A5 reset controllers, > > which fall back to 'amlogic,meson-s4-reset'. > > > > Signed-off-by: Zelong Dong <zelong.dong@amlogic.com> > > Acked-by: Conor Dooley <conor.dooley@microchip.com> > > Acked-by: Philipp Zabel <p.zabel@pengutronix.de> > > Link: https://lore.kernel.org/r/20240918074211.8067-2-zelong.dong@amlogic.com > > Signed-off-by: Kelvin Zhang <kelvin.zhang@amlogic.com> > > --- > > .../bindings/reset/amlogic,meson-reset.yaml | 22 ++++++++++++++-------- > > 1 file changed, 14 insertions(+), 8 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > > index 695ef38a7bb346c92b4cf428e7615d45682c940a..150e95c0d9bed74c7045942610a311114a257889 100644 > > --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > > +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml > > @@ -12,14 +12,20 @@ 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: > > + - 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 > > > > Do you plan to take this change ? > > It has been laying around on the list for a while now, I plan > to apply it in my amlogic/drivers tree at the end of the week. I thought you'd pick it up together with the dts patches [1]. [1] https://lore.kernel.org/all/a5d9b775dd860d8f2bbf174300a2e3161b654035.camel@pengutronix.de/ regards Philipp
On 05/05/2025 14:53, Philipp Zabel wrote: > Hi Neil, > > On Mo, 2025-05-05 at 14:30 +0200, Neil Armstrong wrote: >> Hi Philipp, >> >> On 11/04/2025 13:38, Kelvin Zhang via B4 Relay wrote: >>> From: Zelong Dong <zelong.dong@amlogic.com> >>> >>> Add compatibles for Amlogic A4 and A5 reset controllers, >>> which fall back to 'amlogic,meson-s4-reset'. >>> >>> Signed-off-by: Zelong Dong <zelong.dong@amlogic.com> >>> Acked-by: Conor Dooley <conor.dooley@microchip.com> >>> Acked-by: Philipp Zabel <p.zabel@pengutronix.de> >>> Link: https://lore.kernel.org/r/20240918074211.8067-2-zelong.dong@amlogic.com >>> Signed-off-by: Kelvin Zhang <kelvin.zhang@amlogic.com> >>> --- >>> .../bindings/reset/amlogic,meson-reset.yaml | 22 ++++++++++++++-------- >>> 1 file changed, 14 insertions(+), 8 deletions(-) >>> >>> diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml >>> index 695ef38a7bb346c92b4cf428e7615d45682c940a..150e95c0d9bed74c7045942610a311114a257889 100644 >>> --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml >>> +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml >>> @@ -12,14 +12,20 @@ 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: >>> + - 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 >>> >> >> Do you plan to take this change ? >> >> It has been laying around on the list for a while now, I plan >> to apply it in my amlogic/drivers tree at the end of the week. > > I thought you'd pick it up together with the dts patches [1]. Sorry I missed this... applied it. Thanks, Neil > > [1] https://lore.kernel.org/all/a5d9b775dd860d8f2bbf174300a2e3161b654035.camel@pengutronix.de/ > > > regards > Philipp
© 2016 - 2025 Red Hat, Inc.