summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2019-02-05 00:41:47 +0200
committerPaul Burton <paul.burton@mips.com>2019-02-07 15:22:34 -0800
commit154ca3f74f060088aa4c6cc5820145f425b401ff (patch)
tree56542c71a8c40f3b84373281670862cbbcacc1a7
parent2c0756d306c2d50c229f789e2ad28c7e1c1de420 (diff)
downloadlinux-154ca3f74f060088aa4c6cc5820145f425b401ff.tar.gz
linux-154ca3f74f060088aa4c6cc5820145f425b401ff.tar.bz2
linux-154ca3f74f060088aa4c6cc5820145f425b401ff.zip
MIPS: OCTEON: don't lie about interface type of CN3005 board
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
-rw-r--r--arch/mips/cavium-octeon/executive/cvmx-helper.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c
index b695d134b60f..151fd440a4b4 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c
@@ -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)