mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-16 17:12:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

ACPI: x86: cmos_rtc: Create a CMOS RTC platform device

Browse Source 
Make the CMOS RTC ACPI scan handler create a platform device that will
be used subsequently by rtc-cmos for driver binding on x86 systems with
ACPI and update add_rtc_cmos() to skip registering a fallback platform
device for the CMOS RTC when the above one has been registered.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com> # x86
Link: https://patch.msgid.link/1962427.tdWV9SEqCh@rafael.j.wysocki
This commit is contained in:
Rafael J. Wysocki
2026-02-23 16:29:37 +01:00
parent 6cee29ad9d
commit 1ae2f43535
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/rtc.c
View File

@@ -2,6 +2,7 @@
/*
* RTC related functions
*/
#include <linux/acpi.h>
#include <linux/platform_device.h>
#include <linux/mc146818rtc.h>
#include <linux/export.h>
@@ -146,6 +147,9 @@ static __init int add_rtc_cmos(void)
}
}
#endif
if (cmos_rtc_platform_device_present)
return 0;
if (!x86_platform.legacy.rtc)
return -ENODEV;

8
drivers/acpi/x86/cmos_rtc.c
View File

@@ -24,6 +24,8 @@ static const struct acpi_device_id acpi_cmos_rtc_ids[] = {
{}
};
bool cmos_rtc_platform_device_present;
static bool cmos_rtc_space_handler_present __read_mostly;
static acpi_status acpi_cmos_rtc_space_handler(u32 function,
@@ -103,6 +105,12 @@ static int acpi_cmos_rtc_attach(struct acpi_device *adev,
if (ret < 0)
return ret;
if (IS_ERR_OR_NULL(acpi_create_platform_device(adev, NULL))) {
pr_err("Failed to create CMOS-RTC platform device\n");
return 0;
} else {
cmos_rtc_platform_device_present = true;
}
return 1;
}

4
include/linux/acpi.h
View File

@@ -791,6 +791,8 @@ const char *acpi_get_subsystem_id(acpi_handle handle);
int acpi_mrrm_max_mem_region(void);
#endif
extern bool cmos_rtc_platform_device_present;
#else /* !CONFIG_ACPI */
#define acpi_disabled 1
@@ -1116,6 +1118,8 @@ static inline int acpi_mrrm_max_mem_region(void)
return 1;
}
#define cmos_rtc_platform_device_present false
#endif /* !CONFIG_ACPI */
#ifdef CONFIG_ACPI_HMAT