The patch titled
RTC: use fallback IRQ if PNP tables don't provide one
has been removed from the -mm tree. Its filename was
rtc-use-fallback-irq-if-pnp-tables-dont-provide-one.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: RTC: use fallback IRQ if PNP tables don't provide one
From: Matthew Garrett <mjg59@xxxxxxxxxxxxx>
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@xxxxxxxxxxxxx>
Cc: Matthieu CASTET <castet.matthieu@xxxxxxx>
Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-cmos.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff -puN drivers/rtc/rtc-cmos.c~rtc-use-fallback-irq-if-pnp-tables-dont-provide-one drivers/rtc/rtc-cmos.c
--- a/drivers/rtc/rtc-cmos.c~rtc-use-fallback-irq-if-pnp-tables-dont-provide-one
+++ a/drivers/rtc/rtc-cmos.c
@@ -641,9 +641,16 @@ cmos_pnp_probe(struct pnp_dev *pnp, cons
* drivers can't provide shutdown() methods to disable IRQs.
* Or better yet, fix PNP to allow those methods...
*/
- return cmos_do_probe(&pnp->dev,
- &pnp->res.port_resource[0],
- pnp->res.irq_resource[0].start);
+ 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);
}
static void __exit cmos_pnp_remove(struct pnp_dev *pnp)
_
Patches currently in -mm which might be from mjg59@xxxxxxxxxxxxx are
origin.patch
working-3d-dri-intel-agpko-resume-for-i815-chip.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
