aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-01-15 19:55:19 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-01-15 19:55:19 +0000
commit6a09e327fef39a296189ee0a811e1176d7991df1 (patch)
treec6439b78487069ced2b18d3faec493a5a25cb1e1 /target
parent4713aef3ffb8d0d9aa1eae624acb913e8568d230 (diff)
downloadupstream-6a09e327fef39a296189ee0a811e1176d7991df1.tar.gz
upstream-6a09e327fef39a296189ee0a811e1176d7991df1.tar.bz2
upstream-6a09e327fef39a296189ee0a811e1176d7991df1.zip
mvebu: add support for RTC
Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35176 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/mvebu/config-default1
-rw-r--r--target/linux/mvebu/patches-3.8/019-rtc_add_support_for_rtc_mv_for_mvebu.patch25
-rw-r--r--target/linux/mvebu/patches-3.8/020-arm_mvebu_add_rtc_support_for_a370_and_axp.patch29
3 files changed, 55 insertions, 0 deletions
diff --git a/target/linux/mvebu/config-default b/target/linux/mvebu/config-default
index 4255efa210..562d6f04be 100644
--- a/target/linux/mvebu/config-default
+++ b/target/linux/mvebu/config-default
@@ -227,6 +227,7 @@ CONFIG_PLAT_VERSATILE=y
CONFIG_PLAT_VERSATILE_CLCD=y
CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y
# CONFIG_PREEMPT_RCU is not set
+CONFIG_RTC_CLASS=y
# CONFIG_SCSI_DMA is not set
CONFIG_SERIAL_8250_DW=y
# CONFIG_SERIAL_AMBA_PL010 is not set
diff --git a/target/linux/mvebu/patches-3.8/019-rtc_add_support_for_rtc_mv_for_mvebu.patch b/target/linux/mvebu/patches-3.8/019-rtc_add_support_for_rtc_mv_for_mvebu.patch
new file mode 100644
index 0000000000..0142f251f4
--- /dev/null
+++ b/target/linux/mvebu/patches-3.8/019-rtc_add_support_for_rtc_mv_for_mvebu.patch
@@ -0,0 +1,25 @@
+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 platforms.
+
+Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
+Acked-by: Andrew Lunn <andrew@lunn.ch>
+---
+ drivers/rtc/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
+--
+1.7.9.5
diff --git a/target/linux/mvebu/patches-3.8/020-arm_mvebu_add_rtc_support_for_a370_and_axp.patch b/target/linux/mvebu/patches-3.8/020-arm_mvebu_add_rtc_support_for_a370_and_axp.patch
new file mode 100644
index 0000000000..c517b42226
--- /dev/null
+++ b/target/linux/mvebu/patches-3.8/020-arm_mvebu_add_rtc_support_for_a370_and_axp.patch
@@ -0,0 +1,29 @@
+The Armada 370 and Armada XP Socs have the same controller that the
+one used in the orion platforms. This patch updates the device tree
+for these SoCs.
+
+Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
+Acked-by: Andrew Lunn <andrew@lunn.ch>
+---
+ arch/arm/boot/dts/armada-370-xp.dtsi | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+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>;
++ };
+ };
+ };
+
+--
+1.7.9.5