diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2007-08-25 18:08:11 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-09-14 09:51:27 -0400 |
commit | 7f2862c34521ee6006f9c2678d68a02dc57b5444 (patch) | |
tree | 135dcf63b483a5b60c3d7b526d72d2b76c3cb75d /arch/powerpc | |
parent | 7f50382dc87988d618f2d47364b22ad5973a968d (diff) |
[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')
-rw-r--r-- | arch/powerpc/boot/dts/kuroboxHD.dts | 4 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/kuroboxHG.dts | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/linkstation.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/ls_uart.c | 14 |
4 files changed, 18 insertions, 5 deletions
diff --git a/arch/powerpc/boot/dts/kuroboxHD.dts b/arch/powerpc/boot/dts/kuroboxHD.dts index b0eeff036de3..a7b3714bc029 100644 --- a/arch/powerpc/boot/dts/kuroboxHD.dts +++ b/arch/powerpc/boot/dts/kuroboxHD.dts | |||
@@ -69,7 +69,7 @@ XXXX add flash parts, rtc, ?? | |||
69 | 69 | ||
70 | rtc@32 { | 70 | rtc@32 { |
71 | device_type = "rtc"; | 71 | device_type = "rtc"; |
72 | compatible = "ricoh,rs5c372b"; | 72 | compatible = "ricoh,rs5c372a"; |
73 | reg = <32>; | 73 | reg = <32>; |
74 | }; | 74 | }; |
75 | }; | 75 | }; |
@@ -80,7 +80,7 @@ XXXX add flash parts, rtc, ?? | |||
80 | reg = <80004500 8>; | 80 | reg = <80004500 8>; |
81 | clock-frequency = <5d08d88>; | 81 | clock-frequency = <5d08d88>; |
82 | current-speed = <2580>; | 82 | current-speed = <2580>; |
83 | interrupts = <9 2>; | 83 | interrupts = <9 0>; |
84 | interrupt-parent = <&mpic>; | 84 | interrupt-parent = <&mpic>; |
85 | }; | 85 | }; |
86 | 86 | ||
diff --git a/arch/powerpc/boot/dts/kuroboxHG.dts b/arch/powerpc/boot/dts/kuroboxHG.dts index ccd15a231a10..a0007b9bcc80 100644 --- a/arch/powerpc/boot/dts/kuroboxHG.dts +++ b/arch/powerpc/boot/dts/kuroboxHG.dts | |||
@@ -69,7 +69,7 @@ XXXX add flash parts, rtc, ?? | |||
69 | 69 | ||
70 | rtc@32 { | 70 | rtc@32 { |
71 | device_type = "rtc"; | 71 | device_type = "rtc"; |
72 | compatible = "ricoh,rs5c372b"; | 72 | compatible = "ricoh,rs5c372a"; |
73 | reg = <32>; | 73 | reg = <32>; |
74 | }; | 74 | }; |
75 | }; | 75 | }; |
@@ -80,7 +80,7 @@ XXXX add flash parts, rtc, ?? | |||
80 | reg = <80004500 8>; | 80 | reg = <80004500 8>; |
81 | clock-frequency = <7c044a8>; | 81 | clock-frequency = <7c044a8>; |
82 | current-speed = <2580>; | 82 | current-speed = <2580>; |
83 | interrupts = <9 2>; | 83 | interrupts = <9 0>; |
84 | interrupt-parent = <&mpic>; | 84 | interrupt-parent = <&mpic>; |
85 | }; | 85 | }; |
86 | 86 | ||
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c index 61ca02c2d644..f392374309b3 100644 --- a/arch/powerpc/platforms/embedded6xx/linkstation.c +++ b/arch/powerpc/platforms/embedded6xx/linkstation.c | |||
@@ -11,7 +11,6 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
14 | #include <linux/pci.h> | ||
15 | #include <linux/initrd.h> | 14 | #include <linux/initrd.h> |
16 | #include <linux/mtd/physmap.h> | 15 | #include <linux/mtd/physmap.h> |
17 | 16 | ||
diff --git a/arch/powerpc/platforms/embedded6xx/ls_uart.c b/arch/powerpc/platforms/embedded6xx/ls_uart.c index 0d9f1500a671..c99264cedda5 100644 --- a/arch/powerpc/platforms/embedded6xx/ls_uart.c +++ b/arch/powerpc/platforms/embedded6xx/ls_uart.c | |||
@@ -1,3 +1,14 @@ | |||
1 | /* | ||
2 | * AVR power-management chip interface for the Buffalo Linkstation / | ||
3 | * Kurobox Platform. | ||
4 | * | ||
5 | * Author: 2006 (c) G. Liakhovetski | ||
6 | * g.liakhovetski@gmx.de | ||
7 | * | ||
8 | * This file is licensed under the terms of the GNU General Public License | ||
9 | * version 2. This program is licensed "as is" without any warranty of | ||
10 | * any kind, whether express or implied. | ||
11 | */ | ||
1 | #include <linux/workqueue.h> | 12 | #include <linux/workqueue.h> |
2 | #include <linux/string.h> | 13 | #include <linux/string.h> |
3 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
@@ -106,6 +117,9 @@ static int __init ls_uarts_init(void) | |||
106 | phys_addr_t phys_addr; | 117 | phys_addr_t phys_addr; |
107 | int len; | 118 | int len; |
108 | 119 | ||
120 | if (!machine_is(linkstation)) | ||
121 | return 0; | ||
122 | |||
109 | avr = of_find_node_by_path("/soc10x/serial@80004500"); | 123 | avr = of_find_node_by_path("/soc10x/serial@80004500"); |
110 | if (!avr) | 124 | if (!avr) |
111 | return -EINVAL; | 125 | return -EINVAL; |