[kernel] r12054 - in dists/trunk/linux-2.6/debian/patches: bugfix/arm series

[Martin Michlmayr]

Author: tbm
Date: Wed Aug 13 07:44:09 2008
New Revision: 12054

Log:
UART1 on QNAP


Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/tsx09-init-uart1.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/tsx09-init-uart1.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/tsx09-init-uart1.patch	Wed Aug 13 07:44:09 2008
@@ -0,0 +1,27 @@
+Subject: [PATCH] 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 at cyrius.com>
+
+--- a/arch/arm/mach-orion5x/ts209-setup.c	2008-08-13 07:39:42.000000000 +0000
++++ b/arch/arm/mach-orion5x/ts209-setup.c	2008-08-13 07:41:05.000000000 +0000
+@@ -300,6 +300,7 @@
+ 	orion5x_i2c_init();
+ 	orion5x_sata_init(&qnap_ts209_sata_data);
+ 	orion5x_uart0_init();
++	orion5x_uart1_init();
+ 
+ 	platform_device_register(&qnap_ts209_button_device);
+ 
+--- a/arch/arm/mach-orion5x/ts409-setup.c	2008-08-13 07:39:55.000000000 +0000
++++ b/arch/arm/mach-orion5x/ts409-setup.c	2008-08-13 07:40:10.000000000 +0000
+@@ -293,6 +293,7 @@
+ 	orion5x_eth_init(&qnap_tsx09_eth_data);
+ 	orion5x_i2c_init();
+ 	orion5x_uart0_init();
++	orion5x_uart1_init();
+ 
+ 	platform_device_register(&qnap_ts409_button_device);
+ 

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Wed Aug 13 07:44:09 2008
@@ -29,6 +29,7 @@
 + bugfix/arm/kurobox_fix_nr_controllers.patch
 + bugfix/arm/ixp4xx_eth-build-fix.patch
 + bugfix/arm/tsx09-fix-mac.patch
++ bugfix/arm/tsx09-init-uart1.patch
 + features/arm/5281d0.patch
 + features/arm/ts409-export-leds.patch
 + features/arm/tsx09-fix-key-codes.patch