summaryrefslogtreecommitdiff
path: root/drivers/rtc
diff options
context:
space:
mode:
authorLionel.Xu <r63889@freescale.com>2009-05-08 15:54:39 +0800
committerLionel.Xu <r63889@freescale.com>2009-06-10 16:54:29 +0800
commitf111dd666c2c1575e435c3f09a1d266f0e788406 (patch)
treeb453af940610b2295a62a37d6927f12682b45fb1 /drivers/rtc
parentf3c150f4d91f11622dd98df813ac1666beb9379f (diff)
ENGR00112272 MX31/35 RTC: To make mxc_rtc independent of pmic_rtc
Relevant code in function mxc_rtc_probe to sync internal time with external time should be removed to make mxc_rtc independent of external. Moremover, getting external time will return error on mx35. Signed-off-by: Lionel Xu <r63889@freescale.com>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-mxc.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c
index d256da528f54..b6b168d8ac6b 100644
--- a/drivers/rtc/rtc-mxc.c
+++ b/drivers/rtc/rtc-mxc.c
@@ -632,11 +632,10 @@ static int mxc_rtc_probe(struct platform_device *pdev)
struct clk *clk;
struct timespec tv;
struct resource *res;
- struct rtc_time temp_time;
struct rtc_device *rtc;
struct rtc_plat_data *pdata = NULL;
- u32 sec, reg;
- int ret;
+ u32 reg;
+ int ret = 0;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res)
@@ -672,16 +671,6 @@ static int mxc_rtc_probe(struct platform_device *pdev)
}
pdata->rtc = rtc;
platform_set_drvdata(pdev, pdata);
- ret = get_ext_rtc_time(&sec);
- if (ret == MXC_EXTERNAL_RTC_OK) {
- rtc_time_to_tm(sec, &temp_time);
- mxc_rtc_set_time(&pdev->dev, &temp_time);
-
- } else if (ret == MXC_EXTERNAL_RTC_NONE) {
- pr_info("No external RTC clock\n");
- } else {
- pr_info("Reading external RTC failed\n");
- }
tv.tv_nsec = 0;
tv.tv_sec = get_alarm_or_time(&pdev->dev, MXC_RTC_TIME);
clk = clk_get(NULL, "ckil");