KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

brcm63xx cleanups; add a watchdog driver, indent serial console driver, add support for another sst flash

Browse source 
SVN-Revision: 6985
This commit is contained in:
Florian Fainelli 2007-04-17 16:00:23 +00:00
parent 65d82bc293
commit 2bf49e010b
8 changed files with 943 additions and 652 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/Makefile
View file

@ -3,7 +3,7 @@
#
# Copyright (C) 2004 Broadcom Corporation
#
obj-y := irq.o prom.o setup.o time.o ser_init.o int-handler.o info.o
obj-y := irq.o prom.o setup.o time.o ser_init.o int-handler.o info.o wdt.o
SRCBASE := $(TOPDIR)
EXTRA_CFLAGS += -I$(SRCBASE)/include

24
target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/info.c
View file

@ -25,7 +25,8 @@
static char *boot_loader_names[BOOT_LOADER_LAST+1] = {
[BOOT_LOADER_UNKNOWN] = "Unknown",
[BOOT_LOADER_CFE] = "CFE",
[BOOT_LOADER_REDBOOT] = "RedBoot"
[BOOT_LOADER_REDBOOT] = "RedBoot",
[BOOT_LOADER_CFE2] = "CFEv2"
};
/* boot loaders specific definitions */
@ -73,14 +74,29 @@ void __init detect_bootloader(void)
{
if (detect_cfe()) {
boot_loader_type = BOOT_LOADER_CFE;
printk("Boot loader is : %s\n", boot_loader_names[boot_loader_type]);
}
if (detect_redboot()) {
boot_loader_type = BOOT_LOADER_REDBOOT;
}
else
boot_loader_type = BOOT_LOADER_UNKNOWN;
else {
/* Some devices are using CFE, but it is not detected as is */
boot_loader_type = BOOT_LOADER_CFE2;
}
printk("Boot loader is : %s\n", boot_loader_names[boot_loader_type]);
}
void __init detect_board(void)
{
switch (boot_loader_type)
{
case BOOT_LOADER_CFE:
break;
case BOOT_LOADER_REDBOOT:
break;
default:
break;
}
}
EXPORT_SYMBOL(boot_loader_type);

8
target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/irq.c
View file

