.. | .. |
---|
12 | 12 | #include <linux/ratelimit.h> |
---|
13 | 13 | #include <net/dst.h> |
---|
14 | 14 | |
---|
15 | | -#include <asm/octeon/octeon.h> |
---|
16 | | - |
---|
17 | | -#include "ethernet-defines.h" |
---|
18 | 15 | #include "octeon-ethernet.h" |
---|
| 16 | +#include "ethernet-defines.h" |
---|
19 | 17 | #include "ethernet-util.h" |
---|
20 | 18 | #include "ethernet-mdio.h" |
---|
21 | | - |
---|
22 | | -#include <asm/octeon/cvmx-helper.h> |
---|
23 | | - |
---|
24 | | -#include <asm/octeon/cvmx-ipd-defs.h> |
---|
25 | | -#include <asm/octeon/cvmx-npi-defs.h> |
---|
26 | | -#include <asm/octeon/cvmx-gmxx-defs.h> |
---|
27 | 19 | |
---|
28 | 20 | static DEFINE_SPINLOCK(global_register_lock); |
---|
29 | 21 | |
---|
.. | .. |
---|
61 | 53 | static void cvm_oct_check_preamble_errors(struct net_device *dev) |
---|
62 | 54 | { |
---|
63 | 55 | struct octeon_ethernet *priv = netdev_priv(dev); |
---|
64 | | - cvmx_helper_link_info_t link_info; |
---|
| 56 | + union cvmx_helper_link_info link_info; |
---|
65 | 57 | unsigned long flags; |
---|
66 | 58 | |
---|
67 | 59 | link_info.u64 = priv->link_info; |
---|
.. | .. |
---|
111 | 103 | static void cvm_oct_rgmii_poll(struct net_device *dev) |
---|
112 | 104 | { |
---|
113 | 105 | struct octeon_ethernet *priv = netdev_priv(dev); |
---|
114 | | - cvmx_helper_link_info_t link_info; |
---|
| 106 | + union cvmx_helper_link_info link_info; |
---|
115 | 107 | bool status_change; |
---|
116 | 108 | |
---|
117 | 109 | link_info = cvmx_helper_link_get(priv->port); |
---|