Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16380c15 authored by John Stultz's avatar John Stultz
Browse files

RTC: Convert rtc drivers to use the alarm_irq_enable method 



Some rtc drivers use the ioctl method instead of the alarm_irq_enable
method for enabling alarm interupts. With the new virtualized RTC
rework, its important for drivers to use the alarm_irq_enable instead.

This patch converts the drivers that use the AIE ioctl method to
use the alarm_irq_enable method. Other ioctl cmds are left untouched.

I have not been able to test or even compile most of these drivers.
Any help to make sure this change is correct would be appreciated!

CC: Alessandro Zummo <a.zummo@towertech.it>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
Reported-by: default avatarMarcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
Tested-by: default avatarMarcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent ac54cd2b

drivers/rtc/rtc-at32ap700x.c

+6 −13
Original line number Diff line number Diff line
@@ -134,36 +134,29 @@ static int at32_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) 
	return ret;

}



static int at32_rtc_ioctl(struct device *dev, unsigned int cmd,

			unsigned long arg)

static int at32_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)

{

	struct rtc_at32ap700x *rtc = dev_get_drvdata(dev);

	int ret = 0;



	spin_lock_irq(&rtc->lock);



	switch (cmd) {

	case RTC_AIE_ON:

	if(enabled) {

		if (rtc_readl(rtc, VAL) > rtc->alarm_time) {

			ret = -EINVAL;

			break;

			goto out;

		}

		rtc_writel(rtc, CTRL, rtc_readl(rtc, CTRL)

				| RTC_BIT(CTRL_TOPEN));

		rtc_writel(rtc, ICR, RTC_BIT(ICR_TOPI));

		rtc_writel(rtc, IER, RTC_BIT(IER_TOPI));

		break;

	case RTC_AIE_OFF:

	} else {

		rtc_writel(rtc, CTRL, rtc_readl(rtc, CTRL)

				& ~RTC_BIT(CTRL_TOPEN));

		rtc_writel(rtc, IDR, RTC_BIT(IDR_TOPI));

		rtc_writel(rtc, ICR, RTC_BIT(ICR_TOPI));

		break;

	default:

		ret = -ENOIOCTLCMD;

		break;

	}



out:

	spin_unlock_irq(&rtc->lock);



	return ret;
@@ -195,11 +188,11 @@ static irqreturn_t at32_rtc_interrupt(int irq, void *dev_id) 
}



static struct rtc_class_ops at32_rtc_ops = {

	.ioctl		= at32_rtc_ioctl,

	.read_time	= at32_rtc_readtime,

	.set_time	= at32_rtc_settime,

	.read_alarm	= at32_rtc_readalarm,

	.set_alarm	= at32_rtc_setalarm,

	.alarm_irq_enable = at32_rtc_alarm_irq_enable,

};



static int __init at32_rtc_probe(struct platform_device *pdev)

drivers/rtc/rtc-at91rm9200.c

+13 −7
Original line number Diff line number Diff line
@@ -195,13 +195,6 @@ static int at91_rtc_ioctl(struct device *dev, unsigned int cmd, 


	/* important:  scrub old status before enabling IRQs */

	switch (cmd) {

	case RTC_AIE_OFF:	/* alarm off */

		at91_sys_write(AT91_RTC_IDR, AT91_RTC_ALARM);

		break;

	case RTC_AIE_ON:	/* alarm on */

		at91_sys_write(AT91_RTC_SCCR, AT91_RTC_ALARM);

		at91_sys_write(AT91_RTC_IER, AT91_RTC_ALARM);

		break;

	case RTC_UIE_OFF:	/* update off */

		at91_sys_write(AT91_RTC_IDR, AT91_RTC_SECEV);

		break;
@@ -217,6 +210,18 @@ static int at91_rtc_ioctl(struct device *dev, unsigned int cmd, 
	return ret;

}



static int at91_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)

{

	pr_debug("%s(): cmd=%08x\n", __func__, enabled);



	if (enabled) {

		at91_sys_write(AT91_RTC_SCCR, AT91_RTC_ALARM);

		at91_sys_write(AT91_RTC_IER, AT91_RTC_ALARM);

	} else

		at91_sys_write(AT91_RTC_IDR, AT91_RTC_ALARM);



	return 0;

}

/*

 * Provide additional RTC information in /proc/driver/rtc

 */
@@ -270,6 +275,7 @@ static const struct rtc_class_ops at91_rtc_ops = { 
	.read_alarm	= at91_rtc_readalarm,

	.set_alarm	= at91_rtc_setalarm,

	.proc		= at91_rtc_proc,

	.alarm_irq_enable = at91_rtc_alarm_irq_enable,

};



/*

drivers/rtc/rtc-at91sam9.c

+14 −6
Original line number Diff line number Diff line
@@ -229,12 +229,6 @@ static int at91_rtc_ioctl(struct device *dev, unsigned int cmd, 
	dev_dbg(dev, "ioctl: cmd=%08x, arg=%08lx, mr %08x\n", cmd, arg, mr);



	switch (cmd) {

	case RTC_AIE_OFF:		/* alarm off */

		rtt_writel(rtc, MR, mr & ~AT91_RTT_ALMIEN);

		break;

	case RTC_AIE_ON:		/* alarm on */

		rtt_writel(rtc, MR, mr | AT91_RTT_ALMIEN);

		break;

	case RTC_UIE_OFF:		/* update off */

		rtt_writel(rtc, MR, mr & ~AT91_RTT_RTTINCIEN);

		break;
@@ -249,6 +243,19 @@ static int at91_rtc_ioctl(struct device *dev, unsigned int cmd, 
	return ret;

}



static int at91_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)

{

	struct sam9_rtc *rtc = dev_get_drvdata(dev);

	u32 mr = rtt_readl(rtc, MR);



	dev_dbg(dev, "alarm_irq_enable: enabled=%08x, mr %08x\n", enabled, mr);

	if (enabled)

		rtt_writel(rtc, MR, mr | AT91_RTT_ALMIEN);

	else

		rtt_writel(rtc, MR, mr & ~AT91_RTT_ALMIEN);

	return 0;

}



/*

 * Provide additional RTC information in /proc/driver/rtc

 */
@@ -302,6 +309,7 @@ static const struct rtc_class_ops at91_rtc_ops = { 
	.read_alarm	= at91_rtc_readalarm,

	.set_alarm	= at91_rtc_setalarm,

	.proc		= at91_rtc_proc,

	.alarm_irq_enabled = at91_rtc_alarm_irq_enable,

};



/*

drivers/rtc/rtc-bfin.c

+12 −9
Original line number Diff line number Diff line
@@ -259,15 +259,6 @@ static int bfin_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long ar 
		bfin_rtc_int_clear(~RTC_ISTAT_SEC);

		break;



	case RTC_AIE_ON:

		dev_dbg_stamp(dev);

		bfin_rtc_int_set_alarm(rtc);

		break;

	case RTC_AIE_OFF:

		dev_dbg_stamp(dev);

		bfin_rtc_int_clear(~(RTC_ISTAT_ALARM | RTC_ISTAT_ALARM_DAY));

		break;



	default:

		dev_dbg_stamp(dev);

		ret = -ENOIOCTLCMD;
@@ -276,6 +267,17 @@ static int bfin_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long ar 
	return ret;

}



static int bfin_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)

{

	struct bfin_rtc *rtc = dev_get_drvdata(dev);



	dev_dbg_stamp(dev);

	if (enabled)

		bfin_rtc_int_set_alarm(rtc);

	else

		bfin_rtc_int_clear(~(RTC_ISTAT_ALARM | RTC_ISTAT_ALARM_DAY));

}



static int bfin_rtc_read_time(struct device *dev, struct rtc_time *tm)

{

	struct bfin_rtc *rtc = dev_get_drvdata(dev);
@@ -362,6 +364,7 @@ static struct rtc_class_ops bfin_rtc_ops = { 
	.read_alarm    = bfin_rtc_read_alarm,

	.set_alarm     = bfin_rtc_set_alarm,

	.proc          = bfin_rtc_proc,

	.alarm_irq_enable = bfin_rtc_alarm_irq_enable,

};



static int __devinit bfin_rtc_probe(struct platform_device *pdev)

drivers/rtc/rtc-ds1286.c

+23 −18
Original line number Diff line number Diff line
@@ -40,31 +40,35 @@ static inline void ds1286_rtc_write(struct ds1286_priv *priv, u8 data, int reg) 
	__raw_writel(data, &priv->rtcregs[reg]);

}



#ifdef CONFIG_RTC_INTF_DEV



static int ds1286_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)

static int ds1286_alarm_irq_enable(struct device *dev, unsigned int enabled)

{

	struct ds1286_priv *priv = dev_get_drvdata(dev);

	unsigned long flags;

	unsigned char val;



	switch (cmd) {

	case RTC_AIE_OFF:

		/* Mask alarm int. enab. bit	*/

		spin_lock_irqsave(&priv->lock, flags);

		val = ds1286_rtc_read(priv, RTC_CMD);

		val |=  RTC_TDM;

		ds1286_rtc_write(priv, val, RTC_CMD);

		spin_unlock_irqrestore(&priv->lock, flags);

		break;

	case RTC_AIE_ON:

		/* Allow alarm interrupts.	*/

	/* Allow or mask alarm interrupts */

	spin_lock_irqsave(&priv->lock, flags);

	val = ds1286_rtc_read(priv, RTC_CMD);

	if (enabled)

		val &=  ~RTC_TDM;

	else

		val |=  RTC_TDM;

	ds1286_rtc_write(priv, val, RTC_CMD);

	spin_unlock_irqrestore(&priv->lock, flags);

		break;



	return 0;

}



#ifdef CONFIG_RTC_INTF_DEV



static int ds1286_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)

{

	struct ds1286_priv *priv = dev_get_drvdata(dev);

	unsigned long flags;

	unsigned char val;



	switch (cmd) {

	case RTC_WIE_OFF:

		/* Mask watchdog int. enab. bit	*/

		spin_lock_irqsave(&priv->lock, flags);
@@ -322,6 +326,7 @@ static const struct rtc_class_ops ds1286_ops = { 
	.set_time	= ds1286_set_time,

	.read_alarm	= ds1286_read_alarm,

	.set_alarm	= ds1286_set_alarm,

	.alarm_irq_enable = ds1286_alarm_irq_enable,

};



static int __devinit ds1286_probe(struct platform_device *pdev)