disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/staging/octeon/octeon-ethernet.h
..
..
@@ -12,8 +12,35 @@
12
12
 #define OCTEON_ETHERNET_H
13
13
 
14
14
 #include <linux/of.h>
15
+#include <linux/phy.h>
15
16
 
16
-#include <asm/octeon/cvmx-helper-board.h>
17
+#ifdef CONFIG_CAVIUM_OCTEON_SOC
18
+
19
+#include <asm/octeon/octeon.h>
20
+
21
+#include <asm/octeon/cvmx-asxx-defs.h>
22
+#include <asm/octeon/cvmx-config.h>
23
+#include <asm/octeon/cvmx-fau.h>
24
+#include <asm/octeon/cvmx-gmxx-defs.h>
25
+#include <asm/octeon/cvmx-helper.h>
26
+#include <asm/octeon/cvmx-helper-util.h>
27
+#include <asm/octeon/cvmx-ipd.h>
28
+#include <asm/octeon/cvmx-ipd-defs.h>
29
+#include <asm/octeon/cvmx-npi-defs.h>
30
+#include <asm/octeon/cvmx-pip.h>
31
+#include <asm/octeon/cvmx-pko.h>
32
+#include <asm/octeon/cvmx-pow.h>
33
+#include <asm/octeon/cvmx-scratch.h>
34
+#include <asm/octeon/cvmx-spi.h>
35
+#include <asm/octeon/cvmx-spxx-defs.h>
36
+#include <asm/octeon/cvmx-stxx-defs.h>
37
+#include <asm/octeon/cvmx-wqe.h>
38
+
39
+#else
40
+
41
+#include "octeon-stubs.h"
42
+
43
+#endif
17
44
 
18
45
 /**
19
46
  * This is the definition of the Ethernet driver's private
..
..
@@ -33,6 +60,8 @@
33
60
 	 * cvmx_helper_interface_mode_t
34
61
 	 */
35
62
 	int imode;
63
+	/* PHY mode */
64
+	phy_interface_t phy_mode;
36
65
 	/* List of outstanding tx buffers per queue */
37
66
 	struct sk_buff_head tx_free_list[16];
38
67
 	unsigned int last_speed;
..
..
@@ -62,7 +91,7 @@
62
91
 int cvm_oct_common_open(struct net_device *dev,
63
92
 			void (*link_poll)(struct net_device *));
64
93
 void cvm_oct_note_carrier(struct octeon_ethernet *priv,
65
-			  cvmx_helper_link_info_t li);
94
+			  union cvmx_helper_link_info li);
66
95
 void cvm_oct_link_poll(struct net_device *dev);
67
96
 
68
97
 extern int always_use_pow;