/*
- * drivers/rtc/rtc-twl4030.c
- *
- * TWL4030 Real Time Clock interface
- *
+ * rtc-twl4030.c -- TWL4030 Real Time Clock interface
+ *
* Copyright (C) 2007 MontaVista Software, Inc
* Author: Alexandre Rusev <source@mvista.com>
*
* Based on original TI driver twl4030-rtc.c
* Copyright (C) 2006 Texas Instruments, Inc.
- *
+ *
* Based on rtc-omap.c
* Copyright (C) 2003 MontaVista Software, Inc.
* Author: George G. Davis <gdavis@mvista.com> or <source@mvista.com>
- *
* Copyright (C) 2006 David Brownell
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
- *
*/
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
#include <linux/types.h>
#include <linux/rtc.h>
#include <linux/bcd.h>
#include <linux/platform_device.h>
-#include <linux/spinlock.h>
#include <linux/interrupt.h>
-#include <linux/device.h>
-#include <asm/io.h>
-#include <asm/mach/time.h>
-#include <asm/system.h>
-#include <asm/hardware.h>
-#include <asm/irq.h>
-#include <asm/arch/twl4030.h>
-#include <asm/arch/twl4030-rtc.h>
+#include <linux/i2c/twl4030.h>
-#define ALL_TIME_REGS 6
/*
- * If this driver ever becomes modularised, it will be really nice
- * to make the epoch retain its value across module reload...
+ * RTC block register offsets (use TWL_MODULE_RTC)
*/
-static int epoch = 1900; /* year corresponding to 0x00 */
+#define REG_SECONDS_REG 0x00
+#define REG_MINUTES_REG 0x01
+#define REG_HOURS_REG 0x02
+#define REG_DAYS_REG 0x03
+#define REG_MONTHS_REG 0x04
+#define REG_YEARS_REG 0x05
+#define REG_WEEKS_REG 0x06
+
+#define REG_ALARM_SECONDS_REG 0x07
+#define REG_ALARM_MINUTES_REG 0x08
+#define REG_ALARM_HOURS_REG 0x09
+#define REG_ALARM_DAYS_REG 0x0A
+#define REG_ALARM_MONTHS_REG 0x0B
+#define REG_ALARM_YEARS_REG 0x0C
+
+#define REG_RTC_CTRL_REG 0x0D
+#define REG_RTC_STATUS_REG 0x0E
+#define REG_RTC_INTERRUPTS_REG 0x0F
+
+#define REG_RTC_COMP_LSB_REG 0x10
+#define REG_RTC_COMP_MSB_REG 0x11
+
+/* RTC_CTRL_REG bitfields */
+#define BIT_RTC_CTRL_REG_STOP_RTC_M 0x01
+#define BIT_RTC_CTRL_REG_ROUND_30S_M 0x02
+#define BIT_RTC_CTRL_REG_AUTO_COMP_M 0x04
+#define BIT_RTC_CTRL_REG_MODE_12_24_M 0x08
+#define BIT_RTC_CTRL_REG_TEST_MODE_M 0x10
+#define BIT_RTC_CTRL_REG_SET_32_COUNTER_M 0x20
+#define BIT_RTC_CTRL_REG_GET_TIME_M 0x40
+
+/* RTC_STATUS_REG bitfields */
+#define BIT_RTC_STATUS_REG_RUN_M 0x02
+#define BIT_RTC_STATUS_REG_1S_EVENT_M 0x04
+#define BIT_RTC_STATUS_REG_1M_EVENT_M 0x08
+#define BIT_RTC_STATUS_REG_1H_EVENT_M 0x10
+#define BIT_RTC_STATUS_REG_1D_EVENT_M 0x20
+#define BIT_RTC_STATUS_REG_ALARM_M 0x40
+#define BIT_RTC_STATUS_REG_POWER_UP_M 0x80
+
+/* RTC_INTERRUPTS_REG bitfields */
+#define BIT_RTC_INTERRUPTS_REG_EVERY_M 0x03
+#define BIT_RTC_INTERRUPTS_REG_IT_TIMER_M 0x04
+#define BIT_RTC_INTERRUPTS_REG_IT_ALARM_M 0x08
+
+
+/* REG_SECONDS_REG through REG_YEARS_REG is how many registers? */
+#define ALL_TIME_REGS 6
-/*
- * Supports 1 byte read from TWL4030 RTC register.
+/*----------------------------------------------------------------------*/
+
+/*
+ * Supports 1 byte read from TWL4030 RTC register.
*/
-static int twl4030_rtc_read_u8(u8 * data, u8 reg)
+static int twl4030_rtc_read_u8(u8 *data, u8 reg)
{
int ret;
ret = twl4030_i2c_read_u8(TWL4030_MODULE_RTC, data, reg);
- if (ret < 0) {
- printk(KERN_WARNING "twl4030_rtc: Could not read TWL4030"
- "register %X - returned %d[%x]\n", reg, ret, ret);
- }
+ if (ret < 0)
+ pr_err("twl4030_rtc: Could not read TWL4030"
+ "register %X - error %d\n", reg, ret);
return ret;
}
-/*
+/*
* Supports 1 byte write to TWL4030 RTC registers.
*/
static int twl4030_rtc_write_u8(u8 data, u8 reg)
int ret;
ret = twl4030_i2c_write_u8(TWL4030_MODULE_RTC, data, reg);
- if (ret < 0) {
- printk(KERN_WARNING "twl4030_rtc: Could not write TWL4030"
- "register %X - returned %d[%x]\n", reg, ret, ret);
- }
+ if (ret < 0)
+ pr_err("twl4030_rtc: Could not write TWL4030"
+ "register %X - error %d\n", reg, ret);
return ret;
}
-/*
- * Enables timer or alarm interrupts.
+/*
+ * Cache the value for timer/alarm interrupts register; this is
+ * only changed by callers holding rtc ops lock (or resume).
+ */
+static unsigned char rtc_irq_bits;
+
+/*
+ * Enable timer and/or alarm interrupts.
*/
static int set_rtc_irq_bit(unsigned char bit)
{
unsigned char val;
int ret;
- ret = twl4030_rtc_read_u8(&val, REG_RTC_INTERRUPTS_REG);
- if (ret < 0)
- goto set_irq_out;
-
- val |= bit;
+ val = rtc_irq_bits | bit;
ret = twl4030_rtc_write_u8(val, REG_RTC_INTERRUPTS_REG);
+ if (ret == 0)
+ rtc_irq_bits = val;
-set_irq_out:
return ret;
}
-#ifdef CONFIG_PM
-/*
- * Read timer or alarm interrupts register.
- */
-static int get_rtc_irq_bit(unsigned char *val)
-{
- int ret;
-
- ret = twl4030_rtc_read_u8(val, REG_RTC_INTERRUPTS_REG);
- return ret;
-}
-#endif
-/*
- * Disables timer or alarm interrupts.
+/*
+ * Disable timer and/or alarm interrupts.
*/
static int mask_rtc_irq_bit(unsigned char bit)
{
unsigned char val;
int ret;
- ret = twl4030_rtc_read_u8(&val, REG_RTC_INTERRUPTS_REG);
- if (ret < 0)
- goto mask_irq_out;
-
- val &= ~bit;
+ val = rtc_irq_bits & ~bit;
ret = twl4030_rtc_write_u8(val, REG_RTC_INTERRUPTS_REG);
+ if (ret == 0)
+ rtc_irq_bits = val;
-mask_irq_out:
return ret;
}
-static int twl4030_rtc_alarm_irq_set_state(struct device *dev, int enabled)
+static inline int twl4030_rtc_alarm_irq_set_state(int enabled)
{
int ret;
- /* Allow ints for RTC ALARM updates. */
- if (enabled)
+ if (enabled)
ret = set_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
- else
+ else
ret = mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
return ret;
}
-/*
+static inline int twl4030_rtc_irq_set_state(int enabled)
+{
+ int ret;
+
+ if (enabled)
+ ret = set_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M);
+ else
+ ret = mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M);
+
+ return ret;
+}
+
+/*
* Gets current TWL4030 RTC time and date parameters.
+ *
+ * The RTC's time/alarm representation is not what gmtime(3) requires
+ * Linux to use:
+ *
+ * - Months are 1..12 vs Linux 0-11
+ * - Years are 0..99 vs Linux 1900..N (we assume 21st century)
*/
-static int get_rtc_time(struct rtc_time *rtc_tm)
+static int twl4030_rtc_read_time(struct device *dev, struct rtc_time *tm)
{
unsigned char rtc_data[ALL_TIME_REGS + 1];
int ret;
ret = twl4030_rtc_read_u8(&save_control, REG_RTC_CTRL_REG);
if (ret < 0)
- return ret;
+ return ret;
save_control |= BIT_RTC_CTRL_REG_GET_TIME_M;
REG_SECONDS_REG, ALL_TIME_REGS);
if (ret < 0) {
- printk(KERN_ERR "twl4030_rtc: twl4030_i2c_read error.\n");
+ dev_err(dev, "rtc_read_time error %d\n", ret);
return ret;
}
- rtc_tm->tm_sec = BCD2BIN(rtc_data[0]);
- rtc_tm->tm_min = BCD2BIN(rtc_data[1]);
- rtc_tm->tm_hour = BCD2BIN(rtc_data[2]);
- rtc_tm->tm_mday = BCD2BIN(rtc_data[3]);
- rtc_tm->tm_mon = BCD2BIN(rtc_data[4]);
- rtc_tm->tm_year = BCD2BIN(rtc_data[5]);
-
- /*
- * Account for differences between how the RTC uses the values
- * and how they are defined in a struct rtc_time;
- */
- if ((rtc_tm->tm_year += (epoch - 1900)) <= 69)
- rtc_tm->tm_year += 100;
-
- rtc_tm->tm_mon--;
+ tm->tm_sec = bcd2bin(rtc_data[0]);
+ tm->tm_min = bcd2bin(rtc_data[1]);
+ tm->tm_hour = bcd2bin(rtc_data[2]);
+ tm->tm_mday = bcd2bin(rtc_data[3]);
+ tm->tm_mon = bcd2bin(rtc_data[4]) - 1;
+ tm->tm_year = bcd2bin(rtc_data[5]) + 100;
return ret;
}
unsigned char rtc_data[ALL_TIME_REGS + 1];
int ret;
- /* Month range is 01..12 */
- tm->tm_mon++;
-
- rtc_data[1] = BIN2BCD(tm->tm_sec);
- rtc_data[2] = BIN2BCD(tm->tm_min);
- rtc_data[3] = BIN2BCD(tm->tm_hour);
- rtc_data[4] = BIN2BCD(tm->tm_mday);
- rtc_data[5] = BIN2BCD(tm->tm_mon);
- rtc_data[6] = BIN2BCD(tm->tm_year);
+ rtc_data[1] = bin2bcd(tm->tm_sec);
+ rtc_data[2] = bin2bcd(tm->tm_min);
+ rtc_data[3] = bin2bcd(tm->tm_hour);
+ rtc_data[4] = bin2bcd(tm->tm_mday);
+ rtc_data[5] = bin2bcd(tm->tm_mon + 1);
+ rtc_data[6] = bin2bcd(tm->tm_year - 100);
/* Stop RTC while updating the TC registers */
ret = twl4030_rtc_read_u8(&save_control, REG_RTC_CTRL_REG);
if (ret < 0)
goto out;
- /* update all the alarm registers in one shot */
+ /* update all the time registers in one shot */
ret = twl4030_i2c_write(TWL4030_MODULE_RTC, rtc_data,
- REG_SECONDS_REG, ALL_TIME_REGS);
+ REG_SECONDS_REG, ALL_TIME_REGS);
if (ret < 0) {
- printk(KERN_ERR "twl4030: twl4030_i2c_write error.\n");
+ dev_err(dev, "rtc_set_time error %d\n", ret);
goto out;
}
return ret;
}
-/*
+/*
* Gets current TWL4030 RTC alarm time.
*/
-static int get_rtc_alm_time(struct rtc_time *alm_tm)
+static int twl4030_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
{
unsigned char rtc_data[ALL_TIME_REGS + 1];
int ret;
ret = twl4030_i2c_read(TWL4030_MODULE_RTC, rtc_data,
REG_ALARM_SECONDS_REG, ALL_TIME_REGS);
if (ret < 0) {
- printk(KERN_ERR "twl4030_rtc: twl4030_i2c_read error.\n");
+ dev_err(dev, "rtc_read_alarm error %d\n", ret);
return ret;
}
- alm_tm->tm_sec = BCD2BIN(rtc_data[0]);
- alm_tm->tm_min = BCD2BIN(rtc_data[1]);
- alm_tm->tm_hour = BCD2BIN(rtc_data[2]);
- alm_tm->tm_mday = BCD2BIN(rtc_data[3]);
- alm_tm->tm_mon = BCD2BIN(rtc_data[4]);
- alm_tm->tm_year = BCD2BIN(rtc_data[5]);
-
- /*
- * Account for differences between how the RTC uses the values
- * and how they are defined in a struct rtc_time;
- */
- if ((alm_tm->tm_year += (epoch - 1900)) <= 69)
- alm_tm->tm_year += 100;
-
- alm_tm->tm_mon--;
-
- return ret;
-}
-
-static int twl4030_rtc_read_time(struct device *dev, struct rtc_time *tm)
-{
- int ret;
-
- memset(tm, 0, sizeof(struct rtc_time));
- ret = get_rtc_time(tm);
-
- return ret;
-}
-
-/*
- * Gets current TWL4030 RTC alarm time.
- */
-static int twl4030_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
-{
- int ret;
- u8 rtc_interrupts_reg = 0;
-
- /*
- * This returns a struct rtc_time. Reading >= 0xc0
- * means "don't care" or "match all". Only the tm_hour,
- * tm_min, and tm_sec values are filled in.
- */
- memset(&alm->time, 0, sizeof(struct rtc_time));
- ret = get_rtc_alm_time(&alm->time);
-
- if (ret)
- goto out;
-
- /* Check alarm enabled flag state */
- ret =
- ret | twl4030_i2c_read_u8(TWL4030_MODULE_RTC, &rtc_interrupts_reg,
- REG_RTC_INTERRUPTS_REG);
+ /* some of these fields may be wildcard/"match all" */
+ alm->time.tm_sec = bcd2bin(rtc_data[0]);
+ alm->time.tm_min = bcd2bin(rtc_data[1]);
+ alm->time.tm_hour = bcd2bin(rtc_data[2]);
+ alm->time.tm_mday = bcd2bin(rtc_data[3]);
+ alm->time.tm_mon = bcd2bin(rtc_data[4]) - 1;
+ alm->time.tm_year = bcd2bin(rtc_data[5]) + 100;
- if (ret)
- goto out;
-
- if ((rtc_interrupts_reg & BIT_RTC_INTERRUPTS_REG_IT_ALARM_M) != 0)
+ /* report cached alarm enable state */
+ if (rtc_irq_bits & BIT_RTC_INTERRUPTS_REG_IT_ALARM_M)
alm->enabled = 1;
- else
- alm->enabled = 0;
-
-out:
- return ret;
-}
-static int twl4030_rtc_irq_set_state(struct device *dev, int enabled)
-{
- int ret;
-
- /* Allow ints for RTC updates. */
- if (enabled)
- ret = set_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M);
- else
- ret = mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M);
-
return ret;
}
unsigned char alarm_data[ALL_TIME_REGS + 1];
int ret;
- /* Month range is 01..12 */
- alm->time.tm_mon++;
+ ret = twl4030_rtc_alarm_irq_set_state(0);
+ if (ret)
+ goto out;
- alarm_data[1] = BIN2BCD(alm->time.tm_sec);
- alarm_data[2] = BIN2BCD(alm->time.tm_min);
- alarm_data[3] = BIN2BCD(alm->time.tm_hour);
- alarm_data[4] = BIN2BCD(alm->time.tm_mday);
- alarm_data[5] = BIN2BCD(alm->time.tm_mon);
- alarm_data[6] = BIN2BCD(alm->time.tm_year);
+ alarm_data[1] = bin2bcd(alm->time.tm_sec);
+ alarm_data[2] = bin2bcd(alm->time.tm_min);
+ alarm_data[3] = bin2bcd(alm->time.tm_hour);
+ alarm_data[4] = bin2bcd(alm->time.tm_mday);
+ alarm_data[5] = bin2bcd(alm->time.tm_mon + 1);
+ alarm_data[6] = bin2bcd(alm->time.tm_year - 100);
/* update all the alarm registers in one shot */
ret = twl4030_i2c_write(TWL4030_MODULE_RTC, alarm_data,
- REG_ALARM_SECONDS_REG, ALL_TIME_REGS);
+ REG_ALARM_SECONDS_REG, ALL_TIME_REGS);
if (ret) {
- printk(KERN_ERR "twl4030: twl4030_i2c_write error.\n");
+ dev_err(dev, "rtc_set_alarm error %d\n", ret);
goto out;
}
- ret = twl4030_rtc_alarm_irq_set_state(dev, alm->enabled);
+ if (alm->enabled)
+ ret = twl4030_rtc_alarm_irq_set_state(1);
out:
return ret;
}
static int twl4030_rtc_ioctl(struct device *dev, unsigned int cmd,
unsigned long arg)
{
-
switch (cmd) {
case RTC_AIE_OFF:
- return twl4030_rtc_alarm_irq_set_state(dev, 0);
+ return twl4030_rtc_alarm_irq_set_state(0);
case RTC_AIE_ON:
- return twl4030_rtc_alarm_irq_set_state(dev, 1);
+ return twl4030_rtc_alarm_irq_set_state(1);
case RTC_UIE_OFF:
- /* Mask ints from RTC updates. */
- return twl4030_rtc_irq_set_state(dev, 0);
+ return twl4030_rtc_irq_set_state(0);
case RTC_UIE_ON:
- /* Allow ints for RTC updates. */
- return twl4030_rtc_irq_set_state(dev, 1);
- case RTC_EPOCH_READ:
- return put_user(epoch, (unsigned long *)arg);
- case RTC_EPOCH_SET:
- /*
- * There were no RTC clocks before 1900.
- */
- if (arg < 1900)
- return -EINVAL;
-
- if (!capable(CAP_SYS_TIME))
- return -EACCES;
-
- epoch = arg;
- return 0;
+ return twl4030_rtc_irq_set_state(1);
+
default:
return -ENOIOCTLCMD;
}
int ret = IRQ_NONE;
int res;
u8 rd_reg;
-
- /* clear the RTC interrupt in TWL4030 power module */
- res = twl4030_i2c_read_u8(TWL4030_MODULE_INT, &rd_reg, REG_PWR_ISR1);
- if (res)
- goto out;
-
- /* Check if interrupt is sourced by RTC */
- if (!(rd_reg & PWR_RTC_INT_CLR))
- goto out;
-
- rd_reg |= PWR_RTC_INT_CLR;
- res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, rd_reg, REG_PWR_ISR1);
- if (res)
- goto out;
res = twl4030_rtc_read_u8(&rd_reg, REG_RTC_STATUS_REG);
if (res)
REG_RTC_STATUS_REG);
if (res)
goto out;
- /*
- * Workaround for strange behaviour with T2. Need to write into ISR
- * register one more time to clear the interrupt. Otherwise, the same
- * RTC event generates 2 interrupts in a row.
- * (no errata document available)
- */
- res = twl4030_i2c_read_u8(TWL4030_MODULE_INT, &rd_reg, REG_PWR_ISR1);
- if (res)
- goto out;
- rd_reg |= PWR_RTC_INT_CLR;
- res = twl4030_i2c_write_u8(TWL4030_MODULE_INT, rd_reg, REG_PWR_ISR1);
+ /* Clear on Read enabled. RTC_IT bit of TWL4030_INT_PWR_ISR1
+ * needs 2 reads to clear the interrupt. One read is done in
+ * do_twl4030_pwrirq(). Doing the second read, to clear
+ * the bit.
+ *
+ * FIXME the reason PWR_ISR1 needs an extra read is that
+ * RTC_IF retriggered until we cleared REG_ALARM_M above.
+ * But re-reading like this is a bad hack; by doing so we
+ * risk wrongly clearing status for some other IRQ (losing
+ * the interrupt). Be smarter about handling RTC_UF ...
+ */
+ res = twl4030_i2c_read_u8(TWL4030_MODULE_INT,
+ &rd_reg, TWL4030_INT_PWR_ISR1);
if (res)
goto out;
}
static struct rtc_class_ops twl4030_rtc_ops = {
- .ioctl = twl4030_rtc_ioctl,
- .read_time = twl4030_rtc_read_time,
- .set_time = twl4030_rtc_set_time,
- .read_alarm = twl4030_rtc_read_alarm,
- .set_alarm = twl4030_rtc_set_alarm,
+ .ioctl = twl4030_rtc_ioctl,
+ .read_time = twl4030_rtc_read_time,
+ .set_time = twl4030_rtc_set_time,
+ .read_alarm = twl4030_rtc_read_alarm,
+ .set_alarm = twl4030_rtc_set_alarm,
};
+/*----------------------------------------------------------------------*/
+
static int __devinit twl4030_rtc_probe(struct platform_device *pdev)
{
- struct twl4030rtc_platform_data *pdata = pdev->dev.platform_data;
struct rtc_device *rtc;
int ret = 0;
+ int irq = platform_get_irq(pdev, 0);
u8 rd_reg;
-
- if (pdata != NULL && pdata->init != NULL) {
- ret = pdata->init();
- if (ret < 0)
- goto out;
- }
+
+ if (irq < 0)
+ return irq;
rtc = rtc_device_register(pdev->name,
&pdev->dev, &twl4030_rtc_ops, THIS_MODULE);
if (ret < 0)
goto out1;
- ret = request_irq(TWL4030_MODIRQ_PWR, twl4030_rtc_interrupt,
- IRQF_DISABLED | IRQF_SHARED, rtc->dev.bus_id, rtc);
+ ret = request_irq(irq, twl4030_rtc_interrupt,
+ 0, rtc->dev.bus_id, rtc);
if (ret < 0) {
dev_err(&pdev->dev, "IRQ is not free.\n");
goto out1;
- }
+ }
/* Check RTC module status, Enable if it is off */
ret = twl4030_rtc_read_u8(&rd_reg, REG_RTC_CTRL_REG);
goto out2;
}
- ret = twl4030_i2c_read_u8(TWL4030_MODULE_INT, &rd_reg, REG_PWR_IMR1);
- if (ret < 0)
- goto out2;
+ /* FIXME stop touching MODULE_INT registers; there's already
+ * driver code responsible for them.
+ */
- rd_reg &= PWR_RTC_IT_UNMASK;
- /* MASK PWR - we will need this */
- ret = twl4030_i2c_write_u8(TWL4030_MODULE_INT, rd_reg, REG_PWR_IMR1);
+ /* use rising edge detection for RTC alarm */
+ ret = twl4030_i2c_read_u8(TWL4030_MODULE_INT,
+ &rd_reg, TWL4030_INT_PWR_EDR1);
if (ret < 0)
goto out2;
- ret = twl4030_i2c_read_u8(TWL4030_MODULE_INT, &rd_reg, REG_PWR_EDR1);
+ rd_reg |= BIT(3);
+ ret = twl4030_i2c_write_u8(TWL4030_MODULE_INT,
+ rd_reg, TWL4030_INT_PWR_EDR1);
if (ret < 0)
goto out2;
- /* Rising edge detection enabled, needed for RTC alarm */
- rd_reg |= 0x80;
- ret = twl4030_i2c_write_u8(TWL4030_MODULE_INT, rd_reg, REG_PWR_EDR1);
+ /* init cached IRQ enable bits */
+ ret = twl4030_rtc_read_u8(&rtc_irq_bits, REG_RTC_INTERRUPTS_REG);
if (ret < 0)
goto out2;
out2:
- free_irq(TWL4030_MODIRQ_PWR, rtc);
+ free_irq(irq, rtc);
out1:
rtc_device_unregister(rtc);
out0:
- if (pdata != NULL && pdata->exit != NULL)
- pdata->exit();
-out:
return ret;
}
static int __devexit twl4030_rtc_remove(struct platform_device *pdev)
{
/* leave rtc running, but disable irqs */
- struct twl4030rtc_platform_data *pdata = pdev->dev.platform_data;
struct rtc_device *rtc = platform_get_drvdata(pdev);
+ int irq = platform_get_irq(pdev, 0);
mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M);
- free_irq(TWL4030_MODIRQ_PWR, rtc);
-
- if (pdata != NULL && pdata->exit != NULL)
- pdata->exit();
+ free_irq(irq, rtc);
rtc_device_unregister(rtc);
+ platform_set_drvdata(pdev, NULL);
return 0;
}
static void twl4030_rtc_shutdown(struct platform_device *pdev)
{
- twl4030_rtc_alarm_irq_set_state(&pdev->dev, 0);
- twl4030_rtc_irq_set_state(&pdev->dev, 0);
+ mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M |
+ BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
}
#ifdef CONFIG_PM
-static unsigned char irqstat = 0;
+static unsigned char irqstat;
static int twl4030_rtc_suspend(struct platform_device *pdev, pm_message_t state)
{
- get_rtc_irq_bit(&irqstat);
+ irqstat = rtc_irq_bits;
+ /* REVISIT alarm may need to wake us from sleep */
mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M |
BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
return 0;
set_rtc_irq_bit(irqstat);
return 0;
}
+
#else
#define twl4030_rtc_suspend NULL
#define twl4030_rtc_resume NULL
#endif
-MODULE_ALIAS("twl4030_rtc");
+MODULE_ALIAS("platform:twl4030_rtc");
+
static struct platform_driver twl4030rtc_driver = {
- .probe = twl4030_rtc_probe,
- .remove = __devexit_p(twl4030_rtc_remove),
- .shutdown = twl4030_rtc_shutdown,
- .suspend = twl4030_rtc_suspend,
- .resume = twl4030_rtc_resume,
- .driver = {
+ .probe = twl4030_rtc_probe,
+ .remove = __devexit_p(twl4030_rtc_remove),
+ .shutdown = twl4030_rtc_shutdown,
+ .suspend = twl4030_rtc_suspend,
+ .resume = twl4030_rtc_resume,
+ .driver = {
.owner = THIS_MODULE,
.name = "twl4030_rtc",
},
{
return platform_driver_register(&twl4030rtc_driver);
}
+module_init(twl4030_rtc_init);
static void __exit twl4030_rtc_exit(void)
{
platform_driver_unregister(&twl4030rtc_driver);
}
+module_exit(twl4030_rtc_exit);
MODULE_AUTHOR("Texas Instruments, MontaVista Software");
-MODULE_LICENSE("GPL");;
-
-module_init(twl4030_rtc_init);
-module_exit(twl4030_rtc_exit);
+MODULE_LICENSE("GPL");
git.openpandora.org / pandora-kernel.git / blobdiff