diff options
| author | Anish Trivedi <anish@freescale.com> | 2010-09-15 09:50:23 -0500 |
|---|---|---|
| committer | Alan Tull <r80115@freescale.com> | 2010-09-25 09:52:51 -0500 |
| commit | 600541d95109c1537184abf676cafb64575b4361 (patch) | |
| tree | 29269fd64aae4ab2d9012bbc58663e321613a00e /drivers/rtc | |
| parent | 3aa5110dae99eb82b4ec1c2106efb4766d879f37 (diff) | |
ENGR00131570 SRTC Driver enable for kernel 2.6.35
Upgrade of SRTC driver to kernel version 2.6.35 required
that device pointer be provided when calling clk_get_rate
Signed-off-by: Anish Trivedi <anish@freescale.com>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-mxc_v2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-mxc_v2.c b/drivers/rtc/rtc-mxc_v2.c index 61e3265cc413..710dc8be6d73 100644 --- a/drivers/rtc/rtc-mxc_v2.c +++ b/drivers/rtc/rtc-mxc_v2.c @@ -361,6 +361,7 @@ static int mxc_rtc_ioctl(struct device *dev, unsigned int cmd, return 0; + /* NOTE: This IOCTL does not work properly on kernel 2.6.35 */ case RTC_WAIT_TIME_SET: /* don't block without releasing mutex first */ @@ -592,7 +593,7 @@ static int mxc_rtc_probe(struct platform_device *pdev) } } - clk = clk_get(NULL, "rtc_clk"); + clk = clk_get(&pdev->dev, "rtc_clk"); if (clk_get_rate(clk) != 32768) { printk(KERN_ALERT "rtc clock is not valid"); ret = -EINVAL; |