The patch titled
x86: provide rtc_cmos platform device
has been removed from the -mm tree. Its filename was
x86-provide-rtc_cmos-platform-device.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: x86: provide rtc_cmos platform device
From: Stas Sergeev <stsp@xxxxxxxx>
Recently (around 2.6.25) I've noticed that RTC no longer works for me. It
turned out this is because I use pnpacpi=off kernel option to work around
the parport_pc bugs. I always did so, but RTC used to work fine in the
past, and now it have regressed.
The attached patch fixes the problem by creating the platform device for
the RTC when PNP is disabled. This may also help running the PNP-enabled
kernel on an older PCs.
Signed-off-by: Stas Sergeev <stsp@xxxxxxxx>
Cc: David Brownell <david-b@xxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Cc: Adam Belay <ambx1@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/kernel/rtc.c | 31 +++++++++++++++++++++++++++++++
drivers/rtc/rtc-cmos.c | 26 +++++++++-----------------
include/asm-x86/rtc.h | 4 ++++
3 files changed, 44 insertions(+), 17 deletions(-)
diff -puN arch/x86/kernel/rtc.c~x86-provide-rtc_cmos-platform-device arch/x86/kernel/rtc.c
--- a/arch/x86/kernel/rtc.c~x86-provide-rtc_cmos-platform-device
+++ a/arch/x86/kernel/rtc.c
@@ -4,9 +4,12 @@
#include <linux/acpi.h>
#include <linux/bcd.h>
#include <linux/mc146818rtc.h>
+#include <linux/platform_device.h>
+#include <linux/pnp.h>
#include <asm/time.h>
#include <asm/vsyscall.h>
+#include <asm/rtc.h>
#ifdef CONFIG_X86_32
/*
@@ -197,3 +200,31 @@ unsigned long long native_read_tsc(void)
}
EXPORT_SYMBOL(native_read_tsc);
+
+static struct resource rtc_resources[] = {
+ [0] = {
+ .start = RTC_PORT_START,
+ .end = RTC_PORT_END,
+ .flags = IORESOURCE_IO,
+ },
+ [1] = {
+ .start = RTC_IRQ,
+ .end = RTC_IRQ,
+ .flags = IORESOURCE_IRQ,
+ }
+};
+
+static struct platform_device rtc_device = {
+ .name = "rtc_cmos",
+ .id = -1,
+ .resource = rtc_resources,
+ .num_resources = ARRAY_SIZE(rtc_resources),
+};
+
+static __init int add_rtc_cmos(void)
+{
+ if (!pnp_platform_devices)
+ platform_device_register(&rtc_device);
+ return 0;
+}
+device_initcall(add_rtc_cmos);
diff -puN drivers/rtc/rtc-cmos.c~x86-provide-rtc_cmos-platform-device drivers/rtc/rtc-cmos.c
--- a/drivers/rtc/rtc-cmos.c~x86-provide-rtc_cmos-platform-device
+++ a/drivers/rtc/rtc-cmos.c
@@ -905,19 +905,7 @@ static struct pnp_driver cmos_pnp_driver
.resume = cmos_pnp_resume,
};
-static int __init cmos_init(void)
-{
- return pnp_register_driver(&cmos_pnp_driver);
-}
-module_init(cmos_init);
-
-static void __exit cmos_exit(void)
-{
- pnp_unregister_driver(&cmos_pnp_driver);
-}
-module_exit(cmos_exit);
-
-#else /* no PNP */
+#endif /* CONFIG_PNP */
/*----------------------------------------------------------------*/
@@ -958,20 +946,24 @@ static struct platform_driver cmos_platf
static int __init cmos_init(void)
{
- return platform_driver_probe(&cmos_platform_driver,
+ if (pnp_platform_devices)
+ return pnp_register_driver(&cmos_pnp_driver);
+ else
+ return platform_driver_probe(&cmos_platform_driver,
cmos_platform_probe);
}
module_init(cmos_init);
static void __exit cmos_exit(void)
{
- platform_driver_unregister(&cmos_platform_driver);
+ if (pnp_platform_devices)
+ pnp_unregister_driver(&cmos_pnp_driver);
+ else
+ platform_driver_unregister(&cmos_platform_driver);
}
module_exit(cmos_exit);
-#endif /* !PNP */
-
MODULE_AUTHOR("David Brownell");
MODULE_DESCRIPTION("Driver for PC-style 'CMOS' RTCs");
MODULE_LICENSE("GPL");
diff -puN include/asm-x86/rtc.h~x86-provide-rtc_cmos-platform-device include/asm-x86/rtc.h
--- a/include/asm-x86/rtc.h~x86-provide-rtc_cmos-platform-device
+++ a/include/asm-x86/rtc.h
@@ -1 +1,5 @@
#include <asm-generic/rtc.h>
+
+#define RTC_PORT_START 0x70
+#define RTC_PORT_END 0x71
+#define RTC_IRQ 8
_
Patches currently in -mm which might be from stsp@xxxxxxxx are
origin.patch
linux-next.patch
x86-provide-rtc_cmos-platform-device.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
