Skip to content

Commit

Permalink
Merge branch 'net-stmmac-dwmac-rk-validate-grf-and-peripheral-grf-dur…
Browse files Browse the repository at this point in the history
…ing-probe'

Jonas Karlman says:

====================
net: stmmac: dwmac-rk: Validate GRF and peripheral GRF during probe

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 RK3576 and
RK3588 use a mix of GRF and peripheral GRF regs. These syscon regmaps is
located with help of a rockchip,grf and rockchip,php-grf phandle.

However, validating the rockchip,grf and rockchip,php-grf syscon regmap
is deferred until e.g. interface mode or speed is configured.

This series change to validate the GRF and peripheral GRF syscon regmap
at probe time to help simplify the SoC specific operations.

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

Link: https://patch.msgid.link/20250308213720.2517944-1-jonas@kwiboo.se
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  • Loading branch information
Paolo Abeni committed Mar 13, 2025
2 parents 814dbf4 + 41f3556 commit d28fcb7
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 254 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
Loading

0 comments on commit d28fcb7

Please sign in to comment.