ARM: kirkwood: use devicetree for rtc-mv

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 825310b6d3660be3d548e952933fab3d7f96e90e..3474ef8909455e6899dd184c8f71b06fdba2f2ec 100644 (file)
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/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/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 975ad01486526a9f1cd43e870aeeca662a053d60..1c672d9e6656a02e8c93f7f2d712521266f3a936 100644 (file)
--- 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)
 #endif
 
        /* internal devices that every board has */
-       kirkwood_rtc_init();
        kirkwood_wdt_init();
        kirkwood_xor0_init();
        kirkwood_xor1_init();

diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 04a7eb95af7665cd99a2dcc25ae2e870fe926ac1..a02cae881f2fe199929f789b3275e7ad9cd17d69 100644 (file)
--- 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,
 /*****************************************************************************
  * 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/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
index 473757818e0211834266489f47beb78b82fed28f..fa8e7689c4369a414cb9e6f0d77d887f0845bd27 100644 (file)
--- a/arch/arm/mach-kirkwood/common.h
+++ b/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);