MIPS: OCTEON: delete board-specific link status
authorAaro Koskinen <aaro.koskinen@iki.fi>
Mon, 4 Feb 2019 22:41:48 +0000 (00:41 +0200)
committerPaul Burton <paul.burton@mips.com>
Thu, 7 Feb 2019 23:22:35 +0000 (15:22 -0800)
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
arch/mips/cavium-octeon/executive/cvmx-helper-board.c

index 46ea54e..634eae5 100644 (file)
@@ -217,53 +217,12 @@ cvmx_helper_link_info_t __cvmx_helper_board_link_get(int ipd_port)
        /* Unless we fix it later, all links are defaulted to down */
        result.u64 = 0;
 
-       /*
-        * This switch statement should handle all ports that either don't use
-        * Marvell PHYS, or don't support in-band status.
-        */
-       switch (cvmx_sysinfo_get()->board_type) {
-       case CVMX_BOARD_TYPE_SIM:
+       if (octeon_is_simulation()) {
                /* The simulator gives you a simulated 1Gbps full duplex link */
                result.s.link_up = 1;
                result.s.full_duplex = 1;
                result.s.speed = 1000;
                return result;
-       case CVMX_BOARD_TYPE_EBH3100:
-       case CVMX_BOARD_TYPE_CN3010_EVB_HS5:
-       case CVMX_BOARD_TYPE_CN3005_EVB_HS5:
-       case CVMX_BOARD_TYPE_CN3020_EVB_HS5:
-               /* Port 1 on these boards is always Gigabit */
-               if (ipd_port == 1) {
-                       result.s.link_up = 1;
-                       result.s.full_duplex = 1;
-                       result.s.speed = 1000;
-                       return result;
-               }
-               /* Fall through to the generic code below */
-               break;
-       case CVMX_BOARD_TYPE_CUST_NB5:
-               /* Port 1 on these boards is always Gigabit */
-               if (ipd_port == 1) {
-                       result.s.link_up = 1;
-                       result.s.full_duplex = 1;
-                       result.s.speed = 1000;
-                       return result;
-               }
-               break;
-       case CVMX_BOARD_TYPE_BBGW_REF:
-               /* Port 1 on these boards is always Gigabit */
-               if (ipd_port == 2) {
-                       /* Port 2 is not hooked up */
-                       result.u64 = 0;
-                       return result;
-               } else {
-                       /* Ports 0 and 1 connect to the switch */
-                       result.s.link_up = 1;
-                       result.s.full_duplex = 1;
-                       result.s.speed = 1000;
-                       return result;
-               }
-               break;
        }
 
        if (OCTEON_IS_MODEL(OCTEON_CN3XXX)