aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2014-04-03 17:50:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-03 19:21:21 -0400
commitf49bd06e1d423e045f36a85fb3935fab706b1bf6 (patch)
tree888a9e0f7f8794139e4691e27e62efad8b7a57d4
parent6a2b342228b98432a585c83d59ed6aa0620be7c4 (diff)
rtc: sunxi: change compatibles
The Allwinner A10 compatibles were following a slightly different compatible patterns than the rest of the SoCs for historical reasons. Change the compatibles to match the other pattern in the RTC driver for consistency. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--Documentation/devicetree/bindings/rtc/sunxi-rtc.txt4
-rw-r--r--drivers/rtc/rtc-sunxi.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/rtc/sunxi-rtc.txt b/Documentation/devicetree/bindings/rtc/sunxi-rtc.txt
index 7cb9dbf34878..6983aad376c3 100644
--- a/Documentation/devicetree/bindings/rtc/sunxi-rtc.txt
+++ b/Documentation/devicetree/bindings/rtc/sunxi-rtc.txt
@@ -3,7 +3,7 @@
3RTC controller for the Allwinner A10/A20 3RTC controller for the Allwinner A10/A20
4 4
5Required properties: 5Required properties:
6- compatible : Should be "allwinner,sun4i-rtc" or "allwinner,sun7i-a20-rtc" 6- compatible : Should be "allwinner,sun4i-a10-rtc" or "allwinner,sun7i-a20-rtc"
7- reg: physical base address of the controller and length of memory mapped 7- reg: physical base address of the controller and length of memory mapped
8 region. 8 region.
9- interrupts: IRQ line for the RTC. 9- interrupts: IRQ line for the RTC.
@@ -11,7 +11,7 @@ Required properties:
11Example: 11Example:
12 12
13rtc: rtc@01c20d00 { 13rtc: rtc@01c20d00 {
14 compatible = "allwinner,sun4i-rtc"; 14 compatible = "allwinner,sun4i-a10-rtc";
15 reg = <0x01c20d00 0x20>; 15 reg = <0x01c20d00 0x20>;
16 interrupts = <24>; 16 interrupts = <24>;
17}; 17};
diff --git a/drivers/rtc/rtc-sunxi.c b/drivers/rtc/rtc-sunxi.c
index 68a35284e5ad..b6f21f73d508 100644
--- a/drivers/rtc/rtc-sunxi.c
+++ b/drivers/rtc/rtc-sunxi.c
@@ -428,7 +428,7 @@ static const struct rtc_class_ops sunxi_rtc_ops = {
428}; 428};
429 429
430static const struct of_device_id sunxi_rtc_dt_ids[] = { 430static const struct of_device_id sunxi_rtc_dt_ids[] = {
431 { .compatible = "allwinner,sun4i-rtc", .data = &data_year_param[0] }, 431 { .compatible = "allwinner,sun4i-a10-rtc", .data = &data_year_param[0] },
432 { .compatible = "allwinner,sun7i-a20-rtc", .data = &data_year_param[1] }, 432 { .compatible = "allwinner,sun7i-a20-rtc", .data = &data_year_param[1] },
433 { /* sentinel */ }, 433 { /* sentinel */ },
434}; 434};