Skip to content

L
linux
Commit 1c97872b authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Samuel Ortiz
Browse files
Options

rtc: Add support for the rtc found in the MC13892 PMIC 

The mfd driver for MC13783 recently got support for MC13892 and was
renamed accordingly from mc13783-core to mc13xxx-core.  Do the same for
rtc-mc13783.

The only relevant change is to use platform id's to tell the platform bus
that this driver is responsible for mc13892-rtc devices, too.
Acked-by: default avatarAlessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 72f2e2c7
Hide whitespace changes
Inline Side-by-side
Showing with 443 additions and 5 deletions
drivers/rtc/Kconfig
View file @ 1c97872b
...@@ -936,11 +936,12 @@ config RTC_DRV_PCAP ...@@ -936,11 +936,12 @@ config RTC_DRV_PCAP
If you say Y here you will get support for the RTC found on If you say Y here you will get support for the RTC found on
the PCAP2 ASIC used on some Motorola phones. the PCAP2 ASIC used on some Motorola phones.
config RTC_DRV_MC13783 config RTC_DRV_MC13XXX
depends on MFD_MC13783 depends on MFD_MC13XXX
tristate "Freescale MC13783 RTC" tristate "Freescale MC13xxx RTC"
help help
This enables support for the Freescale MC13783 PMIC RTC This enables support for the RTCs found on Freescale's PMICs
MC13783 and MC13892.
config RTC_DRV_MPC5121 config RTC_DRV_MPC5121
tristate "Freescale MPC5121 built-in RTC" tristate "Freescale MPC5121 built-in RTC"
......
drivers/rtc/Makefile
View file @ 1c97872b
...@@ -62,7 +62,7 @@ obj-$(CONFIG_RTC_DRV_MAX6900) += rtc-max6900.o ...@@ -62,7 +62,7 @@ obj-$(CONFIG_RTC_DRV_MAX6900) += rtc-max6900.o
obj-$(CONFIG_RTC_DRV_MAX8925) += rtc-max8925.o obj-$(CONFIG_RTC_DRV_MAX8925) += rtc-max8925.o
obj-$(CONFIG_RTC_DRV_MAX8998) += rtc-max8998.o obj-$(CONFIG_RTC_DRV_MAX8998) += rtc-max8998.o
obj-$(CONFIG_RTC_DRV_MAX6902) += rtc-max6902.o obj-$(CONFIG_RTC_DRV_MAX6902) += rtc-max6902.o
obj-$(CONFIG_RTC_DRV_MC13783) += rtc-mc13783.o obj-$(CONFIG_RTC_DRV_MC13XXX) += rtc-mc13xxx.o
obj-$(CONFIG_RTC_DRV_MSM6242) += rtc-msm6242.o obj-$(CONFIG_RTC_DRV_MSM6242) += rtc-msm6242.o
obj-$(CONFIG_RTC_DRV_MPC5121) += rtc-mpc5121.o obj-$(CONFIG_RTC_DRV_MPC5121) += rtc-mpc5121.o
obj-$(CONFIG_RTC_DRV_MV) += rtc-mv.o obj-$(CONFIG_RTC_DRV_MV) += rtc-mv.o
......
drivers/rtc/rtc-mc13783.c → drivers/rtc/rtc-mc13xxx.c
View file @ 1c97872b
/* /*
* Real Time Clock driver for Freescale MC13783 PMIC * Real Time Clock driver for Freescale MC13XXX PMIC
* *
* (C) 2009 Sascha Hauer, Pengutronix * (C) 2009 Sascha Hauer, Pengutronix
* (C) 2009 Uwe Kleine-Koenig, Pengutronix * (C) 2009 Uwe Kleine-Koenig, Pengutronix
...@@ -9,79 +9,79 @@ ...@@ -9,79 +9,79 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <linux/mfd/mc13783.h> #include <linux/mfd/mc13xxx.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#define DRIVER_NAME "mc13783-rtc" #define DRIVER_NAME "mc13xxx-rtc"
#define MC13783_RTCTOD 20 #define MC13XXX_RTCTOD 20
#define MC13783_RTCTODA 21 #define MC13XXX_RTCTODA 21
#define MC13783_RTCDAY 22 #define MC13XXX_RTCDAY 22
#define MC13783_RTCDAYA 23 #define MC13XXX_RTCDAYA 23
struct mc13783_rtc { struct mc13xxx_rtc {
struct rtc_device *rtc; struct rtc_device *rtc;
struct mc13783 *mc13783; struct mc13xxx *mc13xxx;
int valid; int valid;
}; };
static int mc13783_rtc_irq_enable_unlocked(struct device *dev, static int mc13xxx_rtc_irq_enable_unlocked(struct device *dev,
unsigned int enabled, int irq) unsigned int enabled, int irq)
{ {
struct mc13783_rtc *priv = dev_get_drvdata(dev); struct mc13xxx_rtc *priv = dev_get_drvdata(dev);
int (*func)(struct mc13783 *mc13783, int irq); int (*func)(struct mc13xxx *mc13xxx, int irq);
if (!priv->valid) if (!priv->valid)
return -ENODATA; return -ENODATA;
func = enabled ? mc13783_irq_unmask : mc13783_irq_mask; func = enabled ? mc13xxx_irq_unmask : mc13xxx_irq_mask;
return func(priv->mc13783, irq); return func(priv->mc13xxx, irq);
} }
static int mc13783_rtc_irq_enable(struct device *dev, static int mc13xxx_rtc_irq_enable(struct device *dev,
unsigned int enabled, int irq) unsigned int enabled, int irq)
{ {
struct mc13783_rtc *priv = dev_get_drvdata(dev); struct mc13xxx_rtc *priv = dev_get_drvdata(dev);
int ret; int ret;
mc13783_lock(priv->mc13783); mc13xxx_lock(priv->mc13xxx);
ret = mc13783_rtc_irq_enable_unlocked(dev, enabled, irq); ret = mc13xxx_rtc_irq_enable_unlocked(dev, enabled, irq);
mc13783_unlock(priv->mc13783); mc13xxx_unlock(priv->mc13xxx);
return ret; return ret;
} }
static int mc13783_rtc_read_time(struct device *dev, struct rtc_time *tm) static int mc13xxx_rtc_read_time(struct device *dev, struct rtc_time *tm)
{ {
struct mc13783_rtc *priv = dev_get_drvdata(dev); struct mc13xxx_rtc *priv = dev_get_drvdata(dev);
unsigned int seconds, days1, days2; unsigned int seconds, days1, days2;
unsigned long s1970; unsigned long s1970;
int ret; int ret;
mc13783_lock(priv->mc13783); mc13xxx_lock(priv->mc13xxx);
if (!priv->valid) { if (!priv->valid) {
ret = -ENODATA; ret = -ENODATA;
goto out; goto out;
} }
ret = mc13783_reg_read(priv->mc13783, MC13783_RTCDAY, &days1); ret = mc13xxx_reg_read(priv->mc13xxx, MC13XXX_RTCDAY, &days1);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
ret = mc13783_reg_read(priv->mc13783, MC13783_RTCTOD, &seconds); ret = mc13xxx_reg_read(priv->mc13xxx, MC13XXX_RTCTOD, &seconds);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
ret = mc13783_reg_read(priv->mc13783, MC13783_RTCDAY, &days2); ret = mc13xxx_reg_read(priv->mc13xxx, MC13XXX_RTCDAY, &days2);
out: out:
mc13783_unlock(priv->mc13783); mc13xxx_unlock(priv->mc13xxx);
if (ret) if (ret)
return ret; return ret;
...@@ -103,9 +103,9 @@ static int mc13783_rtc_read_time(struct device *dev, struct rtc_time *tm) ...@@ -103,9 +103,9 @@ static int mc13783_rtc_read_time(struct device *dev, struct rtc_time *tm)
return rtc_valid_tm(tm); return rtc_valid_tm(tm);
} }
static int mc13783_rtc_set_mmss(struct device *dev, unsigned long secs) static int mc13xxx_rtc_set_mmss(struct device *dev, unsigned long secs)
{ {
struct mc13783_rtc *priv = dev_get_drvdata(dev); struct mc13xxx_rtc *priv = dev_get_drvdata(dev);
unsigned int seconds, days; unsigned int seconds, days;
unsigned int alarmseconds; unsigned int alarmseconds;
int ret; int ret;
...@@ -113,19 +113,19 @@ static int mc13783_rtc_set_mmss(struct device *dev, unsigned long secs) ...@@ -113,19 +113,19 @@ static int mc13783_rtc_set_mmss(struct device *dev, unsigned long secs)
seconds = secs % 86400; seconds = secs % 86400;
days = secs / 86400; days = secs / 86400;
mc13783_lock(priv->mc13783); mc13xxx_lock(priv->mc13xxx);
/* /*
* temporarily invalidate alarm to prevent triggering it when the day is * temporarily invalidate alarm to prevent triggering it when the day is
* already updated while the time isn't yet. * already updated while the time isn't yet.
*/ */
ret = mc13783_reg_read(priv->mc13783, MC13783_RTCTODA, &alarmseconds); ret = mc13xxx_reg_read(priv->mc13xxx, MC13XXX_RTCTODA, &alarmseconds);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
if (alarmseconds < 86400) { if (alarmseconds < 86400) {
ret = mc13783_reg_write(priv->mc13783, ret = mc13xxx_reg_write(priv->mc13xxx,
MC13783_RTCTODA, 0x1ffff); MC13XXX_RTCTODA, 0x1ffff);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
} }
...@@ -134,50 +134,50 @@ static int mc13783_rtc_set_mmss(struct device *dev, unsigned long secs) ...@@ -134,50 +134,50 @@ static int mc13783_rtc_set_mmss(struct device *dev, unsigned long secs)
* write seconds=0 to prevent a day switch between writing days * write seconds=0 to prevent a day switch between writing days
* and seconds below * and seconds below
*/ */
ret = mc13783_reg_write(priv->mc13783, MC13783_RTCTOD, 0); ret = mc13xxx_reg_write(priv->mc13xxx, MC13XXX_RTCTOD, 0);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
ret = mc13783_reg_write(priv->mc13783, MC13783_RTCDAY, days); ret = mc13xxx_reg_write(priv->mc13xxx, MC13XXX_RTCDAY, days);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
ret = mc13783_reg_write(priv->mc13783, MC13783_RTCTOD, seconds); ret = mc13xxx_reg_write(priv->mc13xxx, MC13XXX_RTCTOD, seconds);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
/* restore alarm */ /* restore alarm */
if (alarmseconds < 86400) { if (alarmseconds < 86400) {
ret = mc13783_reg_write(priv->mc13783, ret = mc13xxx_reg_write(priv->mc13xxx,
MC13783_RTCTODA, alarmseconds); MC13XXX_RTCTODA, alarmseconds);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
} }
ret = mc13783_irq_ack(priv->mc13783, MC13783_IRQ_RTCRST); ret = mc13xxx_irq_ack(priv->mc13xxx, MC13XXX_IRQ_RTCRST);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
ret = mc13783_irq_unmask(priv->mc13783, MC13783_IRQ_RTCRST); ret = mc13xxx_irq_unmask(priv->mc13xxx, MC13XXX_IRQ_RTCRST);
out: out:
priv->valid = !ret; priv->valid = !ret;
mc13783_unlock(priv->mc13783); mc13xxx_unlock(priv->mc13xxx);
return ret; return ret;
} }
static int mc13783_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) static int mc13xxx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
{ {
struct mc13783_rtc *priv = dev_get_drvdata(dev); struct mc13xxx_rtc *priv = dev_get_drvdata(dev);
unsigned seconds, days; unsigned seconds, days;
unsigned long s1970; unsigned long s1970;
int enabled, pending; int enabled, pending;
int ret; int ret;
mc13783_lock(priv->mc13783); mc13xxx_lock(priv->mc13xxx);
ret = mc13783_reg_read(priv->mc13783, MC13783_RTCTODA, &seconds); ret = mc13xxx_reg_read(priv->mc13xxx, MC13XXX_RTCTODA, &seconds);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
if (seconds >= 86400) { if (seconds >= 86400) {
...@@ -185,15 +185,15 @@ static int mc13783_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) ...@@ -185,15 +185,15 @@ static int mc13783_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
goto out; goto out;
} }
ret = mc13783_reg_read(priv->mc13783, MC13783_RTCDAY, &days); ret = mc13xxx_reg_read(priv->mc13xxx, MC13XXX_RTCDAY, &days);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
ret = mc13783_irq_status(priv->mc13783, MC13783_IRQ_TODA, ret = mc13xxx_irq_status(priv->mc13xxx, MC13XXX_IRQ_TODA,
&enabled, &pending); &enabled, &pending);
out: out:
mc13783_unlock(priv->mc13783); mc13xxx_unlock(priv->mc13xxx);
if (ret) if (ret)
return ret; return ret;
...@@ -209,21 +209,21 @@ static int mc13783_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) ...@@ -209,21 +209,21 @@ static int mc13783_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
return 0; return 0;
} }
static int mc13783_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) static int mc13xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
{ {
struct mc13783_rtc *priv = dev_get_drvdata(dev); struct mc13xxx_rtc *priv = dev_get_drvdata(dev);
unsigned long s1970; unsigned long s1970;
unsigned seconds, days; unsigned seconds, days;
int ret; int ret;
mc13783_lock(priv->mc13783); mc13xxx_lock(priv->mc13xxx);
/* disable alarm to prevent false triggering */ /* disable alarm to prevent false triggering */
ret = mc13783_reg_write(priv->mc13783, MC13783_RTCTODA, 0x1ffff); ret = mc13xxx_reg_write(priv->mc13xxx, MC13XXX_RTCTODA, 0x1ffff);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
ret = mc13783_irq_ack(priv->mc13783, MC13783_IRQ_TODA); ret = mc13xxx_irq_ack(priv->mc13xxx, MC13XXX_IRQ_TODA);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
...@@ -234,166 +234,166 @@ static int mc13783_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) ...@@ -234,166 +234,166 @@ static int mc13783_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
dev_dbg(dev, "%s: o%2.s %lu\n", __func__, alarm->enabled ? "n" : "ff", dev_dbg(dev, "%s: o%2.s %lu\n", __func__, alarm->enabled ? "n" : "ff",
s1970); s1970);
ret = mc13783_rtc_irq_enable_unlocked(dev, alarm->enabled, ret = mc13xxx_rtc_irq_enable_unlocked(dev, alarm->enabled,
MC13783_IRQ_TODA); MC13XXX_IRQ_TODA);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
seconds = s1970 % 86400; seconds = s1970 % 86400;
days = s1970 / 86400; days = s1970 / 86400;
ret = mc13783_reg_write(priv->mc13783, MC13783_RTCDAYA, days); ret = mc13xxx_reg_write(priv->mc13xxx, MC13XXX_RTCDAYA, days);
if (unlikely(ret)) if (unlikely(ret))
goto out; goto out;
ret = mc13783_reg_write(priv->mc13783, MC13783_RTCTODA, seconds); ret = mc13xxx_reg_write(priv->mc13xxx, MC13XXX_RTCTODA, seconds);
out: out:
mc13783_unlock(priv->mc13783); mc13xxx_unlock(priv->mc13xxx);
return ret; return ret;
} }
static irqreturn_t mc13783_rtc_alarm_handler(int irq, void *dev) static irqreturn_t mc13xxx_rtc_alarm_handler(int irq, void *dev)
{ {
struct mc13783_rtc *priv = dev; struct mc13xxx_rtc *priv = dev;
struct mc13783 *mc13783 = priv->mc13783; struct mc13xxx *mc13xxx = priv->mc13xxx;
dev_dbg(&priv->rtc->dev, "Alarm\n"); dev_dbg(&priv->rtc->dev, "Alarm\n");
rtc_update_irq(priv->rtc, 1, RTC_IRQF | RTC_AF); rtc_update_irq(priv->rtc, 1, RTC_IRQF | RTC_AF);
mc13783_irq_ack(mc13783, irq); mc13xxx_irq_ack(mc13xxx, irq);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static irqreturn_t mc13783_rtc_update_handler(int irq, void *dev) static irqreturn_t mc13xxx_rtc_update_handler(int irq, void *dev)
{ {
struct mc13783_rtc *priv = dev; struct mc13xxx_rtc *priv = dev;
struct mc13783 *mc13783 = priv->mc13783; struct mc13xxx *mc13xxx = priv->mc13xxx;
dev_dbg(&priv->rtc->dev, "1HZ\n"); dev_dbg(&priv->rtc->dev, "1HZ\n");
rtc_update_irq(priv->rtc, 1, RTC_IRQF | RTC_UF); rtc_update_irq(priv->rtc, 1, RTC_IRQF | RTC_UF);
mc13783_irq_ack(mc13783, irq); mc13xxx_irq_ack(mc13xxx, irq);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int mc13783_rtc_update_irq_enable(struct device *dev, static int mc13xxx_rtc_update_irq_enable(struct device *dev,
unsigned int enabled) unsigned int enabled)
{ {
return mc13783_rtc_irq_enable(dev, enabled, MC13783_IRQ_1HZ); return mc13xxx_rtc_irq_enable(dev, enabled, MC13XXX_IRQ_1HZ);
} }
static int mc13783_rtc_alarm_irq_enable(struct device *dev, static int mc13xxx_rtc_alarm_irq_enable(struct device *dev,
unsigned int enabled) unsigned int enabled)
{ {
return mc13783_rtc_irq_enable(dev, enabled, MC13783_IRQ_TODA); return mc13xxx_rtc_irq_enable(dev, enabled, MC13XXX_IRQ_TODA);
} }
static const struct rtc_class_ops mc13783_rtc_ops = { static const struct rtc_class_ops mc13xxx_rtc_ops = {
.read_time = mc13783_rtc_read_time, .read_time = mc13xxx_rtc_read_time,
.set_mmss = mc13783_rtc_set_mmss, .set_mmss = mc13xxx_rtc_set_mmss,
.read_alarm = mc13783_rtc_read_alarm, .read_alarm = mc13xxx_rtc_read_alarm,
.set_alarm = mc13783_rtc_set_alarm, .set_alarm = mc13xxx_rtc_set_alarm,
.alarm_irq_enable = mc13783_rtc_alarm_irq_enable, .alarm_irq_enable = mc13xxx_rtc_alarm_irq_enable,
.update_irq_enable = mc13783_rtc_update_irq_enable, .update_irq_enable = mc13xxx_rtc_update_irq_enable,
}; };
static irqreturn_t mc13783_rtc_reset_handler(int irq, void *dev) static irqreturn_t mc13xxx_rtc_reset_handler(int irq, void *dev)
{ {
struct mc13783_rtc *priv = dev; struct mc13xxx_rtc *priv = dev;
struct mc13783 *mc13783 = priv->mc13783; struct mc13xxx *mc13xxx = priv->mc13xxx;
dev_dbg(&priv->rtc->dev, "RTCRST\n"); dev_dbg(&priv->rtc->dev, "RTCRST\n");
priv->valid = 0; priv->valid = 0;
mc13783_irq_mask(mc13783, irq); mc13xxx_irq_mask(mc13xxx, irq);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit mc13783_rtc_probe(struct platform_device *pdev) static int __devinit mc13xxx_rtc_probe(struct platform_device *pdev)
{ {
int ret; int ret;
struct mc13783_rtc *priv; struct mc13xxx_rtc *priv;
struct mc13783 *mc13783; struct mc13xxx *mc13xxx;
int rtcrst_pending; int rtcrst_pending;
priv = kzalloc(sizeof(*priv), GFP_KERNEL); priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
mc13783 = dev_get_drvdata(pdev->dev.parent); mc13xxx = dev_get_drvdata(pdev->dev.parent);
priv->mc13783 = mc13783; priv->mc13xxx = mc13xxx;
platform_set_drvdata(pdev, priv); platform_set_drvdata(pdev, priv);
mc13783_lock(mc13783); mc13xxx_lock(mc13xxx);
ret = mc13783_irq_request(mc13783, MC13783_IRQ_RTCRST, ret = mc13xxx_irq_request(mc13xxx, MC13XXX_IRQ_RTCRST,
mc13783_rtc_reset_handler, DRIVER_NAME, priv); mc13xxx_rtc_reset_handler, DRIVER_NAME, priv);
if (ret) if (ret)
goto err_reset_irq_request; goto err_reset_irq_request;
ret = mc13783_irq_status(mc13783, MC13783_IRQ_RTCRST, ret = mc13xxx_irq_status(mc13xxx, MC13XXX_IRQ_RTCRST,
NULL, &rtcrst_pending); NULL, &rtcrst_pending);
if (ret) if (ret)
goto err_reset_irq_status; goto err_reset_irq_status;
priv->valid = !rtcrst_pending; priv->valid = !rtcrst_pending;
ret = mc13783_irq_request_nounmask(mc13783, MC13783_IRQ_1HZ, ret = mc13xxx_irq_request_nounmask(mc13xxx, MC13XXX_IRQ_1HZ,
mc13783_rtc_update_handler, DRIVER_NAME, priv); mc13xxx_rtc_update_handler, DRIVER_NAME, priv);
if (ret) if (ret)
goto err_update_irq_request; goto err_update_irq_request;
ret = mc13783_irq_request_nounmask(mc13783, MC13783_IRQ_TODA, ret = mc13xxx_irq_request_nounmask(mc13xxx, MC13XXX_IRQ_TODA,
mc13783_rtc_alarm_handler, DRIVER_NAME, priv); mc13xxx_rtc_alarm_handler, DRIVER_NAME, priv);
if (ret) if (ret)
goto err_alarm_irq_request; goto err_alarm_irq_request;
priv->rtc = rtc_device_register(pdev->name, priv->rtc = rtc_device_register(pdev->name,
&pdev->dev, &mc13783_rtc_ops, THIS_MODULE); &pdev->dev, &mc13xxx_rtc_ops, THIS_MODULE);
if (IS_ERR(priv->rtc)) { if (IS_ERR(priv->rtc)) {
ret = PTR_ERR(priv->rtc); ret = PTR_ERR(priv->rtc);
mc13783_irq_free(mc13783, MC13783_IRQ_TODA, priv); mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_TODA, priv);
err_alarm_irq_request: err_alarm_irq_request:
mc13783_irq_free(mc13783, MC13783_IRQ_1HZ, priv); mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_1HZ, priv);
err_update_irq_request: err_update_irq_request:
err_reset_irq_status: err_reset_irq_status:
mc13783_irq_free(mc13783, MC13783_IRQ_RTCRST, priv); mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_RTCRST, priv);
err_reset_irq_request: err_reset_irq_request:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
kfree(priv); kfree(priv);
} }
mc13783_unlock(mc13783); mc13xxx_unlock(mc13xxx);
return ret; return ret;
} }
static int __devexit mc13783_rtc_remove(struct platform_device *pdev) static int __devexit mc13xxx_rtc_remove(struct platform_device *pdev)
{ {
struct mc13783_rtc *priv = platform_get_drvdata(pdev); struct mc13xxx_rtc *priv = platform_get_drvdata(pdev);
mc13783_lock(priv->mc13783); mc13xxx_lock(priv->mc13xxx);
rtc_device_unregister(priv->rtc); rtc_device_unregister(priv->rtc);
mc13783_irq_free(priv->mc13783, MC13783_IRQ_TODA, priv); mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TODA, priv);
mc13783_irq_free(priv->mc13783, MC13783_IRQ_1HZ, priv); mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_1HZ, priv);
mc13783_irq_free(priv->mc13783, MC13783_IRQ_RTCRST, priv); mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_RTCRST, priv);
mc13783_unlock(priv->mc13783); mc13xxx_unlock(priv->mc13xxx);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
...@@ -402,27 +402,36 @@ static int __devexit mc13783_rtc_remove(struct platform_device *pdev) ...@@ -402,27 +402,36 @@ static int __devexit mc13783_rtc_remove(struct platform_device *pdev)
return 0; return 0;
} }
static struct platform_driver mc13783_rtc_driver = { const struct platform_device_id mc13xxx_rtc_idtable[] = {
.remove = __devexit_p(mc13783_rtc_remove), {
.name = "mc13783-rtc",
}, {
.name = "mc13892-rtc",
},
};
static struct platform_driver mc13xxx_rtc_driver = {
.id_table = mc13xxx_rtc_idtable,
.remove = __devexit_p(mc13xxx_rtc_remove),
.driver = { .driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
}; };
static int __init mc13783_rtc_init(void) static int __init mc13xxx_rtc_init(void)
{ {
return platform_driver_probe(&mc13783_rtc_driver, &mc13783_rtc_probe); return platform_driver_probe(&mc13xxx_rtc_driver, &mc13xxx_rtc_probe);
} }
module_init(mc13783_rtc_init); module_init(mc13xxx_rtc_init);
static void __exit mc13783_rtc_exit(void) static void __exit mc13xxx_rtc_exit(void)
{ {
platform_driver_unregister(&mc13783_rtc_driver); platform_driver_unregister(&mc13xxx_rtc_driver);
} }
module_exit(mc13783_rtc_exit); module_exit(mc13xxx_rtc_exit);
MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>");
MODULE_DESCRIPTION("RTC driver for Freescale MC13783 PMIC"); MODULE_DESCRIPTION("RTC driver for Freescale MC13XXX PMIC");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_ALIAS("platform:" DRIVER_NAME); MODULE_ALIAS("platform:" DRIVER_NAME);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7