From 70b0d39bbcdfae30f1861990fa796e8874af23ef Mon Sep 17 00:00:00 2001 From: "Jayachandran C." Date: Fri, 2 Jul 2010 13:30:26 +0000 Subject: [PATCH] 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 --- sys/mips/rmi/board.c | 2 +- sys/mips/rmi/board.h | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/mips/rmi/board.c b/sys/mips/rmi/board.c index f3575d7c175..d346a9c274d 100644 --- a/sys/mips/rmi/board.c +++ b/sys/mips/rmi/board.c @@ -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; diff --git a/sys/mips/rmi/board.h b/sys/mips/rmi/board.h index 1b8cb14bdd9..0092fea25d3 100644 --- a/sys/mips/rmi/board.h +++ b/sys/mips/rmi/board.h @@ -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); } /* @@ -109,6 +110,14 @@ xlr_board_pci(void) (xlr_boot1_info.board_major_version == RMI_XLR_BOARD_ARIZONA_V)); } +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) {