aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMartin Michlmayr <tbm@cyrius.com>2008-08-13 03:46:11 -0400
committerNicolas Pitre <nico@cam.org>2008-08-21 22:15:17 -0400
commite45772b2c0a011203b797d2b5f19fe314eacca0e (patch)
treee59efe9e529681ec1f05032711470338d1ae9799 /arch
parentc0fe819baf86979a5801387ccd7d8df0dc2f34e2 (diff)
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-orion5x/ts209-setup.c1
-rw-r--r--arch/arm/mach-orion5x/ts409-setup.c1
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)
300 orion5x_i2c_init(); 300 orion5x_i2c_init();
301 orion5x_sata_init(&qnap_ts209_sata_data); 301 orion5x_sata_init(&qnap_ts209_sata_data);
302 orion5x_uart0_init(); 302 orion5x_uart0_init();
303 orion5x_uart1_init();
303 orion5x_xor_init(); 304 orion5x_xor_init();
304 305
305 platform_device_register(&qnap_ts209_button_device); 306 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)
289 orion5x_eth_init(&qnap_tsx09_eth_data); 289 orion5x_eth_init(&qnap_tsx09_eth_data);
290 orion5x_i2c_init(); 290 orion5x_i2c_init();
291 orion5x_uart0_init(); 291 orion5x_uart0_init();
292 orion5x_uart1_init();
292 293
293 platform_device_register(&qnap_ts409_button_device); 294 platform_device_register(&qnap_ts409_button_device);
294 295