From d294229d7adf099b1119143080b7df2a678c8826 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Wed, 27 Jan 2010 15:00:48 +0200
Subject: [PATCH] --- yaml --- r: 187519 b: refs/heads/master c:
 dcbabbc1fce2c32e4cfe0e18a2651226a72ecaae h: refs/heads/master i:   187517:
 fd9ccbc272ce190816c9cacaf53926476d84c000   187515:
 f35f5db3a35a7cec0ae7ad4b4f230896da6f36ed   187511:
 6506aed6f8d873a422cdd38a87e1792a64cde31b   187503:
 27f918186b5b5126620e5a534d054f4bd9931c56   187487:
 af994c6671f81544e80932161cca2ee33abf373b   187455:
 d3e01d032d290798bfd2cc87ac1a3a0db25c3fe1   187391:
 9a787add5859f224af9b6dbf0d8adab2c66df006 v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/arm/mach-mx25/clock.c            |  2 ++
 trunk/arch/arm/mach-mx25/devices.c          | 19 +++++++++++++++++++
 trunk/arch/arm/mach-mx25/devices.h          |  1 +
 trunk/arch/arm/plat-mxc/include/mach/mx25.h |  2 ++
 5 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 10701f789ace..4401ea81463e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cb73288b195dc04c1f604c38bd4ebd2081db9fa
+refs/heads/master: dcbabbc1fce2c32e4cfe0e18a2651226a72ecaae
diff --git a/trunk/arch/arm/mach-mx25/clock.c b/trunk/arch/arm/mach-mx25/clock.c
index 6acc88bcdc40..744b52a613fc 100644
--- a/trunk/arch/arm/mach-mx25/clock.c
+++ b/trunk/arch/arm/mach-mx25/clock.c
@@ -182,6 +182,7 @@ DEFINE_CLOCK(kpp_clk,	 0, CCM_CGCR1, 28, get_rate_ipg, NULL, NULL);
 DEFINE_CLOCK(tsc_clk,	 0, CCM_CGCR2, 13, get_rate_ipg, NULL, NULL);
 DEFINE_CLOCK(i2c_clk,	 0, CCM_CGCR0,  6, get_rate_i2c, NULL, NULL);
 DEFINE_CLOCK(fec_clk,	 0, CCM_CGCR1, 15, get_rate_ipg, NULL, &fec_ahb_clk);
+DEFINE_CLOCK(dryice_clk, 0, CCM_CGCR1,  8, get_rate_ipg, NULL, NULL);
 
 #define _REGISTER_CLOCK(d, n, c)	\
 	{				\
@@ -214,6 +215,7 @@ static struct clk_lookup lookups[] = {
 	_REGISTER_CLOCK("imx-i2c.1", NULL, i2c_clk)
 	_REGISTER_CLOCK("imx-i2c.2", NULL, i2c_clk)
 	_REGISTER_CLOCK("fec.0", NULL, fec_clk)
+	_REGISTER_CLOCK("imxdi_rtc.0", NULL, dryice_clk)
 };
 
 int __init mx25_clocks_init(void)
diff --git a/trunk/arch/arm/mach-mx25/devices.c b/trunk/arch/arm/mach-mx25/devices.c
index dd4069725ef5..b0b75fc99058 100644
--- a/trunk/arch/arm/mach-mx25/devices.c
+++ b/trunk/arch/arm/mach-mx25/devices.c
@@ -458,3 +458,22 @@ struct platform_device mxc_nand_device = {
 	.num_resources	= ARRAY_SIZE(mxc_nand_resources),
 	.resource	= mxc_nand_resources,
 };
+
+static struct resource mx25_rtc_resources[] = {
+	{
+		.start	= MX25_DRYICE_BASE_ADDR,
+		.end	= MX25_DRYICE_BASE_ADDR + 0x40,
+		.flags	= IORESOURCE_MEM,
+	},
+	{
+		.start	= MX25_INT_DRYICE,
+		.flags	= IORESOURCE_IRQ
+	},
+};
+
+struct platform_device mx25_rtc_device = {
+	.name	= "imxdi_rtc",
+	.id	= 0,
+	.num_resources	= ARRAY_SIZE(mx25_rtc_resources),
+	.resource	= mx25_rtc_resources,
+};
diff --git a/trunk/arch/arm/mach-mx25/devices.h b/trunk/arch/arm/mach-mx25/devices.h
index 8f5530062b43..37e6a0821447 100644
--- a/trunk/arch/arm/mach-mx25/devices.h
+++ b/trunk/arch/arm/mach-mx25/devices.h
@@ -19,3 +19,4 @@ extern struct platform_device mxc_i2c_device1;
 extern struct platform_device mxc_i2c_device2;
 extern struct platform_device mx25_fec_device;
 extern struct platform_device mxc_nand_device;
+extern struct platform_device mx25_rtc_device;
diff --git a/trunk/arch/arm/plat-mxc/include/mach/mx25.h b/trunk/arch/arm/plat-mxc/include/mach/mx25.h
index 021d208e86bc..61052a33979c 100644
--- a/trunk/arch/arm/plat-mxc/include/mach/mx25.h
+++ b/trunk/arch/arm/plat-mxc/include/mach/mx25.h
@@ -32,7 +32,9 @@
 
 #define MX25_FEC_BASE_ADDR		0x50038000
 #define MX25_NFC_BASE_ADDR		0xbb000000
+#define MX25_DRYICE_BASE_ADDR		0x53ffc000
 
+#define MX25_INT_DRYICE	25
 #define MX25_INT_FEC	57
 #define MX25_INT_NANDFC	33