Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f2862c3 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Kumar Gala
Browse files

[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: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 7f50382d

arch/powerpc/boot/dts/kuroboxHD.dts

+2 −2
Original line number Diff line number Diff line
@@ -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>;

		};

arch/powerpc/boot/dts/kuroboxHG.dts

+2 −2
Original line number Diff line number Diff line
@@ -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>;

		};

arch/powerpc/platforms/embedded6xx/linkstation.c

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
 */



#include <linux/kernel.h>

#include <linux/pci.h>

#include <linux/initrd.h>

#include <linux/mtd/physmap.h>

arch/powerpc/platforms/embedded6xx/ls_uart.c

+14 −0
Original line number Diff line number Diff line 
/*

 * 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;