diff options
| author | Miles Bader <miles@lsi.nec.co.jp> | 2002-11-26 05:20:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-26 05:20:05 -0800 |
| commit | 98960e9e1a974a4ddacddfc5681ad34cc44a0dbd (patch) | |
| tree | b4ded46a3ef74afafd26ab38fcdc52d6a88831d2 | |
| parent | 53b17bee4c6d75ecd50d269ffde9f0a20c071715 (diff) | |
[PATCH] Random minor fixes for v850 `anna' platform
Random minor fixes for v850 `anna' platform
| -rw-r--r-- | arch/v850/kernel/anna.c | 17 | ||||
| -rw-r--r-- | include/asm-v850/anna.h | 16 |
2 files changed, 26 insertions, 7 deletions
diff --git a/arch/v850/kernel/anna.c b/arch/v850/kernel/anna.c index c734178a1f32..d364e775f5f2 100644 --- a/arch/v850/kernel/anna.c +++ b/arch/v850/kernel/anna.c @@ -27,11 +27,14 @@ #include "mach.h" -/* SRAM and SDRAM are vaguely contiguous (with a hole in between; see - mach_reserve_bootmem for details), so just use both as one big area. */ +/* SRAM and SDRAM are vaguely contiguous (with a big hole in between; see + mach_reserve_bootmem for details); use both as one big area. */ #define RAM_START SRAM_ADDR #define RAM_END (SDRAM_ADDR + SDRAM_SIZE) +/* The bits of this port are connected to an 8-LED bar-graph. */ +#define LEDS_PORT 0 + static void anna_led_tick (void); @@ -44,7 +47,7 @@ void __init mach_early_init (void) ANNA_BPC = 0; ANNA_BSC = 0xAAAA; ANNA_BEC = 0; - ANNA_BHC = 0x00FF; /* icache all memory, dcache none */ + ANNA_BHC = 0xFFFF; /* icache all memory, dcache all */ ANNA_BCT(0) = 0xB088; ANNA_BCT(1) = 0x0008; ANNA_DWC(0) = 0x0027; @@ -64,7 +67,7 @@ void __init mach_setup (char **cmdline) nb85e_uart_cons_init (1); #endif - ANNA_PORT_PM (0) = 0; /* Make all LED pins output pins. */ + ANNA_PORT_PM (LEDS_PORT) = 0; /* Make all LED pins output pins. */ mach_tick = anna_led_tick; } @@ -132,7 +135,7 @@ void machine_halt (void) disable_reset_guard (); #endif local_irq_disable (); /* Ignore all interrupts. */ - ANNA_PORT_IO(0) = 0xAA; /* Note that we halted. */ + ANNA_PORT_IO(LEDS_PORT) = 0xAA; /* Note that we halted. */ for (;;) asm ("halt; nop; nop; nop; nop; nop"); } @@ -185,9 +188,9 @@ static void anna_led_tick () if (pos + dir <= max_pos) { /* Each bit of port 0 has a LED. */ - clear_bit (pos, &ANNA_PORT_IO(0)); + clear_bit (pos, &ANNA_PORT_IO(LEDS_PORT)); pos += dir; - set_bit (pos, &ANNA_PORT_IO(0)); + set_bit (pos, &ANNA_PORT_IO(LEDS_PORT)); } } diff --git a/include/asm-v850/anna.h b/include/asm-v850/anna.h index d5c0cd5ef5de..df5caefdc157 100644 --- a/include/asm-v850/anna.h +++ b/include/asm-v850/anna.h @@ -127,6 +127,22 @@ extern void anna_uart_pre_configure (unsigned chan, unsigned cflags, unsigned baud); #endif +/* This board supports RTS/CTS for the on-chip UART, but only for channel 1. */ + +/* CTS for UART channel 1 is pin P37 (bit 7 of port 3). */ +#define NB85E_UART_CTS(chan) ((chan) == 1 ? !(ANNA_PORT_IO(3) & 0x80) : 1) +/* RTS for UART channel 1 is pin P07 (bit 7 of port 0). */ +#define NB85E_UART_SET_RTS(chan, val) \ + do { \ + if (chan == 1) { \ + unsigned old = ANNA_PORT_IO(0); \ + if (val) \ + ANNA_PORT_IO(0) = old & ~0x80; \ + else \ + ANNA_PORT_IO(0) = old | 0x80; \ + } \ + } while (0) + /* Timer C details. */ #define NB85E_TIMER_C_BASE_ADDR 0xFFFFF600 |