]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
MIPS: OCTEON: don't lie about interface type of CN3005 board
authorAaro Koskinen <aaro.koskinen@iki.fi>
Mon, 4 Feb 2019 22:41:47 +0000 (00:41 +0200)
committerPaul Burton <paul.burton@mips.com>
Thu, 7 Feb 2019 23:22:34 +0000 (15:22 -0800)
The fixed-link node in the DT should now take care of the link status,
so this hack can be deleted.

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.c

index b695d134b60fc2da5a480a525d0903ec80501d2e..151fd440a4b4925a59ef309a7d1ded9e71eab4d7 100644 (file)
@@ -317,22 +317,6 @@ cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(int interface)
                        return CVMX_HELPER_INTERFACE_MODE_DISABLED;
        }
 
-       if (interface == 0
-           && cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_CN3005_EVB_HS5
-           && cvmx_sysinfo_get()->board_rev_major == 1) {
-               /*
-                * Lie about interface type of CN3005 board.  This
-                * board has a switch on port 1 like the other
-                * evaluation boards, but it is connected over RGMII
-                * instead of GMII.  Report GMII mode so that the
-                * speed is forced to 1 Gbit full duplex.  Other than
-                * some initial configuration (which does not use the
-                * output of this function) there is no difference in
-                * setup between GMII and RGMII modes.
-                */
-               return CVMX_HELPER_INTERFACE_MODE_GMII;
-       }
-
        /* Interface 1 is always disabled on CN31XX and CN30XX */
        if ((interface == 1)
            && (OCTEON_IS_MODEL(OCTEON_CN31XX) || OCTEON_IS_MODEL(OCTEON_CN30XX)