git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Blackfin arch: Fix CCLK and SCLK checks
[safe/jmp/linux-2.6]
/
include
/
asm-blackfin
/
mach-bf533
/
bfin_serial_5xx.h
diff --git
a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
b/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
index
23bf76a
..
69b9f8e
100644
(file)
--- a/
include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
+++ b/
include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
@@
-1,5
+1,6
@@
#include <linux/serial.h>
#include <asm/dma.h>
#include <linux/serial.h>
#include <asm/dma.h>
+#include <asm/portmux.h>
#define NR_PORTS 1
#define NR_PORTS 1
@@
-78,6
+79,7
@@
struct bfin_serial_res {
};
struct bfin_serial_res bfin_serial_resource[] = {
};
struct bfin_serial_res bfin_serial_resource[] = {
+ {
0xFFC00400,
IRQ_UART_RX,
#ifdef CONFIG_SERIAL_BFIN_DMA
0xFFC00400,
IRQ_UART_RX,
#ifdef CONFIG_SERIAL_BFIN_DMA
@@
-88,20
+90,27
@@
struct bfin_serial_res bfin_serial_resource[] = {
CONFIG_UART0_CTS_PIN,
CONFIG_UART0_RTS_PIN,
#endif
CONFIG_UART0_CTS_PIN,
CONFIG_UART0_RTS_PIN,
#endif
+ }
};
};
+#define DRIVER_NAME "bfin-uart"
int nr_ports = NR_PORTS;
static void bfin_serial_hw_init(struct bfin_serial_port *uart)
{
int nr_ports = NR_PORTS;
static void bfin_serial_hw_init(struct bfin_serial_port *uart)
{
+#ifdef CONFIG_SERIAL_BFIN_UART0
+ peripheral_request(P_UART0_TX, DRIVER_NAME);
+ peripheral_request(P_UART0_RX, DRIVER_NAME);
+#endif
+
#ifdef CONFIG_SERIAL_BFIN_CTSRTS
if (uart->cts_pin >= 0) {
#ifdef CONFIG_SERIAL_BFIN_CTSRTS
if (uart->cts_pin >= 0) {
- gpio_request(uart->cts_pin,
NULL
);
+ gpio_request(uart->cts_pin,
DRIVER_NAME
);
gpio_direction_input(uart->cts_pin);
}
if (uart->rts_pin >= 0) {
gpio_direction_input(uart->cts_pin);
}
if (uart->rts_pin >= 0) {
- gpio_request(uart->rts_pin,
NULL
);
+ gpio_request(uart->rts_pin,
DRIVER_NAME
);
gpio_direction_input(uart->rts_pin);
}
#endif
gpio_direction_input(uart->rts_pin);
}
#endif