rtc: ia64: allow other architectures to use EFI RTC
PATCH 1/1 rtc: ia64: allow other architectures to use EFI RTC
Currently, the rtc-efi driver is restricted to ia64 only. Newer architectures with EFI support may want to also use that driver. This patch moves the platform device setup from ia64 into drivers/rtc and allow any architecture with CONFIG_EFI=y to use the rtc-efi driver.
--- arch/ia64/kernel/time.c | 15 --------------- drivers/rtc/Kconfig | 2 +- drivers/rtc/Makefile | 4 ++++ drivers/rtc/rtc-efi-platform.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 drivers/rtc/rtc-efi-platform.c
arch/ia64/kernel/time.c +0 -15
@@ -384,21 +384,6 @@ static struct irqaction timer_irqaction = { .name = "timer" }; -static struct platform_device rtc_efi_dev = { - .name ="rtc-efi" , - .id =-1 , -}; - -static int __init rtc_init (void ) -{ -if (platform_device_register (&rtc_efi_dev) <0 ) -printk (KERN_ERR "unable to register rtc device...\n" ); - -/* not necessarily an error */ -return 0 ; -} -module_init (rtc_init); -void read_persistent_clock (struct timespec *ts) {efi_gettimeofday (ts);
drivers/rtc/Kconfig +1 -1
@@ -789,7 +789,7 @@ config RTC_DRV_DA9063 config RTC_DRV_EFI tristate "EFI RTC" - depends on IA64 + depends on EFI help If you say yes here you will get support for the EFI Real Time Clock.
drivers/rtc/Makefile +4 -0
@@ -10,6 +10,10 @@ obj-$(CONFIG_RTC_SYSTOHC) += systohc.o obj-$(CONFIG_RTC_CLASS) += rtc-core.o rtc-core-y := class.o interface.o +ifdef CONFIG_RTC_DRV_EFI +rtc-core-y += rtc-efi-platform.o +endif + rtc-core-$(CONFIG_RTC_INTF_DEV) += rtc-dev.o rtc-core-$(CONFIG_RTC_INTF_PROC) += rtc-proc.o rtc-core-$(CONFIG_RTC_INTF_SYSFS) += rtc-sysfs.o
drivers/rtc/rtc-efi-platform.c new file +30 -0
@@ -0,0 +1,30 @@ +/* +* Moved from arch/ia64/kernel/time.c +* +* Copyright (C) 1998-2003 Hewlett-Packard Co +* Stephane Eranian <[email protected]> +* David Mosberger <[email protected]> +* Copyright (C) 1999 Don Dugger <[email protected]> +* Copyright (C) 1999-2000 VA Linux Systems +* Copyright (C) 1999-2000 Walt Drummond <[email protected]> +*/ +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/efi.h> +#include <linux/platform_device.h> + +static struct platform_device rtc_efi_dev = { + .name ="rtc-efi" , + .id =-1 , +}; + +static int __init rtc_init (void ) +{ +if (platform_device_register (&rtc_efi_dev) <0 ) +pr_err ("unable to register rtc device...\n" ); + +/* not necessarily an error */ +return 0 ; +} +module_init (rtc_init);
Signature · 1 line
1.9.0
Ping.
Quoted 105 lines · Mark Salter
Currently, the rtc-efi driver is restricted to ia64 only. Newer architectures with EFI support may want to also use that driver. This patch moves the platform device setup from ia64 into
drivers/rtcand allow any architecture withCONFIG_EFI=yto use the rtc-efi driver.Signed-off-by Mark Salter <[email protected]>--- arch/ia64/kernel/time.c | 15 --------------- drivers/rtc/Kconfig | 2 +- drivers/rtc/Makefile | 4 ++++ drivers/rtc/rtc-efi-platform.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 drivers/rtc/rtc-efi-platform.carch/ia64/kernel/time.c +0
-15@@ -384,21 +384,6 @@ static struct irqaction timer_irqaction = { .name = "timer" }; -static struct platform_device rtc_efi_dev = { - .name ="rtc-efi" , - .id =-1 , -}; - -static int __init rtc_init (void ) -{ -if (platform_device_register (&rtc_efi_dev) <0 ) -printk (KERN_ERR "unable to register rtc device...\n" ); - -/* not necessarily an error */ -return 0 ; -} -module_init (rtc_init); -void read_persistent_clock (struct timespec *ts) {efi_gettimeofday (ts);drivers/rtc/Kconfig +1
-1@@ -789,7 +789,7 @@ config RTC_DRV_DA9063 config RTC_DRV_EFI tristate "EFI RTC" - depends on IA64 + depends on EFI help If you say yes here you will get support for the EFI Real Time Clock.drivers/rtc/Makefile +4
-0@@ -10,6 +10,10 @@ obj-$(CONFIG_RTC_SYSTOHC) += systohc.o obj-$(CONFIG_RTC_CLASS) += rtc-core.o rtc-core-y := class.o interface.o +ifdef CONFIG_RTC_DRV_EFI +rtc-core-y += rtc-efi-platform.o +endif + rtc-core-$(CONFIG_RTC_INTF_DEV) += rtc-dev.o rtc-core-$(CONFIG_RTC_INTF_PROC) += rtc-proc.o rtc-core-$(CONFIG_RTC_INTF_SYSFS) += rtc-sysfs.odrivers/rtc/rtc-efi-platform.c new file +30
-0@@ -0,0 +1,30 @@ +/* +* Moved from arch/ia64/kernel/time.c +* +* Copyright (C) 1998-2003 Hewlett-Packard Co +* Stephane Eranian <[email protected]> +* David Mosberger <[email protected]> +* Copyright (C) 1999 Don Dugger <[email protected]> +* Copyright (C) 1999-2000 VA Linux Systems +* Copyright (C) 1999-2000 Walt Drummond <[email protected]> +*/ +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/efi.h> +#include <linux/platform_device.h> + +static struct platform_device rtc_efi_dev = { + .name ="rtc-efi" , + .id =-1 , +}; + +static int __init rtc_init (void ) +{ +if (platform_device_register (&rtc_efi_dev) <0 ) +pr_err ("unable to register rtc device...\n" ); + +/* not necessarily an error */ +return 0 ; +} +module_init (rtc_init);
PATCH v2 1/1 rtc: ia64: allow other architectures to use EFI RTC
In reply to Mark SalterCurrently, the rtc-efi driver is restricted to ia64 only. Newer architectures with EFI support may want to also use that driver. This patch moves the platform device setup from ia64 into drivers/rtc and allow any architecture with CONFIG_EFI=y to use the rtc-efi driver.
This is v2 of the patch to fix a boot problem with kernels building in rtc-efi but not being booted via EFI. In that case, runtime services are not available so there is no point in registering the platform device.
--- arch/ia64/kernel/time.c | 15 --------------- drivers/rtc/Kconfig | 2 +- drivers/rtc/Makefile | 4 ++++ drivers/rtc/rtc-efi-platform.c | 31 +++++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 16 deletions(-) create mode 100644 drivers/rtc/rtc-efi-platform.c
arch/ia64/kernel/time.c +0 -15
@@ -384,21 +384,6 @@ static struct irqaction timer_irqaction = { .name = "timer" }; -static struct platform_device rtc_efi_dev = { - .name ="rtc-efi" , - .id =-1 , -}; - -static int __init rtc_init (void ) -{ -if (platform_device_register (&rtc_efi_dev) <0 ) -printk (KERN_ERR "unable to register rtc device...\n" ); - -/* not necessarily an error */ -return 0 ; -} -module_init (rtc_init); -void read_persistent_clock (struct timespec *ts) {efi_gettimeofday (ts);
drivers/rtc/Kconfig +1 -1
@@ -789,7 +789,7 @@ config RTC_DRV_DA9063 config RTC_DRV_EFI tristate "EFI RTC" - depends on IA64 + depends on EFI help If you say yes here you will get support for the EFI Real Time Clock.
drivers/rtc/Makefile +4 -0
@@ -10,6 +10,10 @@ obj-$(CONFIG_RTC_SYSTOHC) += systohc.o obj-$(CONFIG_RTC_CLASS) += rtc-core.o rtc-core-y := class.o interface.o +ifdef CONFIG_RTC_DRV_EFI +rtc-core-y += rtc-efi-platform.o +endif + rtc-core-$(CONFIG_RTC_INTF_DEV) += rtc-dev.o rtc-core-$(CONFIG_RTC_INTF_PROC) += rtc-proc.o rtc-core-$(CONFIG_RTC_INTF_SYSFS) += rtc-sysfs.o
drivers/rtc/rtc-efi-platform.c new file +31 -0
@@ -0,0 +1,31 @@ +/* +* Moved from arch/ia64/kernel/time.c +* +* Copyright (C) 1998-2003 Hewlett-Packard Co +* Stephane Eranian <[email protected]> +* David Mosberger <[email protected]> +* Copyright (C) 1999 Don Dugger <[email protected]> +* Copyright (C) 1999-2000 VA Linux Systems +* Copyright (C) 1999-2000 Walt Drummond <[email protected]> +*/ +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/efi.h> +#include <linux/platform_device.h> + +static struct platform_device rtc_efi_dev = { + .name ="rtc-efi" , + .id =-1 , +}; + +static int __init rtc_init (void ) +{ +if (efi_enabled (EFI_RUNTIME_SERVICES )) +if (platform_device_register (&rtc_efi_dev) <0 ) +pr_err ("unable to register rtc device...\n" ); + +/* not necessarily an error */ +return 0 ; +} +module_init (rtc_init);
Signature · 1 line
1.8.3.1