Deleted Added
full compact
board.c (209318) board.c (209646)
1/*********************************************************************
2 *
3 * Copyright 2003-2006 Raza Microelectronics, Inc. (RMI). All rights
4 * reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 14 unchanged lines hidden (view full) ---

23 * SUBSTITUTE GOODS OR SERVICES, LOSS OF USE, DATA, OR PROFITS, OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGE.
28 *
29 * *****************************RMI_2**********************************/
30#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
1/*********************************************************************
2 *
3 * Copyright 2003-2006 Raza Microelectronics, Inc. (RMI). All rights
4 * reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 14 unchanged lines hidden (view full) ---

23 * SUBSTITUTE GOODS OR SERVICES, LOSS OF USE, DATA, OR PROFITS, OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGE.
28 *
29 * *****************************RMI_2**********************************/
30#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
31__FBSDID("$FreeBSD: head/sys/mips/rmi/board.c 209318 2010-06-18 21:40:32Z jchandra $");
31__FBSDID("$FreeBSD: head/sys/mips/rmi/board.c 209646 2010-07-02 13:30:26Z jchandra $");
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/bus.h>
35#include <sys/kernel.h>
36#include <sys/lock.h>
37#include <sys/mutex.h>
38
39#include <machine/cpufunc.h>

--- 82 unchanged lines hidden (view full) ---

122 else
123 xlr_board_info.gmac_block[0].mode = XLR_SGMII;
124 xlr_board_info.gmac_block[0].baseaddr = XLR_IO_GMAC_0_OFFSET;
125 xlr_board_info.gmac_block[0].baseirq = PIC_GMAC_0_IRQ;
126 xlr_board_info.gmac_block[0].baseinst = 0;
127
128 /* network block 1 */
129 xlr_board_info.gmac_block[1].type = XLR_GMAC;
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/bus.h>
35#include <sys/kernel.h>
36#include <sys/lock.h>
37#include <sys/mutex.h>
38
39#include <machine/cpufunc.h>

--- 82 unchanged lines hidden (view full) ---

122 else
123 xlr_board_info.gmac_block[0].mode = XLR_SGMII;
124 xlr_board_info.gmac_block[0].baseaddr = XLR_IO_GMAC_0_OFFSET;
125 xlr_board_info.gmac_block[0].baseirq = PIC_GMAC_0_IRQ;
126 xlr_board_info.gmac_block[0].baseinst = 0;
127
128 /* network block 1 */
129 xlr_board_info.gmac_block[1].type = XLR_GMAC;
130 xlr_board_info.gmac_block[1].enabled = 0xf;
130 xlr_board_info.gmac_block[1].enabled = xlr_is_xls1xx() ? 0 : 0xf;
131 if (xlr_is_xls4xx_lite()) {
132 xlr_reg_t *mmio = xlr_io_mmio(XLR_IO_GPIO_OFFSET);
133 uint32_t tmp;
134
135 /* some ports are not enabled on the condor 4xx, figure this
136 out from the GPIO fuse bank */
137 tmp = xlr_read_reg(mmio, 35);
138 if (tmp & (1<<28))

--- 60 unchanged lines hidden ---
131 if (xlr_is_xls4xx_lite()) {
132 xlr_reg_t *mmio = xlr_io_mmio(XLR_IO_GPIO_OFFSET);
133 uint32_t tmp;
134
135 /* some ports are not enabled on the condor 4xx, figure this
136 out from the GPIO fuse bank */
137 tmp = xlr_read_reg(mmio, 35);
138 if (tmp & (1<<28))

--- 60 unchanged lines hidden ---