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

Commit a2db8dfc authored by David Brownell's avatar David Brownell Committed by Linus Torvalds
Browse files

[PATCH] rtc framewok: rtc_wkalrm.enabled reporting updates 



Fix a glitch in the procfs dumping of whether the alarm IRQ is enabled: use
the traditional name (from drivers/char/rtc.c and many other places) of
"alarm_IRQ", not "alrm_wakeup" (which didn't even match the efirtc code, which
originated that reporting API).

Also, update a few of the RTC drivers to stop providing that duplicate status,
and/or to expose it properly when reporting the alarm state.  We really don't
want every RTC driver doing their own thing here...

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Acked-by: default avatarAlessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5a6534e4

drivers/rtc/rtc-at91rm9200.c

+3 −2
Original line number Diff line number Diff line
@@ -137,6 +137,9 @@ static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) 
	tm->tm_yday = rtc_year_days(tm->tm_mday, tm->tm_mon, tm->tm_year);

	tm->tm_year = at91_alarm_year - 1900;



	alrm->enabled = (at91_sys_read(AT91_RTC_IMR) & AT91_RTC_ALARM)

			? 1 : 0;



	pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,

		1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,

		tm->tm_hour, tm->tm_min, tm->tm_sec);
@@ -223,8 +226,6 @@ static int at91_rtc_proc(struct device *dev, struct seq_file *seq) 
{

	unsigned long imr = at91_sys_read(AT91_RTC_IMR);



	seq_printf(seq, "alarm_IRQ\t: %s\n",

			(imr & AT91_RTC_ALARM) ? "yes" : "no");

	seq_printf(seq, "update_IRQ\t: %s\n",

			(imr & AT91_RTC_ACKUPD) ? "yes" : "no");

	seq_printf(seq, "periodic_IRQ\t: %s\n",

drivers/rtc/rtc-omap.c

+1 −2
Original line number Diff line number Diff line
@@ -279,9 +279,8 @@ static int omap_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) 
	local_irq_enable();



	bcd2tm(&alm->time);

	alm->pending = !!(rtc_read(OMAP_RTC_INTERRUPTS_REG)

	alm->enabled = !!(rtc_read(OMAP_RTC_INTERRUPTS_REG)

			& OMAP_RTC_INTERRUPTS_IT_ALARM);

	alm->enabled = alm->pending && device_may_wakeup(dev);



	return 0;

}

drivers/rtc/rtc-proc.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static int rtc_proc_show(struct seq_file *seq, void *offset) 
			seq_printf(seq, "%02d\n", alrm.time.tm_mday);

		else

			seq_printf(seq, "**\n");

		seq_printf(seq, "alrm_wakeup\t: %s\n",

		seq_printf(seq, "alarm_IRQ\t: %s\n",

				alrm.enabled ? "yes" : "no");

		seq_printf(seq, "alrm_pending\t: %s\n",

				alrm.pending ? "yes" : "no");

drivers/rtc/rtc-s3c.c

+2 −4
Original line number Diff line number Diff line
@@ -191,6 +191,8 @@ static int s3c_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm) 


	alm_en = readb(base + S3C2410_RTCALM);



	alrm->enabled = (alm_en & S3C2410_RTCALM_ALMEN) ? 1 : 0;



	pr_debug("read alarm %02x %02x.%02x.%02x %02x/%02x/%02x\n",

		 alm_en,

		 alm_tm->tm_year, alm_tm->tm_mon, alm_tm->tm_mday,
@@ -331,12 +333,8 @@ static int s3c_rtc_ioctl(struct device *dev, 


static int s3c_rtc_proc(struct device *dev, struct seq_file *seq)

{

	unsigned int rtcalm = readb(s3c_rtc_base + S3C2410_RTCALM);

	unsigned int ticnt = readb(s3c_rtc_base + S3C2410_TICNT);



	seq_printf(seq, "alarm_IRQ\t: %s\n",

		   (rtcalm & S3C2410_RTCALM_ALMEN) ? "yes" : "no" );



	seq_printf(seq, "periodic_IRQ\t: %s\n",

		     (ticnt & S3C2410_TICNT_ENABLE) ? "yes" : "no" );

drivers/rtc/rtc-sa1100.c

+1 −3
Original line number Diff line number Diff line
@@ -289,9 +289,7 @@ static int sa1100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) 


static int sa1100_rtc_proc(struct device *dev, struct seq_file *seq)

{

	seq_printf(seq, "trim/divider\t: 0x%08lx\n", RTTR);

	seq_printf(seq, "alarm_IRQ\t: %s\n",

			(RTSR & RTSR_ALE) ? "yes" : "no" );

	seq_printf(seq, "trim/divider\t: 0x%08x\n", (u32) RTTR);

	seq_printf(seq, "update_IRQ\t: %s\n",

			(RTSR & RTSR_HZE) ? "yes" : "no");

	seq_printf(seq, "periodic_IRQ\t: %s\n",