From patchwork Mon Dec 10 10:42:01 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [1/2] arm: mvebu: add RTC support for Armada 370 and Armada XP
Date: Mon, 10 Dec 2012 00:42:01 -0000
From: Gregory CLEMENT <gregory.clement@free-electrons.com>
X-Patchwork-Id: 204848
Message-Id: <1355136122-30729-2-git-send-email-gregory.clement@free-electrons.com>
To: Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
 Gregory Clement <gregory.clement@free-electrons.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>,
 linux-arm-kernel@lists.infradead.org, Arnd Bergmann <arnd@arndb.de>,
 Olof Johansson <olof@lixom.net>, Grant Likely <grant.likely@secretlab.ca>,
 Rob Herring <rob.herring@calxeda.com>, Nicolas Pitre <nico@fluxnic.net>,
 Lior Amsalem <alior@marvell.com>, Maen Suleiman <maen@marvell.com>,
 Tawfik Bayouk <tawfik@marvell.com>, Shadi Ammouri <shadi@marvell.com>,
 Eran Ben-Avi <benavi@marvell.com>, Yehuda Yitschak <yehuday@marvell.com>,
 Nadav Haklai <nadavh@marvell.com>, Ike Pan <ike.pan@canonical.com>,
 Jani Monoses <jani.monoses@canonical.com>,
 Chris Van Hoof <vanhoof@canonical.com>,
 Dan Frazier <dann.frazier@canonical.com>,
 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
 Leif Lindholm <leif.lindholm@arm.com>, Jon Masters <jcm@redhat.com>,
 David Marlin <dmarlin@redhat.com>,
 Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
 devicetree-discuss@lists.ozlabs.org, rtc-linux@googlegroups.com

The Armada 370 and Armada XP Socs have the same controller that the
one used in the orion platforms. This patch enables the selection of
rtc-mv with mvebu platform, and updates the device tree for these
SoCs.

---
arch/arm/boot/dts/armada-370-xp.dtsi |    6 ++++++
 drivers/rtc/Kconfig                  |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index cf6c48a..86dccfa 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -129,6 +129,12 @@
 			clocks = <&coreclk 0>;
 			status = "disabled";
 		};
+
+		rtc@10300 {
+			compatible = "marvell,orion-rtc";
+			reg = <0xd0010300 0x20>;
+			interrupts = <50>;
+		};
 	};
 };
 
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 19c03ab..9356f75 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -994,7 +994,7 @@ config RTC_DRV_TX4939
 
 config RTC_DRV_MV
 	tristate "Marvell SoC RTC"
-	depends on ARCH_KIRKWOOD || ARCH_DOVE
+	depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU
 	help
 	  If you say yes here you will get support for the in-chip RTC
 	  that can be found in some of Marvell's SoC devices, such as