Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 26 insertions, 0 deletions

diff --git a/arch/arm/mach-gemini/devices.c b/arch/arm/mach-gemini/devices.c
index 6b525253d027..5cff29818b73 100644
--- a/arch/arm/mach-gemini/devices.c
+++ b/arch/arm/mach-gemini/devices.c
@@ -90,3 +90,29 @@ int platform_register_pflash(unsigned int size, struct mtd_partition *parts,
 
         return platform_device_register(&pflash_device);
 }
+
+static struct resource gemini_rtc_resources[] = {
+        [0] = {
+                .start  = GEMINI_RTC_BASE,
+                .end    = GEMINI_RTC_BASE + 0x24,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = IRQ_RTC,
+                .end    = IRQ_RTC,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device gemini_rtc_device = {
+        .name           = "rtc-gemini",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(gemini_rtc_resources),
+        .resource       = gemini_rtc_resources,
+};
+
+int __init platform_register_rtc(void)
+{
+        return platform_device_register(&gemini_rtc_device);
+}
+