aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/kirkwood.dtsi6
-rw-r--r--arch/arm/mach-kirkwood/board-dt.c1
-rw-r--r--arch/arm/mach-kirkwood/common.c2
-rw-r--r--arch/arm/mach-kirkwood/common.h1
4 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 825310b6d366..3474ef890945 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -26,5 +26,11 @@
26 /* set clock-frequency in board dts */ 26 /* set clock-frequency in board dts */
27 status = "disabled"; 27 status = "disabled";
28 }; 28 };
29
30 rtc@10300 {
31 compatible = "mrvl,kirkwood-rtc", "mrvl,orion-rtc";
32 reg = <0x10300 0x20>;
33 interrupts = <53>;
34 };
29 }; 35 };
30}; 36};
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 975ad0148652..1c672d9e6656 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -43,7 +43,6 @@ static void __init kirkwood_dt_init(void)
43#endif 43#endif
44 44
45 /* internal devices that every board has */ 45 /* internal devices that every board has */
46 kirkwood_rtc_init();
47 kirkwood_wdt_init(); 46 kirkwood_wdt_init();
48 kirkwood_xor0_init(); 47 kirkwood_xor0_init();
49 kirkwood_xor1_init(); 48 kirkwood_xor1_init();
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 04a7eb95af76..a02cae881f2f 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -163,7 +163,7 @@ void __init kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts,
163/***************************************************************************** 163/*****************************************************************************
164 * SoC RTC 164 * SoC RTC
165 ****************************************************************************/ 165 ****************************************************************************/
166void __init kirkwood_rtc_init(void) 166static void __init kirkwood_rtc_init(void)
167{ 167{
168 orion_rtc_init(RTC_PHYS_BASE, IRQ_KIRKWOOD_RTC); 168 orion_rtc_init(RTC_PHYS_BASE, IRQ_KIRKWOOD_RTC);
169} 169}
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
index 473757818e02..fa8e7689c436 100644
--- a/arch/arm/mach-kirkwood/common.h
+++ b/arch/arm/mach-kirkwood/common.h
@@ -61,7 +61,6 @@ static inline void dreamplug_init(void) {};
61/* early init functions not converted to fdt yet */ 61/* early init functions not converted to fdt yet */
62char *kirkwood_id(void); 62char *kirkwood_id(void);
63void kirkwood_l2_init(void); 63void kirkwood_l2_init(void);
64void kirkwood_rtc_init(void);
65void kirkwood_wdt_init(void); 64void kirkwood_wdt_init(void);
66void kirkwood_xor0_init(void); 65void kirkwood_xor0_init(void);
67void kirkwood_xor1_init(void); 66void kirkwood_xor1_init(void);