aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2013-11-27 17:11:44 -0500
committerRalf Baechle <ralf@linux-mips.org>2014-01-23 07:02:34 -0500
commitce4126cbe3d90cd00cb62f75b3b15f8e9260a301 (patch)
tree44035d05595fa49e4edee3436c30c44f89651801 /arch
parent63238f2cc5518e1c45a3418fc0ac0f560dafe7ef (diff)
MIPS: cavium-octeon: export symbols needed by octeon-ethernet
Export symbols needed by the octeon-ethernet driver. The patch fixes a build failure with CONFIG_OCTEON_ETHERNET=m. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Acked-by: David Daney <david.daney@cavium.com> Signed-off-by: John Crispin <blogic@openwrt.org> Patchwork: http://patchwork.linux-mips.org/patch/6166/
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c1
-rw-r--r--arch/mips/cavium-octeon/executive/cvmx-helper-util.c4
-rw-r--r--arch/mips/cavium-octeon/executive/cvmx-helper.c8
-rw-r--r--arch/mips/cavium-octeon/executive/cvmx-pko.c3
-rw-r--r--arch/mips/cavium-octeon/executive/cvmx-spi.c1
5 files changed, 16 insertions, 1 deletions
diff --git a/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c b/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c
index 132bccc66a93..8241fc6aa17d 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c
@@ -47,6 +47,7 @@
47 * state. It points to a bootmem named block. 47 * state. It points to a bootmem named block.
48 */ 48 */
49__cvmx_cmd_queue_all_state_t *__cvmx_cmd_queue_state_ptr; 49__cvmx_cmd_queue_all_state_t *__cvmx_cmd_queue_state_ptr;
50EXPORT_SYMBOL_GPL(__cvmx_cmd_queue_state_ptr);
50 51
51/** 52/**
52 * Initialize the Global queue state pointer. 53 * Initialize the Global queue state pointer.
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-util.c b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
index 65d2bc9a0bde..453d7f66459a 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
@@ -251,6 +251,7 @@ int cvmx_helper_setup_red(int pass_thresh, int drop_thresh)
251 251
252 return 0; 252 return 0;
253} 253}
254EXPORT_SYMBOL_GPL(cvmx_helper_setup_red);
254 255
255/** 256/**
256 * Setup the common GMX settings that determine the number of 257 * Setup the common GMX settings that determine the number of
@@ -384,6 +385,7 @@ int cvmx_helper_get_ipd_port(int interface, int port)
384 } 385 }
385 return -1; 386 return -1;
386} 387}
388EXPORT_SYMBOL_GPL(cvmx_helper_get_ipd_port);
387 389
388/** 390/**
389 * Returns the interface number for an IPD/PKO port number. 391 * Returns the interface number for an IPD/PKO port number.
@@ -408,6 +410,7 @@ int cvmx_helper_get_interface_num(int ipd_port)
408 410
409 return -1; 411 return -1;
410} 412}
413EXPORT_SYMBOL_GPL(cvmx_helper_get_interface_num);
411 414
412/** 415/**
413 * Returns the interface index number for an IPD/PKO port 416 * Returns the interface index number for an IPD/PKO port
@@ -431,3 +434,4 @@ int cvmx_helper_get_interface_index_num(int ipd_port)
431 434
432 return -1; 435 return -1;
433} 436}
437EXPORT_SYMBOL_GPL(cvmx_helper_get_interface_index_num);
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c
index 0e4b34036815..8553ad5c72b6 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c
@@ -88,6 +88,7 @@ int cvmx_helper_get_number_of_interfaces(void)
88 else 88 else
89 return 3; 89 return 3;
90} 90}
91EXPORT_SYMBOL_GPL(cvmx_helper_get_number_of_interfaces);
91 92
92/** 93/**
93 * Return the number of ports on an interface. Depending on the 94 * Return the number of ports on an interface. Depending on the
@@ -102,6 +103,7 @@ int cvmx_helper_ports_on_interface(int interface)
102{ 103{
103 return interface_port_count[interface]; 104 return interface_port_count[interface];
104} 105}
106EXPORT_SYMBOL_GPL(cvmx_helper_ports_on_interface);
105 107
106/** 108/**
107 * Get the operating mode of an interface. Depending on the Octeon 109 * Get the operating mode of an interface. Depending on the Octeon
@@ -179,6 +181,7 @@ cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(int interface)
179 return CVMX_HELPER_INTERFACE_MODE_RGMII; 181 return CVMX_HELPER_INTERFACE_MODE_RGMII;
180 } 182 }
181} 183}
184EXPORT_SYMBOL_GPL(cvmx_helper_interface_get_mode);
182 185
183/** 186/**
184 * Configure the IPD/PIP tagging and QoS options for a specific 187 * Configure the IPD/PIP tagging and QoS options for a specific
@@ -825,6 +828,7 @@ int cvmx_helper_ipd_and_packet_input_enable(void)
825 __cvmx_helper_errata_fix_ipd_ptr_alignment(); 828 __cvmx_helper_errata_fix_ipd_ptr_alignment();
826 return 0; 829 return 0;
827} 830}
831EXPORT_SYMBOL_GPL(cvmx_helper_ipd_and_packet_input_enable);
828 832
829/** 833/**
830 * Initialize the PIP, IPD, and PKO hardware to support 834 * Initialize the PIP, IPD, and PKO hardware to support
@@ -903,6 +907,7 @@ int cvmx_helper_initialize_packet_io_global(void)
903#endif 907#endif
904 return result; 908 return result;
905} 909}
910EXPORT_SYMBOL_GPL(cvmx_helper_initialize_packet_io_global);
906 911
907/** 912/**
908 * Does core local initialization for packet io 913 * Does core local initialization for packet io
@@ -947,6 +952,7 @@ cvmx_helper_link_info_t cvmx_helper_link_autoconf(int ipd_port)
947 */ 952 */
948 return port_link_info[ipd_port]; 953 return port_link_info[ipd_port];
949} 954}
955EXPORT_SYMBOL_GPL(cvmx_helper_link_autoconf);
950 956
951/** 957/**
952 * Return the link state of an IPD/PKO port as returned by 958 * Return the link state of an IPD/PKO port as returned by
@@ -1005,6 +1011,7 @@ cvmx_helper_link_info_t cvmx_helper_link_get(int ipd_port)
1005 } 1011 }
1006 return result; 1012 return result;
1007} 1013}
1014EXPORT_SYMBOL_GPL(cvmx_helper_link_get);
1008 1015
1009/** 1016/**
1010 * Configure an IPD/PKO port for the specified link state. This 1017 * Configure an IPD/PKO port for the specified link state. This
@@ -1060,6 +1067,7 @@ int cvmx_helper_link_set(int ipd_port, cvmx_helper_link_info_t link_info)
1060 port_link_info[ipd_port].u64 = link_info.u64; 1067 port_link_info[ipd_port].u64 = link_info.u64;
1061 return result; 1068 return result;
1062} 1069}
1070EXPORT_SYMBOL_GPL(cvmx_helper_link_set);
1063 1071
1064/** 1072/**
1065 * Configure a port for internal and/or external loopback. Internal loopback 1073 * Configure a port for internal and/or external loopback. Internal loopback
diff --git a/arch/mips/cavium-octeon/executive/cvmx-pko.c b/arch/mips/cavium-octeon/executive/cvmx-pko.c
index f2c877541597..008b881cdf64 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-pko.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-pko.c
@@ -140,7 +140,7 @@ void cvmx_pko_disable(void)
140 pko_reg_flags.s.ena_pko = 0; 140 pko_reg_flags.s.ena_pko = 0;
141 cvmx_write_csr(CVMX_PKO_REG_FLAGS, pko_reg_flags.u64); 141 cvmx_write_csr(CVMX_PKO_REG_FLAGS, pko_reg_flags.u64);
142} 142}
143 143EXPORT_SYMBOL_GPL(cvmx_pko_disable);
144 144
145/** 145/**
146 * Reset the packet output. 146 * Reset the packet output.
@@ -182,6 +182,7 @@ void cvmx_pko_shutdown(void)
182 } 182 }
183 __cvmx_pko_reset(); 183 __cvmx_pko_reset();
184} 184}
185EXPORT_SYMBOL_GPL(cvmx_pko_shutdown);
185 186
186/** 187/**
187 * Configure a output port and the associated queues for use. 188 * Configure a output port and the associated queues for use.
diff --git a/arch/mips/cavium-octeon/executive/cvmx-spi.c b/arch/mips/cavium-octeon/executive/cvmx-spi.c
index ef5198d13a0e..459e3b1eb61f 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-spi.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-spi.c
@@ -177,6 +177,7 @@ int cvmx_spi_restart_interface(int interface, cvmx_spi_mode_t mode, int timeout)
177 177
178 return res; 178 return res;
179} 179}
180EXPORT_SYMBOL_GPL(cvmx_spi_restart_interface);
180 181
181/** 182/**
182 * Callback to perform SPI4 reset 183 * Callback to perform SPI4 reset