Skip to content

Commit

Permalink
dt-bindings: net: dwmac-meson: use picoseconds for the RGMII RX delay
Browse files Browse the repository at this point in the history
Amlogic Meson G12A, G12B and SM1 SoCs have a more advanced RGMII RX
delay register which allows picoseconds precision. Deprecate the old
"amlogic,rx-delay-ns" in favour of the generic "rx-internal-delay-ps"
property.

For older SoCs the only known supported values were 0ns and 2ns. The new
SoCs have support for RGMII RX delays between 0ps and 3000ps in 200ps
steps.

Don't carry over the description for the "rx-internal-delay-ps" property
and inherit that from ethernet-controller.yaml instead.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Martin Blumenstingl authored and Jakub Kicinski committed Jan 7, 2021
1 parent 85b277d commit 6b5903f
Showing 1 changed file with 49 additions and 6 deletions.
55 changes: 49 additions & 6 deletions Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,60 @@ allOf:
Any configuration is ignored when the phy-mode is set to "rmii".

amlogic,rx-delay-ns:
deprecated: true
enum:
- 0
- 2
default: 0
description:
The internal RGMII RX clock delay (provided by this IP block) in
nanoseconds. When phy-mode is set to "rgmii" then the RX delay
should be explicitly configured. When the phy-mode is set to
either "rgmii-id" or "rgmii-rxid" the RX clock delay is already
provided by the PHY. Any configuration is ignored when the
phy-mode is set to "rmii".
The internal RGMII RX clock delay in nanoseconds. Deprecated, use
rx-internal-delay-ps instead.

rx-internal-delay-ps:
default: 0

- if:
properties:
compatible:
contains:
enum:
- amlogic,meson8b-dwmac
- amlogic,meson8m2-dwmac
- amlogic,meson-gxbb-dwmac
- amlogic,meson-axg-dwmac
then:
properties:
rx-internal-delay-ps:
enum:
- 0
- 2000

- if:
properties:
compatible:
contains:
enum:
- amlogic,meson-g12a-dwmac
then:
properties:
rx-internal-delay-ps:
enum:
- 0
- 200
- 400
- 600
- 800
- 1000
- 1200
- 1400
- 1600
- 1800
- 2000
- 2200
- 2400
- 2600
- 2800
- 3000

properties:
compatible:
Expand Down

0 comments on commit 6b5903f

Please sign in to comment.