diff options
| author | Martin Michlmayr <tbm@cyrius.com> | 2008-08-13 10:46:11 +0300 |
|---|---|---|
| committer | Nicolas Pitre <nico@cam.org> | 2008-08-21 22:15:17 -0400 |
| commit | e45772b2c0a011203b797d2b5f19fe314eacca0e (patch) | |
| tree | e59efe9e529681ec1f05032711470338d1ae9799 | |
| parent | c0fe819baf86979a5801387ccd7d8df0dc2f34e2 (diff) | |
| download | talos-op-linux-e45772b2c0a011203b797d2b5f19fe314eacca0e.tar.gz talos-op-linux-e45772b2c0a011203b797d2b5f19fe314eacca0e.zip | |
[ARM] Orion: register UART1 on QNAP TS-209 and TS-409
Register UART1 on QNAP TS-209 and TS-409 because the PIC controller
is connected to it. This fixes a regression from 2.6.26.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
| -rw-r--r-- | arch/arm/mach-orion5x/ts209-setup.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/ts409-setup.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c index bcd4b2a10d68..9d6890514199 100644 --- a/arch/arm/mach-orion5x/ts209-setup.c +++ b/arch/arm/mach-orion5x/ts209-setup.c @@ -300,6 +300,7 @@ static void __init qnap_ts209_init(void) orion5x_i2c_init(); orion5x_sata_init(&qnap_ts209_sata_data); orion5x_uart0_init(); + orion5x_uart1_init(); orion5x_xor_init(); platform_device_register(&qnap_ts209_button_device); diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c index 4bd8ed1d75e4..d85588ac7ef8 100644 --- a/arch/arm/mach-orion5x/ts409-setup.c +++ b/arch/arm/mach-orion5x/ts409-setup.c @@ -289,6 +289,7 @@ static void __init qnap_ts409_init(void) orion5x_eth_init(&qnap_tsx09_eth_data); orion5x_i2c_init(); orion5x_uart0_init(); + orion5x_uart1_init(); platform_device_register(&qnap_ts409_button_device); |
