diff options
Diffstat (limited to 'arch/mips/cavium-octeon/executive/cvmx-helper-board.c')
-rw-r--r-- | arch/mips/cavium-octeon/executive/cvmx-helper-board.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c index fd2015331a20..7c6497781895 100644 --- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c | |||
@@ -203,10 +203,10 @@ int cvmx_helper_board_get_mii_address(int ipd_port) | |||
203 | * enumeration from the bootloader. | 203 | * enumeration from the bootloader. |
204 | * | 204 | * |
205 | * @ipd_port: IPD input port associated with the port we want to get link | 205 | * @ipd_port: IPD input port associated with the port we want to get link |
206 | * status for. | 206 | * status for. |
207 | * | 207 | * |
208 | * Returns The ports link status. If the link isn't fully resolved, this must | 208 | * Returns The ports link status. If the link isn't fully resolved, this must |
209 | * return zero. | 209 | * return zero. |
210 | */ | 210 | */ |
211 | cvmx_helper_link_info_t __cvmx_helper_board_link_get(int ipd_port) | 211 | cvmx_helper_link_info_t __cvmx_helper_board_link_get(int ipd_port) |
212 | { | 212 | { |
@@ -357,16 +357,16 @@ cvmx_helper_link_info_t __cvmx_helper_board_link_get(int ipd_port) | |||
357 | result.s.link_up = 1; | 357 | result.s.link_up = 1; |
358 | result.s.full_duplex = ((phy_status >> 13) & 1); | 358 | result.s.full_duplex = ((phy_status >> 13) & 1); |
359 | switch ((phy_status >> 14) & 3) { | 359 | switch ((phy_status >> 14) & 3) { |
360 | case 0: /* 10 Mbps */ | 360 | case 0: /* 10 Mbps */ |
361 | result.s.speed = 10; | 361 | result.s.speed = 10; |
362 | break; | 362 | break; |
363 | case 1: /* 100 Mbps */ | 363 | case 1: /* 100 Mbps */ |
364 | result.s.speed = 100; | 364 | result.s.speed = 100; |
365 | break; | 365 | break; |
366 | case 2: /* 1 Gbps */ | 366 | case 2: /* 1 Gbps */ |
367 | result.s.speed = 1000; | 367 | result.s.speed = 1000; |
368 | break; | 368 | break; |
369 | case 3: /* Illegal */ | 369 | case 3: /* Illegal */ |
370 | result.u64 = 0; | 370 | result.u64 = 0; |
371 | break; | 371 | break; |
372 | } | 372 | } |
@@ -391,16 +391,16 @@ cvmx_helper_link_info_t __cvmx_helper_board_link_get(int ipd_port) | |||
391 | result.s.link_up = inband_status.s.status; | 391 | result.s.link_up = inband_status.s.status; |
392 | result.s.full_duplex = inband_status.s.duplex; | 392 | result.s.full_duplex = inband_status.s.duplex; |
393 | switch (inband_status.s.speed) { | 393 | switch (inband_status.s.speed) { |
394 | case 0: /* 10 Mbps */ | 394 | case 0: /* 10 Mbps */ |
395 | result.s.speed = 10; | 395 | result.s.speed = 10; |
396 | break; | 396 | break; |
397 | case 1: /* 100 Mbps */ | 397 | case 1: /* 100 Mbps */ |
398 | result.s.speed = 100; | 398 | result.s.speed = 100; |
399 | break; | 399 | break; |
400 | case 2: /* 1 Gbps */ | 400 | case 2: /* 1 Gbps */ |
401 | result.s.speed = 1000; | 401 | result.s.speed = 1000; |
402 | break; | 402 | break; |
403 | case 3: /* Illegal */ | 403 | case 3: /* Illegal */ |
404 | result.u64 = 0; | 404 | result.u64 = 0; |
405 | break; | 405 | break; |
406 | } | 406 | } |
@@ -429,9 +429,9 @@ cvmx_helper_link_info_t __cvmx_helper_board_link_get(int ipd_port) | |||
429 | * | 429 | * |
430 | * @phy_addr: The address of the PHY to program | 430 | * @phy_addr: The address of the PHY to program |
431 | * @enable_autoneg: | 431 | * @enable_autoneg: |
432 | * Non zero if you want to enable auto-negotiation. | 432 | * Non zero if you want to enable auto-negotiation. |
433 | * @link_info: Link speed to program. If the speed is zero and auto-negotiation | 433 | * @link_info: Link speed to program. If the speed is zero and auto-negotiation |
434 | * is enabled, all possible negotiation speeds are advertised. | 434 | * is enabled, all possible negotiation speeds are advertised. |
435 | * | 435 | * |
436 | * Returns Zero on success, negative on failure | 436 | * Returns Zero on success, negative on failure |
437 | */ | 437 | */ |
@@ -607,10 +607,10 @@ int cvmx_helper_board_link_set_phy(int phy_addr, | |||
607 | * | 607 | * |
608 | * @interface: Interface to probe | 608 | * @interface: Interface to probe |
609 | * @supported_ports: | 609 | * @supported_ports: |
610 | * Number of ports Octeon supports. | 610 | * Number of ports Octeon supports. |
611 | * | 611 | * |
612 | * Returns Number of ports the actual board supports. Many times this will | 612 | * Returns Number of ports the actual board supports. Many times this will |
613 | * simple be "support_ports". | 613 | * simple be "support_ports". |
614 | */ | 614 | */ |
615 | int __cvmx_helper_board_interface_probe(int interface, int supported_ports) | 615 | int __cvmx_helper_board_interface_probe(int interface, int supported_ports) |
616 | { | 616 | { |