On Thu, Sep 24, 2026 at 05:51:09AM +0000, Xianwei Zhao via B4 Relay wrote:
quoted hunk ↗ jump to hunk
From: Xianwei Zhao <xianwei.zhao@amlogic.com>
Add the T7 compatible to the Meson DWMAC binding.
The T7 DWMAC controller requires the following compatible combination:
amlogic,t7-dwmac
amlogic,meson-axg-dwmac
snps,dwmac-4.00
Add a conditional schema check to enforce this compatible combination
when amlogic,t7-dwmac is used.
Signed-off-by: Xianwei Zhao <xianwei.zhao@amlogic.com>
---
.../devicetree/bindings/net/amlogic,meson-dwmac.yaml | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml b/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml
index 5c91716d1f21..b529ca5577a9 100644
--- a/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml
@@ -23,11 +23,24 @@ select:
- amlogic,meson-gxbb-dwmac
- amlogic,meson-axg-dwmac
- amlogic,meson-g12a-dwmac
+ - amlogic,t7-dwmac
required:
- compatible
allOf:
- $ref: snps,dwmac.yaml#
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: amlogic,t7-dwmac
+ then:
+ properties:
+ compatible:
+ items:
+ - const: amlogic,t7-dwmac
+ - const: amlogic,meson-axg-dwmac
+ - const: snps,dwmac-4.00
This is not how fallback compatibles are described.
Instead of doing this, which affects all other compatibles in the file
by allowing dwmac-4.00 for all devices, please do this the normal way.
dwmac isn't special, it's just this binding that's weird!
Can whats currently in the binding (before this patch) be largely
replaced by just doing:
compatible:
oneOf:
- items:
- enum:
- amlogic,meson8b-dwmac
- amlogic,meson-gxbb-dwmac
- amlogic,meson-axg-dwmac
- amlogic,meson-g12a-dwmac
- const: snps,dwmac-3.70a
- const: snps,dwmac
- items:
- enum:
- amlogic,meson6-dwmac
- amlogic,meson8m2-dwmac
- const: snps,dwmac
You'll have to check this yourself against the amlogic devicetrees and
see if this is correct, but with this you should be able to add your new
device without doing anything special.
pw-bot: changes-requested
Thanks,
Conor.
quoted hunk ↗ jump to hunk
- if:
properties:
compatible:@@ -38,6 +51,7 @@ allOf:
- amlogic,meson-gxbb-dwmac
- amlogic,meson-axg-dwmac
- amlogic,meson-g12a-dwmac
+ - amlogic,t7-dwmac
then:
properties:@@ -93,6 +107,7 @@ allOf:
- amlogic,meson8m2-dwmac
- amlogic,meson-gxbb-dwmac
- amlogic,meson-axg-dwmac
+ - amlogic,t7-dwmac
then:
properties:
rx-internal-delay-ps:@@ -139,8 +154,10 @@ properties:
- amlogic,meson-gxbb-dwmac
- amlogic,meson-axg-dwmac
- amlogic,meson-g12a-dwmac
+ - amlogic,t7-dwmac
contains:
enum:
+ - snps,dwmac-4.00
- snps,dwmac-3.70a
- snps,dwmac
--
2.52.0