diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2007-08-26 00:08:11 +0200 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-09-14 08:51:27 -0500 |
commit | 7f2862c34521ee6006f9c2678d68a02dc57b5444 (patch) | |
tree | 135dcf63b483a5b60c3d7b526d72d2b76c3cb75d /arch/powerpc/platforms/embedded6xx | |
parent | 7f50382dc87988d618f2d47364b22ad5973a968d (diff) | |
download | kernel_samsung_espresso10-7f2862c34521ee6006f9c2678d68a02dc57b5444.zip kernel_samsung_espresso10-7f2862c34521ee6006f9c2678d68a02dc57b5444.tar.gz kernel_samsung_espresso10-7f2862c34521ee6006f9c2678d68a02dc57b5444.tar.bz2 |
[POWERPC] linkstation updates
1. Fix RTC type - it is a rs5c372a, not rs5c372b
2. Configure both UART interrupts edge-triggered
3. Add a license header to ls_uart.c
4. Check for running on linkstation in a late_initcall() function. Needed
for multiplatform builds, even though linkstation doesn't support them
yet
5. Remove unneeded #include from linkstation.c
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/embedded6xx')
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/linkstation.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/ls_uart.c | 14 |
2 files changed, 14 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c index 61ca02c..f392374 100644 --- a/arch/powerpc/platforms/embedded6xx/linkstation.c +++ b/arch/powerpc/platforms/embedded6xx/linkstation.c @@ -11,7 +11,6 @@ */ #include <linux/kernel.h> -#include <linux/pci.h> #include <linux/initrd.h> #include <linux/mtd/physmap.h> diff --git a/arch/powerpc/platforms/embedded6xx/ls_uart.c b/arch/powerpc/platforms/embedded6xx/ls_uart.c index 0d9f150..c99264c 100644 --- a/arch/powerpc/platforms/embedded6xx/ls_uart.c +++ b/arch/powerpc/platforms/embedded6xx/ls_uart.c @@ -1,3 +1,14 @@ +/* + * AVR power-management chip interface for the Buffalo Linkstation / + * Kurobox Platform. + * + * Author: 2006 (c) G. Liakhovetski + * g.liakhovetski@gmx.de + * + * This file is licensed under the terms of the GNU General Public License + * version 2. This program is licensed "as is" without any warranty of + * any kind, whether express or implied. + */ #include <linux/workqueue.h> #include <linux/string.h> #include <linux/delay.h> @@ -106,6 +117,9 @@ static int __init ls_uarts_init(void) phys_addr_t phys_addr; int len; + if (!machine_is(linkstation)) + return 0; + avr = of_find_node_by_path("/soc10x/serial@80004500"); if (!avr) return -EINVAL; |