Sync up sibyte headers with master versions
PATCH 1/1 Sync up sibyte headers with master versions
Hello,
Below is a patch to sync up the sibyte-specific header files with the master versions maintained here at Broadcom. The master files get edited directly, and then the derivitative versions for CFE, Linux, etc, all get generated automatically with the appropriate license, etc.
Because these haven't been synced in a while, some of these are just whitespace adjustments - please forgive those, but including them now will make future sync-ups much easier.
The real changes are updates for the 1480 register defintions to support Z-Bus tracing, and some of the newer MAC features, correcting a few typos, and providing names for a few additional 11xx based boards.
These were tested against the 2.6.18-rc4 kernel, as the tip doesn't seem to be working at the moment (ie. yesterday).
Thanks,
Mark
Signed-off-by Mark Mason <[email protected]>
include/asm-mips/sibyte/bcm1480_int.h +12 -12
@@ -1,22 +1,22 @@/* ********************************************************************* * BCM1280/BCM1480 Board Support Package -* +* * Interrupt Mapper definitions File: bcm1480_int.h -* +* * This module contains constants for manipulating the * BCM1255/BCM1280/BCM1455/BCM1480's interrupt mapper and * definitions for the interrupt sources. -* +* * BCM1480 specification level: 1X55_1X80-UM100-D4 (11/24/03) -* -********************************************************************* +* +********************************************************************* * * Copyright 2000,2001,2002,2003 * Broadcom Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful,
@@ -26,7 +26,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA ********************************************************************* */
@@ -51,9 +51,9 @@ #include "sb1250_defs.h"* register. */ -/* +/* * This entire file uses _BCM1480_ in all the symbols because it is -* entirely BCM1480 specific. +* entirely BCM1480 specific. */ /*
include/asm-mips/sibyte/bcm1480_l2c.h +10 -10
@@ -1,21 +1,21 @@/* ********************************************************************* * BCM1280/BCM1480 Board Support Package -* +* * L2 Cache constants and macros File: bcm1480_l2c.h -* +* * This module contains constants useful for manipulating the * level 2 cache. -* +* * BCM1400 specification level: 1280-UM100-D2 (11/14/03) -* -********************************************************************* +* +********************************************************************* * * Copyright 2000,2001,2002,2003 * Broadcom Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful,
@@ -25,7 +25,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA ********************************************************************* */
include/asm-mips/sibyte/bcm1480_mc.h +42 -24
139 lines not on this page · raw message
include/asm-mips/sibyte/bcm1480_regs.h +37 -37
242 lines not on this page · raw message
include/asm-mips/sibyte/bcm1480_scd.h +47 -80
224 lines not on this page · raw message
include/asm-mips/sibyte/bigsur.h +1 -1
@@ -22,7 +22,7 @@ #include <asm/sibyte/sb1250.h>#include <asm/sibyte/bcm1480_int.h> #ifdef CONFIG_SIBYTE_BIGSUR -#define SIBYTE_BOARD_NAME "BCM91x80A/B (BigSur)" +#define SIBYTE_BOARD_NAME "BCM91280A (BIGSUR)"#define SIBYTE_HAVE_PCMCIA 1#define SIBYTE_HAVE_IDE 1#endif
include/asm-mips/sibyte/carmel.h +6 -7
@@ -18,18 +18,17 @@#ifndef __ASM_SIBYTE_CARMEL_H#define __ASM_SIBYTE_CARMEL_H -#include <asm/sibyte/sb1250.h> #include <asm/sibyte/sb1250_int.h> #define SIBYTE_BOARD_NAME "Carmel" -#define GPIO_PHY_INTERRUPT 2 -#define GPIO_NONMASKABLE_INT 3 -#define GPIO_CF_INSERTED 6 -#define GPIO_MONTEREY_RESET 7 -#define GPIO_QUADUART_INT 8 -#define GPIO_CF_INT 9 +#define GPIO_PHY_INTERRUPT 2 +#define GPIO_NONMASKABLE_INT 3 +#define GPIO_CF_INSERTED 6 +#define GPIO_MONTEREY_RESET 7 +#define GPIO_QUADUART_INT 8 +#define GPIO_CF_INT 9#define GPIO_FPGA_CCLK 10#define GPIO_FPGA_DOUT 11#define GPIO_FPGA_DIN 12
include/asm-mips/sibyte/sb1250_defs.h +19 -18
@@ -1,21 +1,21 @@/* ********************************************************************* * SB1250 Board Support Package -* -* Global constants and macros File: sb1250_defs.h -* +* +* Global constants and macros File: sb1250_defs.h +* * This file contains macros and definitions used by the other * include files. * * SB1250 specification level: User's manual 1/02/02 -* -********************************************************************* +* +********************************************************************* * * Copyright 2000,2001,2002,2003 * Broadcom Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful,
@@ -25,7 +25,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA ********************************************************************* */
@@ -107,7 +107,7 @@ #define SIBYTE_HDR_FMASK_1480_ALL 0x000#define SIBYTE_HDR_FMASK_1480_PASS1 0x00001000#define SIBYTE_HDR_FMASK_1480_PASS2 0x00002000 -/* Bit mask for chip/revision. (use _ALL for all revisions of a chip). */ +/* Bit mask for chip/revision. (use _ALL for all revisions of a chip). */ #define SIBYTE_HDR_FMASK (chip, pass) \ (SIBYTE_HDR_FMASK_ ## chip ## _ ## pass)#define SIBYTE_HDR_FMASK_ALLREVS (chip) \
@@ -167,31 +167,31 @@ #define SIBYTE_HDR_FEATURE_UP_TO(chip, p/* ********************************************************************* * Naming schemes for constants in these files: -* -* M_xxx MASK constant (identifies bits in a register). +* +* M_xxx MASK constant (identifies bits in a register). * For multi-bit fields, all bits in the field will * be set. * * K_xxx "Code" constant (value for data in a multi-bit * field). The value is right justified. * -* V_xxx "Value" constant. This is the same as the +* V_xxx "Value" constant. This is the same as the * corresponding "K_xxx" constant, except it is * shifted to the correct position in the register. * * S_xxx SHIFT constant. This is the number of bits that -* a field value (code) needs to be shifted +* a field value (code) needs to be shifted * (towards the left) to put the value in the right * position for the register. * -* A_xxx ADDRESS constant. This will be a physical +* A_xxx ADDRESS constant. This will be a physical * address. Use the PHYS_TO_K1 macro to generate * a K1SEG address. * * R_xxx RELATIVE offset constant. This is an offset from * an A_xxx constant (usually the first register in * a group). -* +* * G_xxx(X) GET value. This macro obtains a multi-bit field * from a register, masks it, and shifts it to * the bottom of the register (retrieving a K_xxx
@@ -206,7 +206,7 @@ #define SIBYTE_HDR_FEATURE_UP_TO(chip, p/* -* Cast to 64-bit number. Presumably the syntax is different in +* Cast to 64-bit number. Presumably the syntax is different in * assembly language. * * Note: you'll need to define uint32_t and uint64_t in your headers.
@@ -257,3 +257,4 @@ #define SBREADCSR(csr) (*((volatile uint#endif /* __ASSEMBLER__ */ #endif +
include/asm-mips/sibyte/sb1250_dma.h +19 -19
@@ -1,23 +1,23 @@/* ********************************************************************* * SB1250 Board Support Package -* +* * DMA definitions File: sb1250_dma.h -* +* * This module contains constants and macros useful for * programming the SB1250's DMA controllers, both the data mover * and the Ethernet DMA. -* +* * SB1250 specification level: User's manual 10/21/02 * BCM1280 specification level: User's manual 11/24/03 -* -********************************************************************* +* +********************************************************************* * * Copyright 2000,2001,2002,2003 * Broadcom Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA ********************************************************************* */
@@ -42,9 +42,9 @@ #include "sb1250_defs.h"* DMA Registers ********************************************************************* */ -/* +/* * Ethernet and Serial DMA Configuration Register 0 (Table 7-4) -* Registers: DMA_CONFIG0_MAC_x_RX_CH_0 +* Registers: DMA_CONFIG0_MAC_x_RX_CH_0 * Registers: DMA_CONFIG0_MAC_x_TX_CH_0 * Registers: DMA_CONFIG0_SER_x_RX * Registers: DMA_CONFIG0_SER_x_TX
@@ -97,7 +97,7 @@ #define G_DMA_LOW_WATERMARK(x) _SB_/* * Ethernet and Serial DMA Configuration Register 1 (Table 7-5) -* Registers: DMA_CONFIG1_MAC_x_RX_CH_0 +* Registers: DMA_CONFIG1_MAC_x_RX_CH_0 * Registers: DMA_CONFIG1_DMA_x_TX_CH_0 * Registers: DMA_CONFIG1_SER_x_RX * Registers: DMA_CONFIG1_SER_x_TX
@@ -151,11 +151,11 @@ #define M_DMA_ASIC_BASE_MBZ _SB_/* * DMA Descriptor Count Registers (Table 7-8) */ - +/* No bitfields */ -/* +/* * Current Descriptor Address Register (Table 7-11) */
@@ -274,7 +274,7 @@ #define M_DMA_DSCRB_STATUS _SB_#define V_DMA_DSCRB_STATUS (x) _SB_MAKEVALUE(x,S_DMA_DSCRB_STATUS)#define G_DMA_DSCRB_STATUS (x) _SB_GETVALUE(x,S_DMA_DSCRB_STATUS,M_DMA_DSCRB_STATUS) -/* +/* * Ethernet Descriptor Status Bits (Table 7-15) */
@@ -324,7 +324,7 @@ #define M_DMA_ETHRX_SOP _SB_#define M_DMA_ETHTX_SOP _SB_MAKEMASK1(63) -/* +/* * Ethernet Transmit Options (Table 7-17) */
@@ -377,7 +377,7 @@ #define K_DMA_SERTX_ABORT _SB_* Data Mover Registers ********************************************************************* */ -/* +/* * Data Mover Descriptor Base Address Register (Table 7-22) * Register: DM_DSCR_BASE_0 * Register: DM_DSCR_BASE_1
@@ -414,7 +414,7 @@ #define M_DM_DSCR_BASE_ERROR _SB_#define M_DM_DSCR_BASE_ABORT _SB_MAKEMASK1(62)#define M_DM_DSCR_BASE_ENABL _SB_MAKEMASK1(63) -/* +/* * Data Mover Descriptor Count Register (Table 7-25) */
include/asm-mips/sibyte/sb1250_genbus.h +12 -12
@@ -1,22 +1,22 @@/* ********************************************************************* * SB1250 Board Support Package -* +* * Generic Bus Constants File: sb1250_genbus.h -* -* This module contains constants and macros useful for +* +* This module contains constants and macros useful for * manipulating the SB1250's Generic Bus interface -* +* * SB1250 specification level: User's manual 10/21/02 * BCM1280 specification level: User's Manual 11/14/03 -* -********************************************************************* +* +********************************************************************* * * Copyright 2000,2001,2002,2003 * Broadcom Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful,
@@ -26,7 +26,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA ********************************************************************* */
@@ -416,7 +416,7 @@ #define G_GPIO_INTR_TYPE14(x) _SB_GETVAL#if SIBYTE_HDR_FEATURE_CHIP (1480 )/* -* GPIO Interrupt Additional Type Register +* GPIO Interrupt Additional Type Register */ #define K_GPIO_INTR_BOTHEDGE 0
include/asm-mips/sibyte/sb1250_int.h +11 -11
@@ -1,21 +1,21 @@/* ********************************************************************* * SB1250 Board Support Package -* +* * Interrupt Mapper definitions File: sb1250_int.h -* +* * This module contains constants for manipulating the SB1250's * interrupt mapper and definitions for the interrupt sources. -* +* * SB1250 specification level: User's manual 1/02/02 -* -********************************************************************* +* +********************************************************************* * * Copyright 2000,2001,2002,2003 * Broadcom Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful,
@@ -25,7 +25,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA ********************************************************************* */
@@ -41,7 +41,7 @@ #include "sb1250_defs.h"/* * Interrupt sources (Table 4-8, UM 0.2) -* +* * First, the interrupt numbers. */
include/asm-mips/sibyte/sb1250_l2c.h +10 -10
@@ -1,21 +1,21 @@/* ********************************************************************* * SB1250 Board Support Package -* +* * L2 Cache constants and macros File: sb1250_l2c.h -* +* * This module contains constants useful for manipulating the * level 2 cache. -* +* * SB1250 specification level: User's manual 1/02/02 -* -********************************************************************* +* +********************************************************************* * * Copyright 2000,2001,2002,2003 * Broadcom Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful,
@@ -25,7 +25,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA ********************************************************************* */
include/asm-mips/sibyte/sb1250_ldt.h +15 -15
@@ -1,21 +1,21 @@/* ********************************************************************* * SB1250 Board Support Package -* +* * LDT constants File: sb1250_ldt.h -* -* This module contains constants and macros to describe -* the LDT interface on the SB1250. -* +* +* This module contains constants and macros to describe +* the LDT interface on the SB1250. +* * SB1250 specification level: User's manual 1/02/02 -* -********************************************************************* +* +********************************************************************* * * Copyright 2000,2001,2002,2003 * Broadcom Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful,
@@ -25,7 +25,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA ********************************************************************* */
@@ -153,7 +153,7 @@ #define G_LDT_DEVHDR_BIST(x) _SB_GETVAL/* * LDT Status Register (Table 8-14). Note that these constants -* assume you've read the command and status register +* assume you've read the command and status register * together (32-bit read at offset 0x04) * * These bits also apply to the secondary status
@@ -181,8 +181,8 @@ #define M_LDT_STATUS_SIGDSERR _SB_MAKEM#define M_LDT_STATUS_DETPARERR _SB_MAKEMASK1_32(31)/* -* Bridge Control Register (Table 8-16). Note that these -* constants assume you've read the register as a 32-bit +* Bridge Control Register (Table 8-16). Note that these +* constants assume you've read the register as a 32-bit * read (offset 0x3C) */
include/asm-mips/sibyte/sb1250_mac.h +24 -24
123 lines not on this page · raw message
include/asm-mips/sibyte/sb1250_mc.h +14 -14
@@ -1,21 +1,21 @@/* ********************************************************************* * SB1250 Board Support Package -* -* Memory Controller constants File: sb1250_mc.h -* +* +* Memory Controller constants File: sb1250_mc.h +* * This module contains constants and macros useful for * programming the memory controller. -* +* * SB1250 specification level: User's manual 1/02/02 -* -********************************************************************* +* +********************************************************************* * * Copyright 2000,2001,2002,2003 * Broadcom Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful,
@@ -25,7 +25,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA ********************************************************************* */
@@ -164,7 +164,7 @@ #define G_MC_REF_RATE(x) _SB#define K_MC_REF_RATE_100MHz 0x62#define K_MC_REF_RATE_133MHz 0x81 -#define K_MC_REF_RATE_200MHz 0xC4 +#define K_MC_REF_RATE_200MHz 0xC4#define V_MC_REF_RATE_100MHz V_MC_REF_RATE(K_MC_REF_RATE_100MHz)#define V_MC_REF_RATE_133MHz V_MC_REF_RATE(K_MC_REF_RATE_133MHz)
@@ -226,7 +226,7 @@ #define V_MC_CLKCONFIG_DEFAULT V_MV_MC_ADDR_DRIVE_DEFAULT | \V_MC_DATA_DRIVE_DEFAULT | \V_MC_CLOCK_DRIVE_DEFAULT | \ -V_MC_REF_RATE_DEFAULT +V_MC_REF_RATE_DEFAULT
@@ -295,7 +295,7 @@ #define M_MC_EXTERNALDECODE _SB_MAKE #if SIBYTE_HDR_FEATURE(1250, PASS3) || SIBYTE_HDR_FEATURE(112x, PASS1)#define M_MC_PRE_ON_A8 _SB_MAKEMASK1(36) -#define M_MC_RAM_WITH_A13 _SB_MAKEMASK1(38) +#define M_MC_RAM_WITH_A13 _SB_MAKEMASK1(37)#endif /* 1250 PASS3 || 112x PASS1 */
include/asm-mips/sibyte/sb1250_regs.h +41 -40
255 lines not on this page · raw message
include/asm-mips/sibyte/sb1250_scd.h +35 -27
172 lines not on this page · raw message
include/asm-mips/sibyte/sb1250_smbus.h +11 -11
@@ -1,22 +1,22 @@/* ********************************************************************* * SB1250 Board Support Package -* +* * SMBUS Constants File: sb1250_smbus.h -* -* This module contains constants and macros useful for +* +* This module contains constants and macros useful for * manipulating the SB1250's SMbus devices. -* +* * SB1250 specification level: 10/21/02 * BCM1280 specification level: 11/24/03 -* -********************************************************************* +* +********************************************************************* * * Copyright 2000,2001,2002,2003 * Broadcom Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful,
@@ -26,7 +26,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA ********************************************************************* */
include/asm-mips/sibyte/sb1250_syncser.h +6 -6
@@ -7,15 +7,15 @@* manipulating the SB1250's Synchronous Serial * * SB1250 specification level: User's manual 1/02/02 -* +* ********************************************************************* * * Copyright 2000,2001,2002,2003 * Broadcom Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful,
@@ -25,7 +25,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA ********************************************************************* */
include/asm-mips/sibyte/sb1250_uart.h +14 -14
@@ -1,21 +1,21 @@/* ********************************************************************* * SB1250 Board Support Package -* +* * UART Constants File: sb1250_uart.h -* -* This module contains constants and macros useful for +* +* This module contains constants and macros useful for * manipulating the SB1250's UARTs * * SB1250 specification level: User's manual 1/02/02 -* -********************************************************************* +* +********************************************************************* * * Copyright 2000,2001,2002,2003 * Broadcom Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful,
@@ -25,7 +25,7 @@* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA ********************************************************************* */
@@ -35,7 +35,7 @@ #define _SB1250_UART_H#include "sb1250_defs.h" -/* ********************************************************************** +/* ********************************************************************** * DUART Registers ********************************************************************** */
@@ -143,7 +143,7 @@ #define V_DUART_MISC_CMD_RESET_BREAK_INT#define V_DUART_MISC_CMD_START_BREAK V_DUART_MISC_CMD(K_DUART_MISC_CMD_START_BREAK)#define V_DUART_MISC_CMD_STOP_BREAK V_DUART_MISC_CMD(K_DUART_MISC_CMD_STOP_BREAK) -#define M_DUART_CMD_RESERVED _SB_MAKEMASK1(7) +#define M_DUART_CMD_RESERVED _SB_MAKEMASK1(7)/* * DUART Status Register (Table 10-6)
@@ -163,7 +163,7 @@ #define M_DUART_RCVD_BRK _SB_/* * DUART Baud Rate Register (Table 10-7) -* Register: DUART_CLK_SEL_A +* Register: DUART_CLK_SEL_A * Register: DUART_CLK_SEL_B */
@@ -335,7 +335,7 @@ #define M_DUART_OUT_PIN_CLR(chan) \ (chan == 0 ? M_DUART_OUT_PIN_CLR0 : M_DUART_OUT_PIN_CLR1) #if SIBYTE_HDR_FEATURE(1250, PASS2) || SIBYTE_HDR_FEATURE(112x, PASS1) || SIBYTE_HDR_FEATURE_CHIP(1480) -/* +/* * Full Interrupt Control Register */
include/asm-mips/sibyte/sentosa.h +0 -0
include/asm-mips/sibyte/swarm.h +12 -0
@@ -32,6 +32,18 @@ #define SIBYTE_HAVE_PCMCIA 1#define SIBYTE_HAVE_IDE 1#define SIBYTE_DEFAULT_CONSOLE "ttyS0,115200"#endif +#ifdef CONFIG_SIBYTE_PT1120 +#define SIBYTE_BOARD_NAME "PT1120" +#define SIBYTE_HAVE_PCMCIA 1 +#define SIBYTE_HAVE_IDE 1 +#define SIBYTE_DEFAULT_CONSOLE "ttyS0,115200" +#endif +#ifdef CONFIG_SIBYTE_PT1125 +#define SIBYTE_BOARD_NAME "PT1125" +#define SIBYTE_HAVE_PCMCIA 1 +#define SIBYTE_HAVE_IDE 1 +#define SIBYTE_DEFAULT_CONSOLE "ttyS0,115200" +#endif #ifdef CONFIG_SIBYTE_LITTLESUR #define SIBYTE_BOARD_NAME "BCM91250C2 (LittleSur)"#define SIBYTE_HAVE_PCMCIA 0