diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-07-29 11:38:54 +0800 |
---|---|---|
committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-07-30 02:05:27 +0800 |
commit | 931c1cc5a6890b465840738fd99e05b2a6709e56 (patch) | |
tree | a08bb4b3b4153ef4c7388962ad4fad23ba9a8beb | |
parent | 0616e182a5e08b38a3c429d3cc8852da71f2cfde (diff) | |
download | barebox-931c1cc5a6890b465840738fd99e05b2a6709e56.tar.gz barebox-931c1cc5a6890b465840738fd99e05b2a6709e56.tar.xz |
ns16550: if not specific f_caps defined use default stdin, stdout, stderr
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r-- | arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c | 1 | ||||
-rw-r--r-- | arch/arm/boards/omap/board-beagle.c | 1 | ||||
-rw-r--r-- | arch/arm/boards/omap/board-omap3evm.c | 1 | ||||
-rw-r--r-- | arch/arm/boards/omap/board-sdp343x.c | 1 | ||||
-rw-r--r-- | arch/arm/boards/panda/board.c | 1 | ||||
-rw-r--r-- | arch/arm/boards/pcm049/board.c | 1 | ||||
-rw-r--r-- | arch/x86/boards/x86_generic/generic_pc.c | 1 | ||||
-rw-r--r-- | drivers/serial/serial_ns16550.c | 5 |
8 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c index fa910b95d1..65cf6d8b03 100644 --- a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c +++ b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c @@ -85,7 +85,6 @@ EXPORT_SYMBOL(quad_uart_write); static struct NS16550_plat quad_uart_serial_plat = { .clock = 14745600, - .f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR, .reg_read = quad_uart_read, .reg_write = quad_uart_write, }; diff --git a/arch/arm/boards/omap/board-beagle.c b/arch/arm/boards/omap/board-beagle.c index 899c34b3ef..49e95d9ef3 100644 --- a/arch/arm/boards/omap/board-beagle.c +++ b/arch/arm/boards/omap/board-beagle.c @@ -237,7 +237,6 @@ void board_init(void) static struct NS16550_plat serial_plat = { .clock = 48000000, /* 48MHz (APLL96/2) */ - .f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR, .reg_read = omap_uart_read, .reg_write = omap_uart_write, }; diff --git a/arch/arm/boards/omap/board-omap3evm.c b/arch/arm/boards/omap/board-omap3evm.c index 071e374a37..0c243f32f9 100644 --- a/arch/arm/boards/omap/board-omap3evm.c +++ b/arch/arm/boards/omap/board-omap3evm.c @@ -213,7 +213,6 @@ void board_init(void) static struct NS16550_plat serial_plat = { .clock = 48000000, /* 48MHz (APLL96/2) */ - .f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR, .reg_read = omap_uart_read, .reg_write = omap_uart_write, }; diff --git a/arch/arm/boards/omap/board-sdp343x.c b/arch/arm/boards/omap/board-sdp343x.c index 010fbd71f2..36f226cfe4 100644 --- a/arch/arm/boards/omap/board-sdp343x.c +++ b/arch/arm/boards/omap/board-sdp343x.c @@ -605,7 +605,6 @@ static void mux_config(void) static struct NS16550_plat serial_plat = { .clock = 48000000, /* 48MHz (APLL96/2) */ - .f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR, .reg_read = omap_uart_read, .reg_write = omap_uart_write, }; diff --git a/arch/arm/boards/panda/board.c b/arch/arm/boards/panda/board.c index 4c9d8ee114..4164c1f233 100644 --- a/arch/arm/boards/panda/board.c +++ b/arch/arm/boards/panda/board.c @@ -32,7 +32,6 @@ static int board_revision; static struct NS16550_plat serial_plat = { .clock = 48000000, /* 48MHz (APLL96/2) */ - .f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR, .reg_read = omap_uart_read, .reg_write = omap_uart_write, }; diff --git a/arch/arm/boards/pcm049/board.c b/arch/arm/boards/pcm049/board.c index ec0d0b8ea5..d6de29b6e8 100644 --- a/arch/arm/boards/pcm049/board.c +++ b/arch/arm/boards/pcm049/board.c @@ -43,7 +43,6 @@ static struct NS16550_plat serial_plat = { .clock = 48000000, /* 48MHz (APLL96/2) */ - .f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR, .reg_read = omap_uart_read, .reg_write = omap_uart_write, }; diff --git a/arch/x86/boards/x86_generic/generic_pc.c b/arch/x86/boards/x86_generic/generic_pc.c index d031c523b0..b35d26ff9f 100644 --- a/arch/x86/boards/x86_generic/generic_pc.c +++ b/arch/x86/boards/x86_generic/generic_pc.c @@ -78,7 +78,6 @@ device_initcall(devices_init); static struct NS16550_plat serial_plat = { .clock = 1843200, - .f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR, .reg_read = x86_uart_read, .reg_write = x86_uart_write, }; diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index 9a4b4dccc7..1dea7369e2 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -196,7 +196,10 @@ static int ns16550_probe(struct device_d *dev) dev->type_data = cdev; cdev->dev = dev; - cdev->f_caps = plat->f_caps; + if (plat->f_caps) + cdev->f_caps = plat->f_caps; + else + cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = ns16550_tstc; cdev->putc = ns16550_putc; cdev->getc = ns16550_getc; |