diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2013-11-08 15:23:50 +0530 |
|---|---|---|
| committer | Laxman Dewangan <ldewangan@nvidia.com> | 2013-11-09 02:57:30 -0800 |
| commit | 4a9e43309566c22ce9a9e609ea9fda4601515fed (patch) | |
| tree | 9e34eb5afe684d2efc8fb2df9aee8dd3fcc40d07 /drivers/rtc | |
| parent | 30cbd046231caff5d0e10366bc539c239524aead (diff) | |
rtc: as3722: remove rtc platform data for enabling clk32kout
The enable/disable clock control of ams AS3722 CLK32K output is moved
to clock driver and so it is not require from RTC driver.
Removing this duplicate of code from driver.
Change-Id: I1454a93e13b4d7d2db8e38236064948ed4d4ec3c
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/328286
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-as3722.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/drivers/rtc/rtc-as3722.c b/drivers/rtc/rtc-as3722.c index ab03a68c30d9..7f76102d2b8a 100644 --- a/drivers/rtc/rtc-as3722.c +++ b/drivers/rtc/rtc-as3722.c @@ -275,16 +275,12 @@ static int as3722_rtc_probe(struct platform_device *pdev) { struct as3722 *as3722 = dev_get_drvdata(pdev->dev.parent); struct as3722_rtc *rtc = &as3722->rtc; - struct as3722_platform_data *pdata = as3722->dev->platform_data; - struct as3722_rtc_platform_data *rtc_pdata = NULL; int alarm_irq = regmap_irq_get_virq(as3722->irq_data, AS3722_IRQ_RTC_ALARM); int ret = 0; u32 ctrl; - if (pdata) - rtc_pdata = pdata->rtc_pdata; /* enable the RTC if it's not already enabled */ as3722_reg_read(as3722, AS3722_RTC_CONTROL_REG, &ctrl); if (!(ctrl & AS3722_RTC_ON_MASK)) { @@ -299,29 +295,6 @@ static int as3722_rtc_probe(struct platform_device *pdev) } } - if (rtc_pdata && rtc_pdata->enable_clk32k) { - /* Enable CLK32OUT Pin*/ - ret = as3722_set_bits(as3722, AS3722_RTC_CONTROL_REG, - AS3722_RTC_32KCLK_MASK, - AS3722_RTC_32KCLK_MASK); - if (ret < 0) { - dev_err(&pdev->dev, - "failed to enable clk32k: %d\n", ret); - return ret; - } - } else { - /* Disable CLK32OUT Pin*/ - ret = as3722_set_bits(as3722, AS3722_RTC_CONTROL_REG, - AS3722_RTC_32KCLK_MASK, - 0); - if (ret < 0) { - dev_err(&pdev->dev, - "failed to disable clk32k: %d\n", ret); - return ret; - } - } - - /* enable alarm wakeup */ as3722_set_bits(as3722, AS3722_RTC_CONTROL_REG, AS3722_RTC_ALARM_WAKEUP_EN_MASK, @@ -338,7 +311,7 @@ static int as3722_rtc_probe(struct platform_device *pdev) } ret = request_threaded_irq(alarm_irq, NULL, as3722_alarm_irq, - pdata->irq_type, "RTC alarm", + IRQF_ONESHOT | IRQF_EARLY_RESUME, "RTC alarm", rtc->rtc); if (ret != 0) { dev_err(&pdev->dev, "Failed to request alarm IRQ %d: %d\n", |