Author: jmallett
Date: Mon Nov 19 08:35:58 2012
New Revision: 243265
URL: http://svnweb.freebsd.org/changeset/base/243265
Log:
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.
Modified:
head/sys/contrib/octeon-sdk/cvmx-helper-board.c
head/sys/contrib/octeon-sdk/cvmx-helper-spi.c
Modified: head/sys/contrib/octeon-sdk/cvmx-helper-board.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-helper-board.c Mon Nov 19 08:30:29
2012 (r243264)
+++ head/sys/contrib/octeon-sdk/cvmx-helper-board.c Mon Nov 19 08:35:58
2012 (r243265)
@@ -1313,14 +1313,6 @@ int __cvmx_helper_board_interface_probe(
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"))
Modified: head/sys/contrib/octeon-sdk/cvmx-helper-spi.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-helper-spi.c Mon Nov 19 08:30:29
2012 (r243264)
+++ head/sys/contrib/octeon-sdk/cvmx-helper-spi.c Mon Nov 19 08:35:58
2012 (r243265)
@@ -104,6 +104,16 @@ int __cvmx_helper_spi_enumerate(int inte
}
#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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
