updated Sibyte headers
PATCH 1/1 updated Sibyte headers
This is an update to the earlier patch for the sibyte headers, and superceeds the previous patch. Changes were necessary to get the tbprof driver working on the bcm1480.
Patch to update Sibyte header files to match master versions maintained at Broadcom. This patch also corrects some whitespace problems, and (hopefully) shouldn't introduce any new ones.
Signed-off-by Mark Mason <[email protected]>
include/asm-mips/sibyte/bcm1480_int.h +2 -0
@@ -157,6 +157,7 @@ #define K_BCM1480_INT_GPIO_15* Mask values for each interrupt */ +#define _BCM1480_INT_MASK (w,n) _SB_MAKEMASK(w,((n) & 0x3F))#define _BCM1480_INT_MASK1 (n) _SB_MAKEMASK1(((n) & 0x3F))#define _BCM1480_INT_OFFSET (n) (((n) & 0x40) << 6)
@@ -195,6 +196,7 @@ #define M_BCM1480_INT_PMI_LOW#define M_BCM1480_INT_PMI_HIGH _BCM1480_INT_MASK1(K_BCM1480_INT_PMI_HIGH)#define M_BCM1480_INT_PMO_LOW _BCM1480_INT_MASK1(K_BCM1480_INT_PMO_LOW)#define M_BCM1480_INT_PMO_HIGH _BCM1480_INT_MASK1(K_BCM1480_INT_PMO_HIGH) +#define M_BCM1480_INT_MBOX_ALL _BCM1480_INT_MASK(8,K_BCM1480_INT_MBOX_0_0)#define M_BCM1480_INT_MBOX_0_0 _BCM1480_INT_MASK1(K_BCM1480_INT_MBOX_0_0)#define M_BCM1480_INT_MBOX_0_1 _BCM1480_INT_MASK1(K_BCM1480_INT_MBOX_0_1)#define M_BCM1480_INT_MBOX_0_2 _BCM1480_INT_MASK1(K_BCM1480_INT_MBOX_0_2)
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 +27 -5
@@ -382,6 +382,10 @@ #define M_BCM1480_MC_CS5#define M_BCM1480_MC_CS6 _SB_MAKEMASK1(10)#define M_BCM1480_MC_CS7 _SB_MAKEMASK1(11) +#define M_BCM1480_MC_CS _SB_MAKEMASK(8,S_BCM1480_MC_CS0) +#define V_BCM1480_MC_CS (x) _SB_MAKEVALUE(x,S_BCM1480_MC_CS0) +#define G_BCM1480_MC_CS (x) _SB_GETVALUE(x,S_BCM1480_MC_CS0,M_BCM1480_MC_CS0) +#define M_BCM1480_MC_CMD_ACTIVE _SB_MAKEMASK1(16)/*
@@ -412,6 +416,8 @@ #if SIBYTE_HDR_FEATURE(1480, PASS2)#define K_BCM1480_MC_DRAM_TYPE_DDR2 2#endif +#define K_BCM1480_MC_DRAM_TYPE_DDR2_PASS1 0 +#define V_BCM1480_MC_DRAM_TYPE_JEDEC V_BCM1480_MC_DRAM_TYPE(K_BCM1480_MC_DRAM_TYPE_JEDEC)#define V_BCM1480_MC_DRAM_TYPE_FCRAM V_BCM1480_MC_DRAM_TYPE(K_BCM1480_MC_DRAM_TYPE_FCRAM)
@@ -511,6 +517,22 @@ #define M_BCM1480_MC_WR_ODT6_CS4 _SB#define M_BCM1480_MC_WR_ODT6_CS6 _SB_MAKEMASK1(31)#define M_BCM1480_MC_CS_ODD_ODT_EN _SB_MAKEMASK1(32) + +#define S_BCM1480_MC_ODT0 0 +#define M_BCM1480_MC_ODT0 _SB_MAKEMASK(8,S_BCM1480_MC_ODT0) +#define V_BCM1480_MC_ODT0 (x) _SB_MAKEVALUE(x,S_BCM1480_MC_ODT0) + +#define S_BCM1480_MC_ODT2 8 +#define M_BCM1480_MC_ODT2 _SB_MAKEMASK(8,S_BCM1480_MC_ODT2) +#define V_BCM1480_MC_ODT2 (x) _SB_MAKEVALUE(x,S_BCM1480_MC_ODT2) + +#define S_BCM1480_MC_ODT4 16 +#define M_BCM1480_MC_ODT4 _SB_MAKEMASK(8,S_BCM1480_MC_ODT4) +#define V_BCM1480_MC_ODT4 (x) _SB_MAKEVALUE(x,S_BCM1480_MC_ODT4) + +#define S_BCM1480_MC_ODT6 24 +#define M_BCM1480_MC_ODT6 _SB_MAKEMASK(8,S_BCM1480_MC_ODT6) +#define V_BCM1480_MC_ODT6 (x) _SB_MAKEVALUE(x,S_BCM1480_MC_ODT6)#endif /*
@@ -588,11 +610,11 @@ #define M_BCM1480_MC_DLL_REGBYPASS#define M_BCM1480_MC_DQO_SHIFT _SB_MAKEMASK1(47)#endif -#define S_BCM1480_MC_DLL_DEFAULT 48 -#define M_BCM1480_MC_DLL_DEFAULT _SB_MAKEMASK(6,S_BCM1480_MC_DLL_DEFAULT) -#define V_BCM1480_MC_DLL_DEFAULT (x) _SB_MAKEVALUE(x,S_BCM1480_MC_DLL_DEFAULT) -#define G_BCM1480_MC_DLL_DEFAULT (x) _SB_GETVALUE(x,S_BCM1480_MC_DLL_DEFAULT,M_BCM1480_MC_DLL_DEFAULT) -#define V_BCM1480_MC_DLL_DEFAULT_DEFAULT V_BCM1480_MC_DLL_DEFAULT(0x10) +#define S_BCM1480_MC_DLL_DEFAULT 48 +#define M_BCM1480_MC_DLL_DEFAULT _SB_MAKEMASK(6,S_BCM1480_MC_DLL_DEFAULT) +#define V_BCM1480_MC_DLL_DEFAULT (x) _SB_MAKEVALUE(x,S_BCM1480_MC_DLL_DEFAULT) +#define G_BCM1480_MC_DLL_DEFAULT (x) _SB_GETVALUE(x,S_BCM1480_MC_DLL_DEFAULT,M_BCM1480_MC_DLL_DEFAULT) +#define V_BCM1480_MC_DLL_DEFAULT_DEFAULT V_BCM1480_MC_DLL_DEFAULT(0x10)#if SIBYTE_HDR_FEATURE (1480 ,PASS2 )#define S_BCM1480_MC_DLL_REGCTRL 54
include/asm-mips/sibyte/bcm1480_regs.h +20 -0
@@ -230,6 +230,7 @@ #define R_BCM1480_DUART_ISRREG(chan)#define A_BCM1480_DUART_IMRREG (chan) (A_BCM1480_DUART(chan) + R_BCM1480_DUART_IMRREG(chan))#define A_BCM1480_DUART_ISRREG (chan) (A_BCM1480_DUART(chan) + R_BCM1480_DUART_ISRREG(chan)) +#define A_BCM1480_DUART_IN_PORT (chan) (A_BCM1480_DUART(chan) + R_DUART_INP_ORT)/* * These constants are the absolute addresses.
@@ -404,6 +405,21 @@ #define A_BCM1480_IMR_ALIAS_MAILBOX_REGI#define R_BCM1480_IMR_ALIAS_MAILBOX_0 0x0000/* 0x0x0 */ #define R_BCM1480_IMR_ALIAS_MAILBOX_0_SET 0x0008/* 0x0x8 */ +/* +* these macros work together to build the address of a mailbox +* register, e.g., A_BCM1480_MAILBOX_REGISTER(0,R_BCM1480_IMR_MAILBOX_SET,2) +* for mbox_0_set_cpu2 returns 0x00100240C8 +*/ +#define R_BCM1480_IMR_MAILBOX_CPU 0x00 +#define R_BCM1480_IMR_MAILBOX_SET 0x08 +#define R_BCM1480_IMR_MAILBOX_CLR 0x10 +#define R_BCM1480_IMR_MAILBOX_NUM_SPACING 0x20 +#define A_BCM1480_MAILBOX_REGISTER (num,reg,cpu) \ + (A_BCM1480_IMR_CPU0_BASE + \ + (num * R_BCM1480_IMR_MAILBOX_NUM_SPACING) + \ + (cpu * BCM1480_IMR_REGISTER_SPACING) + \ + (R_BCM1480_IMR_MAILBOX_0_CPU + reg)) +/* ********************************************************************* * System Performance Counter Registers (Section 4.7) ********************************************************************* */
@@ -428,6 +444,10 @@ #define A_BCM1480_SCD_PERF_CNT_5#define A_BCM1480_SCD_PERF_CNT_6 0x0010020500#define A_BCM1480_SCD_PERF_CNT_7 0x0010020508 +#define BCM1480_SCD_NUM_PERF_CNT 8 +#define BCM1480_SCD_PERF_CNT_SPACING 8 +#define A_BCM1480_SCD_PERF_CNT (n) (A_SCD_PERF_CNT_0+(n*BCM1480_SCD_PERF_CNT_SPACING)) +/* ********************************************************************* * System Bus Watcher Registers (Section 4.8) ********************************************************************* */
include/asm-mips/sibyte/bcm1480_scd.h +60 -74
176 lines not on this page · raw message
include/asm-mips/sibyte/bigsur.h +0 -0
include/asm-mips/sibyte/board.h +12 -2
@@ -1,5 +1,5 @@/* -* Copyright (C) 2000, 2001, 2002, 2003 Broadcom Corporation +* Copyright (C) 2000,2001,2002,2003,2004 Broadcom Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License
@@ -19,8 +19,8 @@#ifndef _SIBYTE_BOARD_H#define _SIBYTE_BOARD_H -#if defined(CONFIG_SIBYTE_SWARM ) || defined(CONFIG_SIBYTE_PTSWARM ) || \ + defined(CONFIG_SIBYTE_PT1120 ) || defined(CONFIG_SIBYTE_PT1125 ) || \ defined(CONFIG_SIBYTE_CRHONE ) || defined(CONFIG_SIBYTE_CRHINE ) || \ defined(CONFIG_SIBYTE_LITTLESUR )#include <asm/sibyte/swarm.h>
@@ -55,6 +55,16 @@ #else#define setleds (t0,t1,c0,c1,c2,c3)#endif /* LEDS_PHYS */ +#else + +void swarm_setup (void ); + +#ifdef LEDS_PHYS +extern void setleds (char *str); +#else +#define setleds (s) do { } while (0) +#endif /* LEDS_PHYS */ +#endif /* __ASSEMBLY__ */ #endif /* _SIBYTE_BOARD_H */
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.h +0 -0
include/asm-mips/sibyte/sb1250_defs.h +0 -0
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 +1 -4
@@ -45,8 +45,6 @@ #include "sb1250_defs.h"* First, the interrupt numbers. */ -#if SIBYTE_HDR_FEATURE_1250_112x -#define K_INT_SOURCES 64#define K_INT_WATCHDOG_TIMER_0 0
@@ -152,6 +150,7 @@ #define M_INT_MBOX_0 _SB_#define M_INT_MBOX_1 _SB_MAKEMASK1(K_INT_MBOX_1)#define M_INT_MBOX_2 _SB_MAKEMASK1(K_INT_MBOX_2)#define M_INT_MBOX_3 _SB_MAKEMASK1(K_INT_MBOX_3) +#define M_INT_MBOX_ALL _SB_MAKEMASK(4,K_INT_MBOX_0) #if SIBYTE_HDR_FEATURE(1250, PASS2) || SIBYTE_HDR_FEATURE(112x, PASS1)#define M_INT_CYCLE_CP0_INT _SB_MAKEMASK1(K_INT_CYCLE_CP0_INT)#define M_INT_CYCLE_CP1_INT _SB_MAKEMASK1(K_INT_CYCLE_CP1_INT)
@@ -247,5 +246,3 @@ #define M_LDTVECT_RAISEMBOX#endif /* 1250/112x */ - -#endif
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 +37 -9
120 lines not on this page · raw message
include/asm-mips/sibyte/sb1250_scd.h +49 -24
148 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
Quoted 9 lines · Mark Mason
This is an update to the earlier patch for the sibyte headers, and superceeds the previous patch. Changes were necessary to get the tbprof driver working on the bcm1480.
Patch to update Sibyte header files to match master versions maintained at Broadcom. This patch also corrects some whitespace problems, and (hopefully) shouldn't introduce any new ones.
Signed-off-by Mark Mason <[email protected]>
Queued for 2.6.22 - with the usual pile of trailing whitespace stripped.
Ralf