@ -238,13 +238,13 @@ unsigned int BcmHalMapInterrupt(FN_HANDLER pfunc, unsigned int param,
if( interruptId >= INTERNAL_ISR_TABLE_OFFSET )
{
nRet = request_irq( interruptId, pfunc, SA_SAMPLE_RANDOM | SA_INTERRUPT,
devname, (void *) param );
printk("BcmHalMapInterrupt : internal IRQ\n");
nRet = request_irq( interruptId, pfunc, SA_SAMPLE_RANDOM | SA_INTERRUPT, devname, (void *) param );
}
else if (interruptId >= INTERRUPT_ID_EXTERNAL_0 && interruptId <= INTERRUPT_ID_EXTERNAL_3)
{
nRet = request_external_irq( interruptId, pfunc, SA_SAMPLE_RANDOM | SA_INTERRUPT,
devname, (void *) param );
printk("BcmHalMapInterrupt : external IRQ\n");
nRet = request_external_irq( interruptId, pfunc, SA_SAMPLE_RANDOM | SA_INTERRUPT, devname, (void *) param );
}
return( nRet );

13
target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/prom.c
View file

@ -1,6 +1,6 @@
/*
<:copyright-gpl
Copyright 2004 Broadcom Corp. All Rights Reserved.
Copyright 2007 OpenWrt,org, Florian Fainelli <florian@openwrt.org>
This program is free software; you can distribute it and/or modify it
under the terms of the GNU General Public License (Version 2) as
@ -14,7 +14,6 @@
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 MA 02111-1307, USA.
:>
*/
/*
* prom.c: PROM library initialization code.
@ -54,20 +53,22 @@ void __init prom_init(void)
PERF->IrqMask = 0;
/* Detect the bootloader */
detect_bootloader();
if (boot_loader_type == BOOT_LOADER_CFE) {
/* Do further initialisations depending on the bootloader */
if (boot_loader_type == BOOT_LOADER_CFE || boot_loader_type == BOOT_LOADER_CFE2) {
cfe_setup(fw_arg0, fw_arg1, fw_arg2, fw_arg3);
add_memory_region(0, (boot_mem_map.map[0].size - ADSL_SDRAM_IMAGE_SIZE), BOOT_MEM_RAM);
}
else
/* Register 16MB RAM minus the ADSL SDRAM by default */
add_memory_region(0, (0x01000000 - ADSL_SDRAM_IMAGE_SIZE), BOOT_MEM_RAM);
mips_machgroup = MACH_GROUP_BRCM;
mips_machtype = MACH_BCM;
}
void __init prom_free_prom_memory(void)
unsigned long __init prom_free_prom_memory(void)
{
/* We do not have any memory to free */
return 0;
}

246
target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/wdt.c Normal file
View file

@ -0,0 +1,246 @@
/*
* Watchdog driver for the BCM963xx devices
*
* Copyright (C) 2007 OpenWrt.org
* Florian Fainelli <florian@openwrt.org>
*
* 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.
*/
#include <linux/module.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/miscdevice.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/notifier.h>
#include <linux/watchdog.h>
#include <linux/timer.h>
#include <linux/jiffies.h>
#include <linux/completion.h>
#include <linux/ioport.h>
typedef struct bcm963xx_timer {
unsigned short unused0;
unsigned char timer_mask;
#define TIMER0EN 0x01
#define TIMER1EN 0x02
#define TIMER2EN 0x04
unsigned char timer_ints;
#define TIMER0 0x01
#define TIMER1 0x02
#define TIMER2 0x04
#define WATCHDOG 0x08
unsigned long timer_ctl0;
unsigned long timer_ctl1;
unsigned long timer_ctl2;
#define TIMERENABLE 0x80000000
#define RSTCNTCLR 0x40000000
unsigned long timer_cnt0;
unsigned long timer_cnt1;
unsigned long timer_cnt2;
unsigned long wdt_def_count;
/* Write 0xff00 0x00ff to Start timer
* Write 0xee00 0x00ee to Stop and re-load default count
* Read from this register returns current watch dog count
*/
unsigned long wdt_ctl;
/* Number of 40-MHz ticks for WD Reset pulse to last */
unsigned long wdt_rst_count;
} bcm963xx_timer;
static struct bcm963xx_wdt_device {
struct completion stop;
volatile int running;
struct timer_list timer;
volatile int queue;
int default_ticks;
unsigned long inuse;
} bcm963xx_wdt_device;
static int ticks = 1000;
#define WDT_BASE 0xfffe0200
#define WDT ((volatile bcm963xx_timer * const) WDT_BASE)
#define BCM963XX_INTERVAL (HZ/10+1)
static void bcm963xx_wdt_trigger(unsigned long unused)
{
if (bcm963xx_wdt_device.running)
ticks--;
/* Load the default ticking value into the reset counter register */
WDT->wdt_rst_count = bcm963xx_wdt_device.default_ticks;
if (bcm963xx_wdt_device.queue && ticks) {
bcm963xx_wdt_device.timer.expires = jiffies + BCM963XX_INTERVAL;
add_timer(&bcm963xx_wdt_device.timer);
}
else {
complete(&bcm963xx_wdt_device.stop);
}
}
static void bcm963xx_wdt_reset(void)
{
ticks = bcm963xx_wdt_device.default_ticks;
/* Also reload default count */
WDT->wdt_def_count = ticks;
WDT->wdt_ctl = 0xee00;
WDT->wdt_ctl = 0x00ee;
}
static void bcm963xx_wdt_start(void)
{
if (!bcm963xx_wdt_device.queue) {
bcm963xx_wdt_device.queue;
/* Enable the watchdog by writing 0xff00 ,then 0x00ff to the control register */
WDT->wdt_ctl = 0xff00;
WDT->wdt_ctl = 0x00ff;
bcm963xx_wdt_device.timer.expires = jiffies + BCM963XX_INTERVAL;
add_timer(&bcm963xx_wdt_device.timer);
}
bcm963xx_wdt_device.running++;
}
static int bcm963xx_wdt_stop(void)
{
if (bcm963xx_wdt_device.running)
bcm963xx_wdt_device.running = 0;
ticks = bcm963xx_wdt_device.default_ticks;
/* Stop the watchdog by writing 0xee00 then 0x00ee to the control register */
WDT->wdt_ctl = 0xee00;
WDT->wdt_ctl = 0x00ee;
return -EIO;
}
static int bcm963xx_wdt_open(struct inode *inode, struct file *file)
{
if (test_and_set_bit(0, &bcm963xx_wdt_device.inuse))
return -EBUSY;
return nonseekable_open(inode, file);
}
static int bcm963xx_wdt_release(struct inode *inode, struct file *file)
{
clear_bit(0, &bcm963xx_wdt_device.inuse);
return 0;
}
static int bcm963xx_wdt_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
void __user *argp = (void __user *)arg;
unsigned int value;
static struct watchdog_info ident = {
.options = WDIOF_CARDRESET,
.identity = "BCM963xx WDT",
};
switch (cmd) {
case WDIOC_KEEPALIVE:
bcm963xx_wdt_reset();
break;
case WDIOC_GETSTATUS:
/* Reading from the control register will return the current value */
value = WDT->wdt_ctl;
if ( copy_to_user(argp, &value, sizeof(int)) )
return -EFAULT;
break;
case WDIOC_GETSUPPORT:
if ( copy_to_user(argp, &ident, sizeof(ident)) )
return -EFAULT;
break;
case WDIOC_SETOPTIONS:
if ( copy_from_user(&value, argp, sizeof(int)) )
return -EFAULT;
switch(value) {
case WDIOS_ENABLECARD:
bcm963xx_wdt_start();
break;
case WDIOS_DISABLECARD:
bcm963xx_wdt_stop();
break;
default:
return -EINVAL;
}
break;
default:
return -ENOTTY;
}
return 0;
}
static int bcm963xx_wdt_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
{
if (!count)
return -EIO;
bcm963xx_wdt_reset();
return count;
}
static const struct file_operations bcm963xx_wdt_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = bcm963xx_wdt_write,
.ioctl = bcm963xx_wdt_ioctl,
.open = bcm963xx_wdt_open,
.release = bcm963xx_wdt_release,
};
static struct miscdevice bcm963xx_wdt_miscdev = {
.minor = WATCHDOG_MINOR,
.name = "watchdog",
.fops = &bcm963xx_wdt_fops,
};
static void __exit bcm963xx_wdt_exit(void)
{
if (bcm963xx_wdt_device.queue ){
bcm963xx_wdt_device.queue = 0;
wait_for_completion(&bcm963xx_wdt_device.stop);
}
misc_deregister(&bcm963xx_wdt_miscdev);
}
static int __init bcm963xx_wdt_init(void)
{
int ret = 0;
printk("Broadcom BCM963xx Watchdog timer\n");
ret = misc_register(&bcm963xx_wdt_miscdev);
if (ret) {
printk(KERN_CRIT "Cannot register miscdev on minor=%d (err=%d)\n", WATCHDOG_MINOR, ret);
return ret;
}
init_completion(&bcm963xx_wdt_device.stop);
bcm963xx_wdt_device.queue = 0;
clear_bit(0, &bcm963xx_wdt_device.inuse);
init_timer(&bcm963xx_wdt_device.timer);
bcm963xx_wdt_device.timer.function = bcm963xx_wdt_trigger;
bcm963xx_wdt_device.timer.data = 0;
bcm963xx_wdt_device.default_ticks = ticks;
return ret;
}
module_init(bcm963xx_wdt_init);
module_exit(bcm963xx_wdt_exit);
MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
MODULE_DESCRIPTION("Broadcom BCM963xx Watchdog driver");
MODULE_LICENSE("GPL");

