Skip to content

Commit 1836c2b

Browse files
aakoskinpaulburton
authored andcommitted
MIPS: OCTEON: delete board-specific link status
Delete board-specific link status. This info should now come from the DT only. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: linux-mips@vger.kernel.org
1 parent 154ca3f commit 1836c2b

File tree

1 file changed

+1
-42
lines changed

1 file changed

+1
-42
lines changed

arch/mips/cavium-octeon/executive/cvmx-helper-board.c

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -217,53 +217,12 @@ cvmx_helper_link_info_t __cvmx_helper_board_link_get(int ipd_port)
217217
/* Unless we fix it later, all links are defaulted to down */
218218
result.u64 = 0;
219219

220-
/*
221-
* This switch statement should handle all ports that either don't use
222-
* Marvell PHYS, or don't support in-band status.
223-
*/
224-
switch (cvmx_sysinfo_get()->board_type) {
225-
case CVMX_BOARD_TYPE_SIM:
220+
if (octeon_is_simulation()) {
226221
/* The simulator gives you a simulated 1Gbps full duplex link */
227222
result.s.link_up = 1;
228223
result.s.full_duplex = 1;
229224
result.s.speed = 1000;
230225
return result;
231-
case CVMX_BOARD_TYPE_EBH3100:
232-
case CVMX_BOARD_TYPE_CN3010_EVB_HS5:
233-
case CVMX_BOARD_TYPE_CN3005_EVB_HS5:
234-
case CVMX_BOARD_TYPE_CN3020_EVB_HS5:
235-
/* Port 1 on these boards is always Gigabit */
236-
if (ipd_port == 1) {
237-
result.s.link_up = 1;
238-
result.s.full_duplex = 1;
239-
result.s.speed = 1000;
240-
return result;
241-
}
242-
/* Fall through to the generic code below */
243-
break;
244-
case CVMX_BOARD_TYPE_CUST_NB5:
245-
/* Port 1 on these boards is always Gigabit */
246-
if (ipd_port == 1) {
247-
result.s.link_up = 1;
248-
result.s.full_duplex = 1;
249-
result.s.speed = 1000;
250-
return result;
251-
}
252-
break;
253-
case CVMX_BOARD_TYPE_BBGW_REF:
254-
/* Port 1 on these boards is always Gigabit */
255-
if (ipd_port == 2) {
256-
/* Port 2 is not hooked up */
257-
result.u64 = 0;
258-
return result;
259-
} else {
260-
/* Ports 0 and 1 connect to the switch */
261-
result.s.link_up = 1;
262-
result.s.full_duplex = 1;
263-
result.s.speed = 1000;
264-
return result;
265-
}
266-
break;
267226
}
268227

269228
if (OCTEON_IS_MODEL(OCTEON_CN3XXX)

0 commit comments

Comments
 (0)