Commit 6cd8fa87 authored Jun 01, 2007 by Matthew Garrett Committed by Linus Torvalds Jun 01, 2007

RTC: use fallback IRQ if PNP tables don't provide one



Intel Macs (and possibly other machines) provide a PNP entry for the RTC,
but provide no IRQ.  As a result the rtc-cmos driver doesn't allow wakeup
alarms.  If the RTC is located at the legacy ioport range, assume that it's
on IRQ 8 unless the tables say otherwise.

Signed-off-by: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: Matthieu CASTET <castet.matthieu@free.fr>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 926b2898

drivers/rtc/rtc-cmos.c

+10 −3

Original line number	Diff line number	Diff line
		@@ -641,6 +641,13 @@ cmos_pnp_probe(struct pnp_dev pnp, const struct pnp_device_id id)
		* drivers can't provide shutdown() methods to disable IRQs.
		* Or better yet, fix PNP to allow those methods...
		*/
		if (pnp_port_start(pnp,0) == 0x70 && !pnp_irq_valid(pnp,0))
		/* Some machines contain a PNP entry for the RTC, but
		* don't define the IRQ. It should always be safe to
		* hardcode it in these cases
		*/
		return cmos_do_probe(&pnp->dev, &pnp->res.port_resource[0], 8);
		else
		return cmos_do_probe(&pnp->dev,
		&pnp->res.port_resource[0],
		pnp->res.irq_resource[0].start);

Admin message