Merge branch 'fortglx/2.6.38/tip/timers/rtc' of... (6ee5859d) · Commits · git / linux-nf

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)

+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,
		};

		/*

+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,
		};

		/*

+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)

+7 −14

Original line number	Diff line number	Diff line
		@@ -154,19 +154,7 @@ static long rtc_dev_ioctl(struct file *file,
		if (err)
		goto done;

		/* try the driver's ioctl interface */
		if (ops->ioctl) {
		err = ops->ioctl(rtc->dev.parent, cmd, arg);
		if (err != -ENOIOCTLCMD) {
		mutex_unlock(&rtc->ops_lock);
		return err;
		}
		}

		/* if the driver does not provide the ioctl interface
		* or if that particular ioctl was not implemented
		* (-ENOIOCTLCMD), we will try to emulate here.
		*
		/*
		* Drivers SHOULD NOT provide ioctl implementations
		* for these requests. Instead, provide methods to
		* support the following code, so that the RTC's main
		@@ -329,7 +317,12 @@ static long rtc_dev_ioctl(struct file *file,
		return err;

		default:
		/* Finally try the driver's ioctl interface */
		if (ops->ioctl) {
		err = ops->ioctl(rtc->dev.parent, cmd, arg);
		if (err == -ENOIOCTLCMD)
		err = -ENOTTY;
		}
		break;
		}