157
target/linux/brcm63xx-2.6/files/drivers/serial/bcm63xx_cons.c
View file

@ -126,16 +126,20 @@ static void bcm_flush_buffer (struct tty_struct *tty);
static void bcm_throttle(struct tty_struct *tty);
static void bcm_unthrottle(struct tty_struct *tty);
static void bcm_send_xchar(struct tty_struct *tty, char ch);
static int get_serial_info(struct bcm_serial *info, struct serial_struct *retinfo);
static int set_serial_info (struct bcm_serial *info, struct serial_struct *new_info);
static int get_serial_info(struct bcm_serial *info,
struct serial_struct *retinfo);
static int set_serial_info(struct bcm_serial *info,
struct serial_struct *new_info);
static int get_lsr_info(struct bcm_serial *info, unsigned int *value);
static void send_break(struct bcm_serial *info, int duration);
static int bcm_ioctl(struct tty_struct *tty, struct file *file,
unsigned int cmd, unsigned long arg);
static void bcm_set_termios (struct tty_struct *tty, struct termios *old_termios);
static void bcm_set_termios(struct tty_struct *tty,
struct termios *old_termios);
static void bcm63xx_cons_close(struct tty_struct *tty, struct file *filp);
static void bcm_hangup(struct tty_struct *tty);
static int block_til_ready (struct tty_struct *tty, struct file *filp, struct bcm_serial *info);
static int block_til_ready(struct tty_struct *tty, struct file *filp,
struct bcm_serial *info);
static int bcm63xx_cons_open(struct tty_struct *tty, struct file *filp);
static int __init bcm63xx_serialinit(void);
@ -172,8 +176,7 @@ static inline void receive_chars (struct bcm_serial * info)
int ignore = 0;
unsigned short status, tmp;
UCHAR ch = 0;
while ((status = info->port->intStatus) & RXINT)
{
while ((status = info->port->intStatus) & RXINT) {
char flag_char = TTY_NORMAL;
if (status & RXFIFONE)
@ -185,46 +188,36 @@ static inline void receive_chars (struct bcm_serial * info)
if (!tty_buffer_request_room(tty, 1))
break;
icount->rx++;
if (status & RXBRK)
{
if (status & RXBRK) {
flag_char = TTY_BREAK;
icount->brk++;
}
// keep track of the statistics
if (status & (RXFRAMERR | RXPARERR | RXOVFERR))
{
if (status & (RXFRAMERR | RXPARERR | RXOVFERR)) {
if (status & RXPARERR) /* parity error */
icount->parity++;
else
if (status & RXFRAMERR) /* frame error */
else if (status & RXFRAMERR) /* frame error */
icount->frame++;
if (status & RXOVFERR)
{
if (status & RXOVFERR) {
// Overflow. Reset the RX FIFO
info->port->fifoctl |= RSTRXFIFOS;
icount->overrun++;
}
// check to see if we should ignore the character
// and mask off conditions that should be ignored
if (status & info->ignore_status_mask)
{
if (status & info->ignore_status_mask) {
if (++ignore > 100)
break;
goto ignore_char;
}
// Mask off the error conditions we want to ignore
tmp = status & info->read_status_mask;
if (tmp & RXPARERR)
{
if (tmp & RXPARERR) {
flag_char = TTY_PARITY;
}
else
if (tmp & RXFRAMERR)
{
} else if (tmp & RXFRAMERR) {
flag_char = TTY_FRAME;
}
if (tmp & RXOVFERR)
{
if (tmp & RXOVFERR) {
tty_insert_flip_char(tty, ch, flag_char);
ch = 0;
flag_char = TTY_OVERRUN;
@ -262,12 +255,10 @@ static void bcm_interrupt (int irq, void * dev, struct pt_regs * regs)
/* Mask with only the serial interrupts that are enabled */
intStat = info->port->intStatus & info->port->intMask;
while (intStat)
{
while (intStat) {
if (intStat & RXINT)
receive_chars(info);
else
if (intStat & TXINT)
else if (intStat & TXINT)
info->port->intStatus = TXINT;
else /* don't know what it was, so let's mask it */
info->port->intMask &= ~intStat;
@ -276,7 +267,7 @@ static void bcm_interrupt (int irq, void * dev, struct pt_regs * regs)
}
// Clear the interrupt
BcmHalInterruptEnable (INTERRUPT_ID_UART);
enable_brcm_irq(INTERRUPT_ID_UART);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
return IRQ_HANDLED;
#endif
@ -318,6 +309,7 @@ static void shutdown (struct bcm_serial * info)
spin_unlock_irqrestore(&bcm963xx_serial_lock, flags);
}
/*
* -------------------------------------------------------------------
* change_speed ()
@ -330,8 +322,7 @@ static void change_speed( volatile Uart *pUart, tcflag_t cFlag )
unsigned long ulFlags, ulBaud, ulClockFreqHz, ulTmp;
spin_lock_irqsave(&bcm963xx_serial_lock, ulFlags);
switch( cFlag & (CBAUD | CBAUDEX) )
{
switch (cFlag & (CBAUD | CBAUDEX)) {
case B115200:
ulBaud = 115200;
break;
@ -398,8 +389,7 @@ static void change_speed( volatile Uart *pUart, tcflag_t cFlag )
pUart->baudword = ulTmp;
/* Set character size, stop bits and parity. */
switch( cFlag & CSIZE )
{
switch (cFlag & CSIZE) {
case CS5:
ulTmp = BITS5SYM; /* select transmit 5 bit data size */
break;
@ -420,14 +410,15 @@ static void change_speed( volatile Uart *pUart, tcflag_t cFlag )
/* Write these values into the config reg. */
pUart->config = ulTmp;
pUart->control &= ~(RXPARITYEN | TXPARITYEN | RXPARITYEVEN | TXPARITYEVEN);
switch( cFlag & (PARENB | PARODD) )
{
pUart->control &=
~(RXPARITYEN | TXPARITYEN | RXPARITYEVEN | TXPARITYEVEN);
switch (cFlag & (PARENB | PARODD)) {
case PARENB | PARODD:
pUart->control |= RXPARITYEN | TXPARITYEN;
break;
case PARENB:
pUart->control |= RXPARITYEN | TXPARITYEN | RXPARITYEVEN | TXPARITYEVEN;
pUart->control |=
RXPARITYEN | TXPARITYEN | RXPARITYEVEN | TXPARITYEVEN;
break;
default:
pUart->control |= 0;
@ -524,8 +515,7 @@ static void bcm_throttle (struct tty_struct *tty)
static void bcm_unthrottle(struct tty_struct *tty)
{
struct bcm_serial *info = (struct bcm_serial *) tty->driver_data;
if (I_IXOFF(tty))
{
if (I_IXOFF(tty)) {
if (info->x_char)
info->x_char = 0;
else
@ -546,7 +536,8 @@ static void bcm_send_xchar (struct tty_struct *tty, char ch)
* rs_ioctl () and friends
* ------------------------------------------------------------
*/
static int get_serial_info(struct bcm_serial *info, struct serial_struct *retinfo)
static int get_serial_info(struct bcm_serial *info,
struct serial_struct *retinfo)
{
struct serial_struct tmp;
@ -566,7 +557,8 @@ static int get_serial_info(struct bcm_serial *info, struct serial_struct *retinf
return copy_to_user(retinfo, &tmp, sizeof(*retinfo));
}
static int set_serial_info (struct bcm_serial *info, struct serial_struct *new_info)
static int set_serial_info(struct bcm_serial *info,
struct serial_struct *new_info)
{
struct serial_struct new_serial;
struct bcm_serial old_info;
@ -644,13 +636,11 @@ static int bcm_ioctl (struct tty_struct * tty, struct file * file,
if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
(cmd != TIOCSERCONFIG) && (cmd != TIOCSERGWILD) &&
(cmd != TIOCSERSWILD) && (cmd != TIOCSERGSTRUCT))
{
(cmd != TIOCSERSWILD) && (cmd != TIOCSERGSTRUCT)) {
if (tty->flags & (1 << TTY_IO_ERROR))
return -EIO;
}
switch (cmd)
{
switch (cmd) {
case TCSBRK: /* SVID version: non-zero arg --> no break */
retval = tty_check_change(tty);
@ -670,12 +660,13 @@ static int bcm_ioctl (struct tty_struct * tty, struct file * file,
return 0;
case TIOCGSOFTCAR:
error = access_ok (VERIFY_WRITE, (void *)arg, sizeof(long));
error =
access_ok(VERIFY_WRITE, (void *) arg, sizeof(long));
if (!error)
return -EFAULT;
else
{
put_user (C_CLOCAL(tty) ? 1 : 0, (unsigned long *)arg);
else {
put_user(C_CLOCAL(tty) ? 1 : 0,
(unsigned long *) arg);
return 0;
}
@ -683,33 +674,43 @@ static int bcm_ioctl (struct tty_struct * tty, struct file * file,
error = get_user(arg, (unsigned long *) arg);
if (error)
return error;
tty->termios->c_cflag = ((tty->termios->c_cflag & ~CLOCAL) | (arg ? CLOCAL : 0));
tty->termios->c_cflag =
((tty->termios->
c_cflag & ~CLOCAL) | (arg ? CLOCAL : 0));
return 0;
case TIOCGSERIAL:
error = access_ok (VERIFY_WRITE, (void *)arg, sizeof(struct serial_struct));
error =
access_ok(VERIFY_WRITE, (void *) arg,
sizeof(struct serial_struct));
if (!error)
return -EFAULT;
else
return get_serial_info (info, (struct serial_struct *)arg);
return get_serial_info(info,
(struct serial_struct *)
arg);
case TIOCSSERIAL:
return set_serial_info(info, (struct serial_struct *) arg);
case TIOCSERGETLSR: /* Get line status register */
error = access_ok (VERIFY_WRITE, (void *)arg, sizeof(unsigned int));
error =
access_ok(VERIFY_WRITE, (void *) arg,
sizeof(unsigned int));
if (!error)
return -EFAULT;
else
return get_lsr_info(info, (unsigned int *) arg);
case TIOCSERGSTRUCT:
error = access_ok (VERIFY_WRITE, (void *)arg, sizeof(struct bcm_serial));
error =
access_ok(VERIFY_WRITE, (void *) arg,
sizeof(struct bcm_serial));
if (!error)
return -EFAULT;
else
{
copy_to_user((struct bcm_serial *)arg, info, sizeof(struct bcm_serial));
else {
copy_to_user((struct bcm_serial *) arg, info,
sizeof(struct bcm_serial));
return 0;
}
@ -719,7 +720,8 @@ static int bcm_ioctl (struct tty_struct * tty, struct file * file,
return 0;
}
static void bcm_set_termios (struct tty_struct *tty, struct termios *old_termios)
static void bcm_set_termios(struct tty_struct *tty,
struct termios *old_termios)
{
struct bcm_serial *info = (struct bcm_serial *) tty->driver_data;
@ -748,15 +750,13 @@ static void bcm63xx_cons_close (struct tty_struct *tty, struct file *filp)
cli(); */
spin_lock_irqsave(&bcm963xx_serial_lock, flags);
if (tty_hung_up_p (filp))
{
if (tty_hung_up_p(filp)) {
spin_unlock_irqrestore(&bcm963xx_serial_lock, flags);
//restore_flags (flags);
return;
}
if ((tty->count == 1) && (info->count != 1))
{
if ((tty->count == 1) && (info->count != 1)) {
/* Uh, oh. tty->count is 1, which means that the tty
* structure will be freed. Info->count should always
@ -764,20 +764,19 @@ static void bcm63xx_cons_close (struct tty_struct *tty, struct file *filp)
* one, we've got real problems, since it means the
* serial port won't be shutdown.
*/
printk("bcm63xx_cons_close: bad serial port count; tty->count is 1, "
printk
("bcm63xx_cons_close: bad serial port count; tty->count is 1, "
"info->count is %d\n", info->count);
info->count = 1;
}
if (--info->count < 0)
{
if (--info->count < 0) {
printk("ds_close: bad serial port count for ttys%d: %d\n",
info->line, info->count);
info->count = 0;
}
if (info->count)
{
if (info->count) {
//restore_flags (flags);
spin_unlock_irqrestore(&bcm963xx_serial_lock, flags);
return;
@ -805,8 +804,7 @@ static void bcm63xx_cons_close (struct tty_struct *tty, struct file *filp)
tty->closing = 0;
info->event = 0;
info->tty = 0;
if (tty->ldisc.num != tty_ldisc_get(N_TTY)->num)
{
if (tty->ldisc.num != tty_ldisc_get(N_TTY)->num) {
if (tty->ldisc.close)
(tty->ldisc.close) (tty);
tty->ldisc = *tty_ldisc_get(N_TTY);
@ -814,10 +812,8 @@ static void bcm63xx_cons_close (struct tty_struct *tty, struct file *filp)
if (tty->ldisc.open)
(tty->ldisc.open) (tty);
}
if (info->blocked_open)
{
if (info->close_delay)
{
if (info->blocked_open) {
if (info->close_delay) {
current->state = TASK_INTERRUPTIBLE;
schedule_timeout(info->close_delay);
}
@ -884,7 +880,7 @@ static int bcm63xx_cons_open (struct tty_struct * tty, struct file * filp)
info->count++;
tty->driver_data = info;
info->tty = tty;
BcmHalInterruptEnable (INTERRUPT_ID_UART);
enable_brcm_irq(INTERRUPT_ID_UART);
// Start up serial port
retval = startup(info);
@ -942,12 +938,10 @@ static int __init bcm63xx_serialinit(void)
return -ENOMEM;
serial_driver->owner = THIS_MODULE;
// serial_driver->devfs_name = "tts/";
// serial_driver.magic = TTY_DRIVER_MAGIC;
serial_driver->name = "ttyS";
serial_driver->major = TTY_MAJOR;
serial_driver->minor_start = 64;
// serial_driver.num = BCM_NUM_UARTS;
serial_driver->num = 1;
serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
serial_driver->subtype = SERIAL_TYPE_NORMAL;
serial_driver->init_termios = tty_std_termios;
@ -965,8 +959,7 @@ static int __init bcm63xx_serialinit(void)
//save_flags(flags); cli();
spin_lock_irqsave(&bcm963xx_serial_lock, flags);
for (i = 0; i < BCM_NUM_UARTS; i++)
{
for (i = 0; i < 1; i++) {
info = &multi[i];
lines[i] = info;
info->magic = SERIAL_MAGIC;
@ -1012,11 +1005,9 @@ static void bcm_console_print (struct console * cons, const char * str,
{
unsigned int i;
//_puts(str);
for(i=0; i<count; i++, str++)
{
for (i = 0; i < count; i++, str++) {
_putc(*str);
if (*str == 10)
{
if (*str == 10) {
_putc(13);
}
}

3
target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/bootloaders.h
View file

@ -3,4 +3,5 @@
#define BOOT_LOADER_UNKNOWN 0
#define BOOT_LOADER_CFE 1
#define BOOT_LOADER_REDBOOT 2
#define BOOT_LOADER_LAST 2
#define BOOT_LOADER_CFE2 3
#define BOOT_LOADER_LAST 3

36
target/linux/brcm63xx-2.6/patches/150-sst_flash.patch Normal file
View file

@ -0,0 +1,36 @@
diff -urN linux-2.6.19.2/drivers/mtd/chips/jedec_probe.c linux-2.6.19.2.new/drivers/mtd/chips/jedec_probe.c
--- linux-2.6.19.2/drivers/mtd/chips/jedec_probe.c 2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.new/drivers/mtd/chips/jedec_probe.c 2007-04-09 22:33:05.000000000 +0200
@@ -158,6 +158,7 @@
#define SST49LF030A 0x001C
#define SST49LF040A 0x0051
#define SST49LF080A 0x005B
+#define SST39VF6402B 0x236C
/* Toshiba */
#define TC58FVT160 0x00C2
@@ -1494,7 +1495,23 @@
ERASEINFO(0x1000,256),
ERASEINFO(0x1000,256)
}
-
+ }, {
+ .mfr_id = MANUFACTURER_SST,
+ .dev_id = SST39VF6402B,
+ .name = "SST 39VF6402B",
+ .uaddr = {
+ [0] = MTD_UADDR_0x5555_0x2AAA, /* x8 */
+ [1] = MTD_UADDR_0x5555_0x2AAA /* x16 */
+ },
+ .DevSize = SIZE_8MiB,
+ .CmdSet = P_ID_AMD_STD,
+ .NumEraseRegions= 4,
+ .regions = {
+ ERASEINFO(0x2000,256),
+ ERASEINFO(0x2000,256),
+ ERASEINFO(0x2000,256),
+ ERASEINFO(0x2000,256)
+ }
}, {
.mfr_id = MANUFACTURER_ST, /* FIXME - CFI device? */
.dev_id = M29W800DT,