.. | .. |
---|
13 | 13 | #include <generated/utsrelease.h> |
---|
14 | 14 | #include <net/dst.h> |
---|
15 | 15 | |
---|
16 | | -#include <asm/octeon/octeon.h> |
---|
17 | | - |
---|
18 | | -#include "ethernet-defines.h" |
---|
19 | 16 | #include "octeon-ethernet.h" |
---|
| 17 | +#include "ethernet-defines.h" |
---|
20 | 18 | #include "ethernet-mdio.h" |
---|
21 | 19 | #include "ethernet-util.h" |
---|
22 | | - |
---|
23 | | -#include <asm/octeon/cvmx-gmxx-defs.h> |
---|
24 | | -#include <asm/octeon/cvmx-smix-defs.h> |
---|
25 | 20 | |
---|
26 | 21 | static void cvm_oct_get_drvinfo(struct net_device *dev, |
---|
27 | 22 | struct ethtool_drvinfo *info) |
---|
.. | .. |
---|
70 | 65 | } |
---|
71 | 66 | |
---|
72 | 67 | void cvm_oct_note_carrier(struct octeon_ethernet *priv, |
---|
73 | | - cvmx_helper_link_info_t li) |
---|
| 68 | + union cvmx_helper_link_info li) |
---|
74 | 69 | { |
---|
75 | 70 | if (li.s.link_up) { |
---|
76 | 71 | pr_notice_ratelimited("%s: %u Mbps %s duplex, port %d, queue %d\n", |
---|
.. | .. |
---|
86 | 81 | void cvm_oct_adjust_link(struct net_device *dev) |
---|
87 | 82 | { |
---|
88 | 83 | struct octeon_ethernet *priv = netdev_priv(dev); |
---|
89 | | - cvmx_helper_link_info_t link_info; |
---|
| 84 | + union cvmx_helper_link_info link_info; |
---|
90 | 85 | |
---|
91 | 86 | link_info.u64 = 0; |
---|
92 | 87 | link_info.s.link_up = dev->phydev->link ? 1 : 0; |
---|
.. | .. |
---|
111 | 106 | { |
---|
112 | 107 | struct octeon_ethernet *priv = netdev_priv(dev); |
---|
113 | 108 | int interface = INTERFACE(priv->port); |
---|
114 | | - cvmx_helper_link_info_t link_info; |
---|
| 109 | + union cvmx_helper_link_info link_info; |
---|
115 | 110 | union cvmx_gmxx_prtx_cfg gmx_cfg; |
---|
116 | 111 | int index = INDEX(priv->port); |
---|
117 | 112 | |
---|
.. | .. |
---|
158 | 153 | goto no_phy; |
---|
159 | 154 | |
---|
160 | 155 | phydev = of_phy_connect(dev, phy_node, cvm_oct_adjust_link, 0, |
---|
161 | | - PHY_INTERFACE_MODE_GMII); |
---|
| 156 | + priv->phy_mode); |
---|
162 | 157 | of_node_put(phy_node); |
---|
163 | 158 | |
---|
164 | 159 | if (!phydev) |
---|
165 | | - return -ENODEV; |
---|
| 160 | + return -EPROBE_DEFER; |
---|
166 | 161 | |
---|
167 | 162 | priv->last_link = 0; |
---|
168 | | - phy_start_aneg(phydev); |
---|
| 163 | + phy_start(phydev); |
---|
169 | 164 | |
---|
170 | 165 | return 0; |
---|
171 | 166 | no_phy: |
---|