diff options
author | Maxime Ripard <maxime@cerno.tech> | 2021-03-16 09:06:23 +0100 |
---|---|---|
committer | Maxime Ripard <maxime@cerno.tech> | 2021-03-16 09:06:23 +0100 |
commit | f8bade6c9a6213c2c5ba6e5bf32415ecab6e41e5 (patch) | |
tree | 474c8fb8df9797b6e0d1e562b389f575c24afc50 /Documentation/devicetree/bindings/net/xilinx_axienet.txt | |
parent | ccf953d8f3d68e85e577e843fdcde8872b0a9769 (diff) | |
parent | 51c3b916a4d7e24b4918925965867fdd9bd8dd59 (diff) | |
download | linux-f8bade6c9a6213c2c5ba6e5bf32415ecab6e41e5.tar.gz |
Merge drm/drm-next into drm-misc-next
Noralf needs some patches in 5.12-rc3, and we've been delaying the 5.12 merge due to the swap issue so it looks like a good time. Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'Documentation/devicetree/bindings/net/xilinx_axienet.txt')
-rw-r--r-- | Documentation/devicetree/bindings/net/xilinx_axienet.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/xilinx_axienet.txt b/Documentation/devicetree/bindings/net/xilinx_axienet.txt index 7360617cdedb..2cd452419ed0 100644 --- a/Documentation/devicetree/bindings/net/xilinx_axienet.txt +++ b/Documentation/devicetree/bindings/net/xilinx_axienet.txt @@ -38,6 +38,10 @@ Optional properties: 1 to enable partial TX checksum offload, 2 to enable full TX checksum offload - xlnx,rxcsum : Same values as xlnx,txcsum but for RX checksum offload +- xlnx,switch-x-sgmii : Boolean to indicate the Ethernet core is configured to + support both 1000BaseX and SGMII modes. If set, the phy-mode + should be set to match the mode selected on core reset (i.e. + by the basex_or_sgmii core input line). - clocks : AXI bus clock for the device. Refer to common clock bindings. Used to calculate MDIO clock divisor. If not specified, it is auto-detected from the CPU clock (but only on platforms where |