Skip to content

Commit

Permalink
dt-bindings: net: rockchip-dwmac: Require rockchip,grf and rockchip,p…
Browse files Browse the repository at this point in the history
…hp-grf

All Rockchip GMAC variants typically write to GRF regs to control e.g.
interface mode, speed and MAC rx/tx delay. Newer SoCs such as RK3562,
RK3576 and RK3588 use a mix of GRF and peripheral GRF regs.

Prior to the commit b331b8e ("dt-bindings: net: convert
rockchip-dwmac to json-schema") the property rockchip,grf was listed
under "Required properties". During the conversion this was lost and
rockchip,grf has since then incorrectly been treated as optional and
not as required.

Similarly, when rockchip,php-grf was added to the schema in the
commit a2b7783 ("dt-bindings: net: rockchip-dwmac: add rk3588 gmac
compatible") it also incorrectly has been treated as optional for all
GMAC variants, when it should have been required for RK3588, and later
also for RK3576.

Update this binding to require rockchip,grf and rockchip,php-grf to
properly reflect that GRF (and peripheral GRF for RK3576/RK3588) is
required to control part of GMAC.

This should not introduce any breakage as all Rockchip GMAC nodes have
been added together with a rockchip,grf phandle (and rockchip,php-grf
where required) in their initial commit.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20250308213720.2517944-2-jonas@kwiboo.se
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  • Loading branch information
Jonas Karlman authored and Paolo Abeni committed Mar 13, 2025
1 parent 814dbf4 commit 313cf06
Showing 1 changed file with 18 additions and 3 deletions.
21 changes: 18 additions & 3 deletions Documentation/devicetree/bindings/net/rockchip-dwmac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ select:
required:
- compatible

allOf:
- $ref: snps,dwmac.yaml#

properties:
compatible:
oneOf:
Expand Down Expand Up @@ -114,6 +111,24 @@ required:
- compatible
- clocks
- clock-names
- rockchip,grf

allOf:
- $ref: snps,dwmac.yaml#

- if:
properties:
compatible:
contains:
enum:
- rockchip,rk3576-gmac
- rockchip,rk3588-gmac
then:
required:
- rockchip,php-grf
else:
properties:
rockchip,php-grf: false

unevaluatedProperties: false

Expand Down

0 comments on commit 313cf06

Please sign in to comment.