svn commit: r209646 - head/sys/mips/rmi

[Jayachandran C.]

Author: jchandra
Date: Fri Jul  2 13:30:26 2010
New Revision: 209646
URL: http://svn.freebsd.org/changeset/base/209646

Log:
  Add support for XLS 108 chips - update board.c/board.h to setup GMAC
  driver parameters correctly.
  
  Approved by:  rrs (mentor)
  Obtained from:        Sriram Gorti <srgo...@netlogicmicro.com>

Modified:
  head/sys/mips/rmi/board.c
  head/sys/mips/rmi/board.h

Modified: head/sys/mips/rmi/board.c
==============================================================================
--- head/sys/mips/rmi/board.c   Fri Jul  2 12:01:46 2010        (r209645)
+++ head/sys/mips/rmi/board.c   Fri Jul  2 13:30:26 2010        (r209646)
@@ -127,7 +127,7 @@ xlr_board_info_setup()
 
                /* network block 1 */
                xlr_board_info.gmac_block[1].type = XLR_GMAC;
-               xlr_board_info.gmac_block[1].enabled = 0xf;
+               xlr_board_info.gmac_block[1].enabled = xlr_is_xls1xx() ? 0 : 
0xf;
                if (xlr_is_xls4xx_lite()) {
                        xlr_reg_t *mmio = xlr_io_mmio(XLR_IO_GPIO_OFFSET);
                        uint32_t tmp;

Modified: head/sys/mips/rmi/board.h
==============================================================================
--- head/sys/mips/rmi/board.h   Fri Jul  2 12:01:46 2010        (r209645)
+++ head/sys/mips/rmi/board.h   Fri Jul  2 13:30:26 2010        (r209646)
@@ -77,7 +77,8 @@ xlr_is_xls(void)
 {
        uint32_t prid = mips_rd_prid();
 
-       return (prid & 0xf000) == 0x8000 || (prid & 0xf000) == 0x4000;
+       return ((prid & 0xf000) == 0x8000 || (prid & 0xf000) == 0x4000 ||
+           (prid & 0xf000) == 0xc000);
 }
 
 /*
@@ -110,6 +111,14 @@ xlr_board_pci(void)
 }
 
 static __inline__ int
+xlr_is_xls1xx(void)
+{
+       uint32_t chipid = xlr_processor_id();
+
+       return (chipid == 0xce || chipid == 0xcf);
+}
+
+static __inline__ int
 xlr_is_xls2xx(void)
 {
        uint32_t chipid = xlr_processor_id();
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"