diff options
| author |   Alvaro G. M <alvaro.gamez@hazent.com> | 2017-07-17 09:12:28 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-07-17 08:51:57 -0700 |
| commit | ee06b1728b95643668e40fc58ae118aeb7c1753e (patch) | |
| tree | d4864bc4af0c07c4996624982fceef6905e5d8fd /drivers/net/ethernet/xilinx/xilinx_axienet.h | |
| parent | Merge branch 'sctp-typedef-remove-part-2' (diff) | |
| download | linux-dev-ee06b1728b95643668e40fc58ae118aeb7c1753e.tar.xz linux-dev-ee06b1728b95643668e40fc58ae118aeb7c1753e.zip | |
net: axienet: add support for standard phy-mode binding
Keep supporting proprietary "xlnx,phy-type" attribute and add support for
MII connectivity to the PHY.
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Alvaro Gamez Machado <alvaro.gamez@hazent.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/xilinx/xilinx_axienet.h')
| -rw-r--r-- | drivers/net/ethernet/xilinx/xilinx_axienet.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet.h b/drivers/net/ethernet/xilinx/xilinx_axienet.h index af27f7d1cbf3..5ef626331f85 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet.h +++ b/drivers/net/ethernet/xilinx/xilinx_axienet.h @@ -389,7 +389,7 @@ struct axidma_bd { * @dma_err_tasklet: Tasklet structure to process Axi DMA errors * @tx_irq: Axidma TX IRQ number * @rx_irq: Axidma RX IRQ number - * @phy_type: Phy type to identify between MII/GMII/RGMII/SGMII/1000 Base-X + * @phy_mode: Phy type to identify between MII/GMII/RGMII/SGMII/1000 Base-X * @options: AxiEthernet option word * @last_link: Phy link state in which the PHY was negotiated earlier * @features: Stores the extended features supported by the axienet hw @@ -432,7 +432,7 @@ struct axienet_local { int tx_irq; int rx_irq; - u32 phy_type; + phy_interface_t phy_mode; u32 options; /* Current options word */ u32 last_link; |