Return port numbers for ATCA-7220 SPI interfaces in a different place for

consistency reasons, and to ensure that CRC addition is disabled on output.
With this, transmit seems to be working properly on the ATCA-7220.

2 files changed, 10 insertions, 8 deletions

diff --git a/sys/contrib/octeon-sdk/cvmx-helper-board.c b/sys/contrib/octeon-sdk/cvmx-helper-board.c
index 2582dae..deb6018 100644
--- a/sys/contrib/octeon-sdk/cvmx-helper-board.c
+++ b/sys/contrib/octeon-sdk/cvmx-helper-board.c
@@ -1313,14 +1313,6 @@ int __cvmx_helper_board_interface_probe(int interface, int supported_ports)
 	        return 12;
 	    break;
 #endif
-#if defined(OCTEON_VENDOR_RADISYS)
-	case CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE:
-	    if (interface == 0)
-		    return 13;
-	    if (interface == 1)
-		    return 8;
-	    return 0;
-#endif
     }
 #ifdef CVMX_BUILD_FOR_UBOOT
     if (CVMX_HELPER_INTERFACE_MODE_SPI == cvmx_helper_interface_get_mode(interface) && getenv("disable_spi"))
diff --git a/sys/contrib/octeon-sdk/cvmx-helper-spi.c b/sys/contrib/octeon-sdk/cvmx-helper-spi.c
index 960da0e..317cc76 100644
--- a/sys/contrib/octeon-sdk/cvmx-helper-spi.c
+++ b/sys/contrib/octeon-sdk/cvmx-helper-spi.c
@@ -104,6 +104,16 @@ int __cvmx_helper_spi_enumerate(int interface)
     }
 #endif
 
+#if defined(OCTEON_VENDOR_RADISYS)
+    if (cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_CUST_RADISYS_RSYS4GBE) {
+	    if (interface == 0)
+		    return 13;
+	    if (interface == 1)
+		    return 8;
+	    return 0;
+    }
+#endif
+
 	if ((cvmx_sysinfo_get()->board_type != CVMX_BOARD_TYPE_SIM) &&
 	    cvmx_spi4000_is_present(interface))
 		return 10;