diff options
| author | Jon Mayo <jmayo@nvidia.com> | 2010-07-20 17:55:54 -0700 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-07-21 12:51:41 -0700 |
| commit | f2a7108a11cb874faf8fb3ff7eee44721a6b9e18 (patch) | |
| tree | 44336d7a58b4e40298f0468d067877f81f458fd9 /drivers | |
| parent | dd03be59ae18076839bd3c4d4470bc79a5cd2843 (diff) | |
[arm/tegra] let RTC internal and ODM drivers coexist
Change-Id: I353d5ff87243c3098100320b2cd184b47b471e84
Reviewed-on: http://git-master/r/4182
Reviewed-by: Gary King <gking@nvidia.com>
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
Tested-by: Jonathan Mayo <jmayo@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rtc/rtc-tegra-odm.c | 45 |
1 files changed, 2 insertions, 43 deletions
diff --git a/drivers/rtc/rtc-tegra-odm.c b/drivers/rtc/rtc-tegra-odm.c index f87a5be674d3..2a90d60b06b8 100644 --- a/drivers/rtc/rtc-tegra-odm.c +++ b/drivers/rtc/rtc-tegra-odm.c @@ -72,46 +72,6 @@ static int tegra_rtc_set_time(struct device *dev, struct rtc_time *tm) } #if (PMU_IOCTL_ENABLE) -static int tegra_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) -{ - void __user *argp = (void __user *)arg; - struct rtc_wkalrm wkalrm; - NvU32 count = 0; - - switch (cmd) { - case RTC_ALM_READ: - if(NvOdmPmuReadAlarm(hPmu, &count)) - { - wkalrm.time.tm_hour = count / 3600; - wkalrm.time.tm_min = (count - (wkalrm.time.tm_hour * 3600)) / 60; - wkalrm.time.tm_sec = (count - (wkalrm.time.tm_min * 60) - (wkalrm.time.tm_hour * 3600) ); - if (copy_to_user(argp, &count, sizeof(count))) - return -EFAULT; - } - else - { - pr_debug("NvOdmPmuReadRtc failed\n"); - return -EINVAL; - } - break; - - case RTC_ALM_SET: - if (copy_from_user(&wkalrm, argp, sizeof(wkalrm))) - return -EFAULT; - count = wkalrm.time.tm_hour * 3600 + wkalrm.time.tm_min * 60 + wkalrm.time.tm_sec; - if(!NvOdmPmuWriteAlarm(hPmu, count)) - { - pr_debug("NvOdmPmuWriteRtc failed\n"); - return -EINVAL; - } - break; - default: - return -EINVAL; - } - - return 0; -} - static int tegra_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *wkalrm) { @@ -170,7 +130,6 @@ static struct rtc_class_ops tegra_rtc_ops = { .read_time = tegra_rtc_read_time, .set_time = tegra_rtc_set_time, #if (PMU_IOCTL_ENABLE) - .ioctl = tegra_rtc_ioctl, .read_alarm = tegra_rtc_read_alarm, .set_alarm = tegra_rtc_set_alarm, #endif @@ -238,7 +197,7 @@ static void tegra_rtc_shutdown(struct platform_device *pdev) { } -MODULE_ALIAS("platform:tegra_rtc"); +MODULE_ALIAS("platform:tegra_rtc_odm"); static struct platform_driver tegra_rtc_driver = { .remove = __exit_p(tegra_rtc_remove), @@ -248,7 +207,7 @@ static struct platform_driver tegra_rtc_driver = { .resume = tegra_rtc_resume, #endif .driver = { - .name = "tegra_rtc", + .name = "tegra_rtc_odm", .owner = THIS_MODULE, }, }; |