Merge branch 'Cadence-ZyncMP-SGMII'

Browse source

Robert Hancock says:

====================
Cadence MACB/GEM support for ZynqMP SGMII

Changes to allow SGMII mode to work properly in the GEM driver on the
Xilinx ZynqMP platform.

Changes since v3:
-more code formatting and error handling fixes

Changes since v2:
-fixed missing includes in DT binding example
-fixed phy_init and phy_power_on error handling/cleanup, moved
phy_power_on to open rather than probe

Changes since v1:
-changed order of controller reset and PHY init as per suggestion
-switched device reset to be optional
-updated bindings doc patch for switch to YAML
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2022-01-29 17:49:21 +00:00

parent 0a78117213 e461bd6f43

commit ff58831fa0

4 changed files with 128 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

56

Documentation/devicetree/bindings/net/cdns,macb.yaml

View file

8

arch/arm64/boot/dts/xilinx/zynqmp.dtsi

View file

4

drivers/net/ethernet/cadence/macb.h

View file

63

drivers/net/ethernet/cadence/macb_main.c

View file