[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>

diff --git a/arch/powerpc/boot/dts/kuroboxHD.dts b/arch/powerpc/boot/dts/kuroboxHD.dts
index b0eeff036de339e6f31083342898a20e4b0d0eff..a7b3714bc0290516367c01e590b892d3dcfe794c 100644 (file)
--- a/arch/powerpc/boot/dts/kuroboxHD.dts
+++ b/arch/powerpc/boot/dts/kuroboxHD.dts
@@ -69,7 +69,7 @@ XXXX add flash parts, rtc, ??
 
                        rtc@32 {
                                device_type = "rtc";
-                               compatible = "ricoh,rs5c372b";
+                               compatible = "ricoh,rs5c372a";
                                reg = <32>;
                        };
                };
@@ -80,7 +80,7 @@ XXXX add flash parts, rtc, ??
                        reg = <80004500 8>;
                        clock-frequency = <5d08d88>;
                        current-speed = <2580>;
-                       interrupts = <9 2>;
+                       interrupts = <9 0>;
                        interrupt-parent = <&mpic>;
                };
 

diff --git a/arch/powerpc/boot/dts/kuroboxHG.dts b/arch/powerpc/boot/dts/kuroboxHG.dts
index ccd15a231a10d923deb05bfdad56550227aa11d4..a0007b9bcc80f31e668c26b8dea989ea9ada422c 100644 (file)
--- a/arch/powerpc/boot/dts/kuroboxHG.dts
+++ b/arch/powerpc/boot/dts/kuroboxHG.dts
@@ -69,7 +69,7 @@ XXXX add flash parts, rtc, ??
 
                        rtc@32 {
                                device_type = "rtc";
-                               compatible = "ricoh,rs5c372b";
+                               compatible = "ricoh,rs5c372a";
                                reg = <32>;
                        };
                };
@@ -80,7 +80,7 @@ XXXX add flash parts, rtc, ??
                        reg = <80004500 8>;
                        clock-frequency = <7c044a8>;
                        current-speed = <2580>;
-                       interrupts = <9 2>;
+                       interrupts = <9 0>;
                        interrupt-parent = <&mpic>;
                };
 

diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
index 61ca02c2d644f03349944d3a3b7f2f60c04ac98a..f392374309b342f937d13a626dddf10f23b66abc 100644 (file)
--- 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 0d9f1500a67185f23f78a9cfa02833f9a796d1b6..c99264cedda5e5f23e77465f2cd8a94a1614e360 100644 (file)
--- 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;