summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx37
diff options
context:
space:
mode:
authorAlan Tull <r80115@freescale.com>2008-03-14 11:19:23 -0500
committerDaniel Schaeffer <daniel.schaeffer@timesys.com>2008-08-25 15:20:46 -0400
commit4a2a86506008286afdbd3c94d05cfac69c9d0a24 (patch)
tree36c0806e252e1d98cbe23033eac3a62cf7bd5e83 /arch/arm/mach-mx37
parent2f099c612efd785a98c0cb8d5d00ffd891697b3d (diff)
ENGR00068616 driver support for srtc
Driver support for srtc block using lp section only. Signed-off-by: Alan Tull <r80115@freescale.com>
Diffstat (limited to 'arch/arm/mach-mx37')
-rw-r--r--arch/arm/mach-mx37/clock.c11
-rw-r--r--arch/arm/mach-mx37/devices.c4
2 files changed, 13 insertions, 2 deletions
diff --git a/arch/arm/mach-mx37/clock.c b/arch/arm/mach-mx37/clock.c
index 0f4b51337571..d17291ca245d 100644
--- a/arch/arm/mach-mx37/clock.c
+++ b/arch/arm/mach-mx37/clock.c
@@ -1725,6 +1725,16 @@ static struct clk pgc_clk = {
.recalc = _clk_pgc_recalc,
};
+static struct clk rtc_clk = {
+ .name = "rtc_clk",
+ .parent = &ckil_clk,
+ .secondary = &ipg_clk,
+ .enable = _clk_enable,
+ .enable_reg = MXC_CCM_CCGR4,
+ .enable_shift = MXC_CCM_CCGR4_CG13_OFFSET,
+ .disable = _clk_disable,
+};
+
static struct clk *mxc_clks[] = {
&osc_clk,
&ckih_clk,
@@ -1804,6 +1814,7 @@ static struct clk *mxc_clks[] = {
&vpu_clk[1],
&lpsr_clk,
&pgc_clk,
+ &rtc_clk,
};
static void clk_tree_init(void)
diff --git a/arch/arm/mach-mx37/devices.c b/arch/arm/mach-mx37/devices.c
index 80a3660d1c97..c5af2cb48048 100644
--- a/arch/arm/mach-mx37/devices.c
+++ b/arch/arm/mach-mx37/devices.c
@@ -88,7 +88,7 @@ static inline void mxc_init_owire(void)
}
#endif
-#if defined(CONFIG_RTC_MXC) || defined(CONFIG_RTC_MXC_MODULE)
+#if defined(CONFIG_RTC_DRV_MXC_V2) || defined(CONFIG_RTC_DRV_MXC_V2_MODULE)
static struct resource rtc_resources[] = {
{
.start = SRTC_BASE_ADDR,
@@ -96,7 +96,7 @@ static struct resource rtc_resources[] = {
.flags = IORESOURCE_MEM,
},
{
- .start = MXC_INT_RTC,
+ .start = MXC_INT_SRTC_NTZ,
.flags = IORESOURCE_IRQ,
},
};