mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Johan Hovold <jhovold@gmail.com>
To: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Douglas Gilbert <dgilbert@interlog.com>,
	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
	Ludovic Desroches <ludovic.desroches@atmel.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Robert Nelson <Robert.Nelson@digikey.com>,
	Johan Hovold <jhovold@gmail.com>
Subject: [PATCH v3 5/5] rtc-at91rm9200: use shadow IMR on at91sam9x5
Date: Thu, 23 May 2013 10:38:55 +0200	[thread overview]
Message-ID: <1369298335-24597-6-git-send-email-jhovold@gmail.com> (raw)
In-Reply-To: <1369298335-24597-1-git-send-email-jhovold@gmail.com>

Add support for the at91sam9x5-family which must use the shadow
interrupt mask due to a hardware issue (causing RTC_IMR to always be
zero).

Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
 Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.txt | 2 +-
 arch/arm/boot/dts/at91sam9x5.dtsi                              | 2 +-
 drivers/rtc/rtc-at91rm9200.c                                   | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.txt b/Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.txt
index 2a3feab..34c1505 100644
--- a/Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.txt
+++ b/Documentation/devicetree/bindings/rtc/atmel,at91rm9200-rtc.txt
@@ -1,7 +1,7 @@
 Atmel AT91RM9200 Real Time Clock
 
 Required properties:
-- compatible: should be: "atmel,at91rm9200-rtc"
+- compatible: should be: "atmel,at91rm9200-rtc" or "atmel,at91sam9x5-rtc"
 - reg: physical base address of the controller and length of memory mapped
   region.
 - interrupts: rtc alarm/event interrupt
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 1145ac3..b5833d1f 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -643,7 +643,7 @@
 			};
 
 			rtc@fffffeb0 {
-				compatible = "atmel,at91rm9200-rtc";
+				compatible = "atmel,at91sam9x5-rtc";
 				reg = <0xfffffeb0 0x40>;
 				interrupts = <1 4 7>;
 				status = "disabled";
diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c
index 205701e..47416e9 100644
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -309,12 +309,19 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id)
 static const struct at91_rtc_config at91rm9200_config = {
 };
 
+static const struct at91_rtc_config at91sam9x5_config = {
+	.use_shadow_imr	= true,
+};
+
 #ifdef CONFIG_OF
 static const struct of_device_id at91_rtc_dt_ids[] = {
 	{
 		.compatible = "atmel,at91rm9200-rtc",
 		.data = &at91rm9200_config,
 	}, {
+		.compatible = "atmel,at91sam9x5-rtc",
+		.data = &at91sam9x5_config,
+	}, {
 		/* sentinel */
 	}
 };
-- 
1.8.2.1


  parent reply	other threads:[~2013-05-23  8:39 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-29 16:03 [RFC 1/5] rtc-at91rm9200: add configuration support Johan Hovold
2013-03-29 16:03 ` [RFC 2/5] rtc-at91rm9200: add device-tree support Johan Hovold
2013-03-29 16:12   ` Johan Hovold
2013-03-29 16:03 ` [RFC 3/5] rtc-at91rm9200: refactor interrupt-register handling Johan Hovold
2013-03-29 16:03 ` [RFC 4/5] rtc-at91rm9200: add shadow interrupt mask Johan Hovold
2013-03-29 16:03 ` [RFC 5/5] rtc-at91rm9200: add support for at91sam9x5 Johan Hovold
2013-03-29 16:39   ` Douglas Gilbert
2013-04-02 13:06   ` [RFC PATCH] rtc: rtc-at91rm9200: manage IMR depending on revision Nicolas Ferre
2013-04-02 15:32     ` Douglas Gilbert
2013-04-02 16:28       ` Nicolas Ferre
2013-04-02 16:36     ` [RFC PATCH v2] " Nicolas Ferre
2013-04-03  9:51       ` Johan Hovold
2013-04-03  9:54         ` [PATCH] Revert "drivers/rtc/rtc-at91rm9200.c: use a variable for storing IMR" Johan Hovold
2013-04-03 10:03           ` [RFC v2 0/4] rtc-at91rm9200: add support for at91sam9x5 Johan Hovold
2013-04-03 10:03             ` [RFC v2 1/4] rtc-at91rm9200: add configuration support Johan Hovold
2013-04-03 10:03             ` [RFC v2 2/4] rtc-at91rm9200: refactor interrupt-register handling Johan Hovold
2013-04-03 10:03             ` [RFC v2 3/4] rtc-at91rm9200: add shadow interrupt mask Johan Hovold
2013-04-03 10:03             ` [RFC v2 4/4] rtc-at91rm9200: add support for at91sam9x5 Johan Hovold
2013-05-23  8:38             ` [PATCH v3 0/5] rtc-at91rm9200: add shadow interrupt mask Johan Hovold
2013-05-23  8:38               ` [PATCH v3 1/5] rtc-at91rm9200: add match-table compile guard Johan Hovold
2013-05-23  8:38               ` [PATCH v3 2/5] rtc-at91rm9200: add configuration support Johan Hovold
2013-05-23  8:38               ` [PATCH v3 3/5] rtc-at91rm9200: refactor interrupt-register handling Johan Hovold
2013-05-23  8:38               ` [PATCH v3 4/5] rtc-at91rm9200: add shadow interrupt mask Johan Hovold
2013-05-23  8:38               ` Johan Hovold [this message]
2013-05-29 20:33               ` [PATCH v3 0/5] " Andrew Morton
2013-05-29 20:41                 ` Robert Nelson
2013-05-29 23:22                   ` Douglas Gilbert
2013-05-30  8:18                     ` Nicolas Ferre
2013-05-30  7:50                   ` Nicolas Ferre
2013-05-30 19:36                     ` Andrew Morton
2013-05-30 23:17                       ` Douglas Gilbert
2013-05-31  7:54                         ` Nicolas Ferre
2013-05-30  7:41               ` Nicolas Ferre
2013-04-03 10:18           ` [PATCH] Revert "drivers/rtc/rtc-at91rm9200.c: use a variable for storing IMR" Nicolas Ferre
2013-04-05 14:14             ` Nicolas Ferre
2013-04-05 15:35               ` Greg KH
2013-04-05 16:16                 ` Nicolas Ferre
2013-04-03 10:37         ` [RFC PATCH v2] rtc: rtc-at91rm9200: manage IMR depending on revision Nicolas Ferre
2013-04-03 13:46           ` Johan Hovold

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1369298335-24597-6-git-send-email-jhovold@gmail.com \
    --to=jhovold@gmail.com \
    --cc=Robert.Nelson@digikey.com \
    --cc=dgilbert@interlog.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ludovic.desroches@atmel.com \
    --cc=nicolas.ferre@atmel.com \
    --cc=plagnioj@jcrosoft.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome