[PATCH 4/5 v2] ARM: kirkwood: convert rtc-mv to fdt.
From: Jason Cooper <hidden>
Date: 2012-03-02 17:50:21
Also in:
linux-devicetree
Subsystem:
arm port, real time clock (rtc) subsystem, the rest · Maintainers:
Russell King, Alexandre Belloni, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2012-03-05 · Re: [PATCH 4/5 v2] ARM: kirkwood: convert rtc-mv to fdt. · Jason <hidden>
The comment at mach-kirkwood/common.c:469, says this device is in every
kirkwood board. So, it is placed in kirkwood.dtsi.
Signed-off-by: Jason Cooper <redacted>
---
Changes since v1:
- removed unnecessary of_*() code from _probe()
- use of_match_ptr()
arch/arm/boot/dts/kirkwood.dtsi | 6 ++++++
arch/arm/mach-kirkwood/board-dt.c | 1 -
arch/arm/mach-kirkwood/common.c | 2 +-
arch/arm/mach-kirkwood/common.h | 1 -
drivers/rtc/rtc-mv.c | 7 +++++++
5 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 771c6bb..5fb185c 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi@@ -2,5 +2,11 @@ / { compatible = "marvell,kirkwood"; + + rtc at f1010300 { + compatible = "marvell,rtc"; + reg = <0xf1010300 0x1f>; + interrupts = <53>; + }; };
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 2a45656..6e18338 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c@@ -134,7 +134,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 167b6c8..0c0375f 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, /***************************************************************************** * 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 c382447..ca08826 100644
--- a/arch/arm/mach-kirkwood/common.h
+++ b/arch/arm/mach-kirkwood/common.h@@ -53,7 +53,6 @@ void kirkwood_restart(char, const char *); 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);
diff --git a/drivers/rtc/rtc-mv.c b/drivers/rtc/rtc-mv.c
index 768e2ed..3108b18 100644
--- a/drivers/rtc/rtc-mv.c
+++ b/drivers/rtc/rtc-mv.c@@ -12,6 +12,7 @@ #include <linux/bcd.h> #include <linux/io.h> #include <linux/platform_device.h> +#include <linux/of.h> #include <linux/delay.h> #include <linux/gfp.h> #include <linux/module.h>
@@ -294,11 +295,17 @@ static int __exit mv_rtc_remove(struct platform_device *pdev) return 0; } +static struct of_device_id rtc_mv_of_match_table[] = { + { .compatible = "marvell,rtc", }, + {} +}; + static struct platform_driver mv_rtc_driver = { .remove = __exit_p(mv_rtc_remove), .driver = { .name = "rtc-mv", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(rtc_mv_of_match_table), }, };
--
1.7.3.4