From 6f0f7c79522d3bc9990d6fedf03ac11c169bf5a4 Mon Sep 17 00:00:00 2001
From: Jason Cooper <jason@lakedaemon.net>
Date: Tue, 6 Mar 2012 23:55:04 +0000
Subject: [PATCH] --- yaml --- r: 296724 b: refs/heads/master c:
 e871b87a1e978e618c75acd4ceb6cd4699728691 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/boot/dts/kirkwood.dtsi   | 6 ++++++
 trunk/arch/arm/mach-kirkwood/board-dt.c | 1 -
 trunk/arch/arm/mach-kirkwood/common.c   | 2 +-
 trunk/arch/arm/mach-kirkwood/common.h   | 1 -
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 54a358fb7d55..2f0958fb28f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea983ede1195982c64220e9030c28ff111c8655c
+refs/heads/master: e871b87a1e978e618c75acd4ceb6cd4699728691
diff --git a/trunk/arch/arm/boot/dts/kirkwood.dtsi b/trunk/arch/arm/boot/dts/kirkwood.dtsi
index 825310b6d366..3474ef890945 100644
--- a/trunk/arch/arm/boot/dts/kirkwood.dtsi
+++ b/trunk/arch/arm/boot/dts/kirkwood.dtsi
@@ -26,5 +26,11 @@
 			/* set clock-frequency in board dts */
 			status = "disabled";
 		};
+
+		rtc@10300 {
+			compatible = "mrvl,kirkwood-rtc", "mrvl,orion-rtc";
+			reg = <0x10300 0x20>;
+			interrupts = <53>;
+		};
 	};
 };
diff --git a/trunk/arch/arm/mach-kirkwood/board-dt.c b/trunk/arch/arm/mach-kirkwood/board-dt.c
index 975ad0148652..1c672d9e6656 100644
--- a/trunk/arch/arm/mach-kirkwood/board-dt.c
+++ b/trunk/arch/arm/mach-kirkwood/board-dt.c
@@ -43,7 +43,6 @@ static void __init kirkwood_dt_init(void)
 #endif
 
 	/* internal devices that every board has */
-	kirkwood_rtc_init();
 	kirkwood_wdt_init();
 	kirkwood_xor0_init();
 	kirkwood_xor1_init();
diff --git a/trunk/arch/arm/mach-kirkwood/common.c b/trunk/arch/arm/mach-kirkwood/common.c
index 04a7eb95af76..a02cae881f2f 100644
--- a/trunk/arch/arm/mach-kirkwood/common.c
+++ b/trunk/arch/arm/mach-kirkwood/common.c
@@ -163,7 +163,7 @@ void __init kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts,
 /*****************************************************************************
  * SoC RTC
  ****************************************************************************/
-void __init kirkwood_rtc_init(void)
+static void __init kirkwood_rtc_init(void)
 {
 	orion_rtc_init(RTC_PHYS_BASE, IRQ_KIRKWOOD_RTC);
 }
diff --git a/trunk/arch/arm/mach-kirkwood/common.h b/trunk/arch/arm/mach-kirkwood/common.h
index 473757818e02..fa8e7689c436 100644
--- a/trunk/arch/arm/mach-kirkwood/common.h
+++ b/trunk/arch/arm/mach-kirkwood/common.h
@@ -61,7 +61,6 @@ static inline void dreamplug_init(void) {};
 /* early init functions not converted to fdt yet */
 char *kirkwood_id(void);
 void kirkwood_l2_init(void);
-void kirkwood_rtc_init(void);
 void kirkwood_wdt_init(void);
 void kirkwood_xor0_init(void);
 void kirkwood_xor1_init(void);