* [rtc-linux] [PATCH v3 00/16] genrtc removal
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: geert, deller, benh, mpe, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch
I ended up stuffing the two patch series into one, as they are now
more dependent on one another. This now thoroughly removes the
genrtc driver including the asm/rtc.h headers it uses. For all
architectures that still have a meaningful asm/rtc.h, this goes
through two stages:
1) make the rtc-generic implementation independent of asm/rtc.h
2) remove the asm/rtc.h header and disallow the gen_rtc driver
As the last step, the driver itself gets removed.
Arnd
arch/alpha/include/asm/rtc.h | 1 -
arch/alpha/kernel/core_marvel.c | 1 -
arch/alpha/kernel/rtc.c | 6 +-
arch/frv/include/asm/mc146818rtc.h | 16 -
arch/h8300/include/asm/mc146818rtc.h | 9 -
arch/ia64/include/asm/mc146818rtc.h | 10 -
arch/m68k/amiga/config.c | 1 -
arch/m68k/apollo/config.c | 1 -
arch/m68k/bvme6000/config.c | 1 -
arch/m68k/hp300/config.c | 2 +-
arch/m68k/include/asm/rtc.h | 79 -----
arch/m68k/kernel/time.c | 49 +++-
arch/m68k/mac/config.c | 3 +-
arch/m68k/mac/misc.c | 1 -
arch/m68k/mvme147/config.c | 1 -
arch/m68k/mvme16x/config.c | 1 -
arch/m68k/q40/config.c | 2 +-
arch/m68k/sun3/config.c | 1 -
arch/m68k/sun3/intersil.c | 2 +-
arch/m68k/sun3x/time.c | 2 +-
arch/mips/sni/time.c | 1 -
arch/mn10300/include/asm/rtc.h | 2 -
arch/mn10300/kernel/rtc.c | 2 +-
arch/parisc/include/asm/mc146818rtc.h | 9 -
arch/parisc/include/asm/rtc.h | 131 ---------
arch/parisc/kernel/time.c | 36 ++-
arch/powerpc/include/asm/rtc.h | 78 -----
arch/powerpc/kernel/time.c | 29 +-
arch/powerpc/platforms/Kconfig | 11 +
arch/powerpc/platforms/ps3/time.c | 2 +-
arch/sh/include/asm/mc146818rtc.h | 7 -
arch/sh/include/asm/rtc.h | 11 -
arch/sh/kernel/time.c | 32 +-
arch/x86/include/asm/mc146818rtc.h | 1 -
arch/x86/include/asm/rtc.h | 1 -
arch/x86/kernel/hpet.c | 3 +-
arch/x86/kernel/rtc.c | 3 +-
arch/x86/platform/efi/efi.c | 1 -
drivers/acpi/acpi_cmos_rtc.c | 2 +-
drivers/base/power/trace.c | 6 +-
drivers/char/Kconfig | 26 --
drivers/char/Makefile | 1 -
drivers/char/genrtc.c | 539 ----------------------------------
drivers/rtc/rtc-cmos.c | 12 +-
drivers/rtc/rtc-generic.c | 36 +--
drivers/rtc/rtc-mrst.c | 2 +-
include/asm-generic/rtc.h | 247 ----------------
include/linux/mc146818rtc.h | 194 ++++++++++++
48 files changed, 358 insertions(+), 1256 deletions(-)
[PATCH v3 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files
[PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of
[PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h
[PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
[PATCH v3 05/16] char/genrtc: remove alpha support
[PATCH v3 06/16] char/genrtc: remove mn10300 support
[PATCH v3 07/16] rtc: parisc: provide rtc_class_ops directly
[PATCH v3 08/16] char/genrtc: remove parisc support
[PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
[PATCH v3 10/16] rtc: m68k: provide ioctl for q40
[PATCH v3 11/16] char/genrtc: remove m68k support
[PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
[PATCH v3 13/16] char/genrtc: remove powerpc support
[PATCH v3 14/16] rtc: generic: remove get_rtc_time/set_rtc_time
[PATCH v3 15/16] char/genrtc: remove asm-generic/rtc.h from mips
[PATCH v3 16/16] char/genrtc: remove the rest of the driver
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 144+ messages in thread
* [PATCH v3 00/16] genrtc removal
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: geert, deller, benh, mpe, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch
I ended up stuffing the two patch series into one, as they are now
more dependent on one another. This now thoroughly removes the
genrtc driver including the asm/rtc.h headers it uses. For all
architectures that still have a meaningful asm/rtc.h, this goes
through two stages:
1) make the rtc-generic implementation independent of asm/rtc.h
2) remove the asm/rtc.h header and disallow the gen_rtc driver
As the last step, the driver itself gets removed.
Arnd
arch/alpha/include/asm/rtc.h | 1 -
arch/alpha/kernel/core_marvel.c | 1 -
arch/alpha/kernel/rtc.c | 6 +-
arch/frv/include/asm/mc146818rtc.h | 16 -
arch/h8300/include/asm/mc146818rtc.h | 9 -
arch/ia64/include/asm/mc146818rtc.h | 10 -
arch/m68k/amiga/config.c | 1 -
arch/m68k/apollo/config.c | 1 -
arch/m68k/bvme6000/config.c | 1 -
arch/m68k/hp300/config.c | 2 +-
arch/m68k/include/asm/rtc.h | 79 -----
arch/m68k/kernel/time.c | 49 +++-
arch/m68k/mac/config.c | 3 +-
arch/m68k/mac/misc.c | 1 -
arch/m68k/mvme147/config.c | 1 -
arch/m68k/mvme16x/config.c | 1 -
arch/m68k/q40/config.c | 2 +-
arch/m68k/sun3/config.c | 1 -
arch/m68k/sun3/intersil.c | 2 +-
arch/m68k/sun3x/time.c | 2 +-
arch/mips/sni/time.c | 1 -
arch/mn10300/include/asm/rtc.h | 2 -
arch/mn10300/kernel/rtc.c | 2 +-
arch/parisc/include/asm/mc146818rtc.h | 9 -
arch/parisc/include/asm/rtc.h | 131 ---------
arch/parisc/kernel/time.c | 36 ++-
arch/powerpc/include/asm/rtc.h | 78 -----
arch/powerpc/kernel/time.c | 29 +-
arch/powerpc/platforms/Kconfig | 11 +
arch/powerpc/platforms/ps3/time.c | 2 +-
arch/sh/include/asm/mc146818rtc.h | 7 -
arch/sh/include/asm/rtc.h | 11 -
arch/sh/kernel/time.c | 32 +-
arch/x86/include/asm/mc146818rtc.h | 1 -
arch/x86/include/asm/rtc.h | 1 -
arch/x86/kernel/hpet.c | 3 +-
arch/x86/kernel/rtc.c | 3 +-
arch/x86/platform/efi/efi.c | 1 -
drivers/acpi/acpi_cmos_rtc.c | 2 +-
drivers/base/power/trace.c | 6 +-
drivers/char/Kconfig | 26 --
drivers/char/Makefile | 1 -
drivers/char/genrtc.c | 539 ----------------------------------
drivers/rtc/rtc-cmos.c | 12 +-
drivers/rtc/rtc-generic.c | 36 +--
drivers/rtc/rtc-mrst.c | 2 +-
include/asm-generic/rtc.h | 247 ----------------
include/linux/mc146818rtc.h | 194 ++++++++++++
48 files changed, 358 insertions(+), 1256 deletions(-)
[PATCH v3 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files
[PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of
[PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h
[PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
[PATCH v3 05/16] char/genrtc: remove alpha support
[PATCH v3 06/16] char/genrtc: remove mn10300 support
[PATCH v3 07/16] rtc: parisc: provide rtc_class_ops directly
[PATCH v3 08/16] char/genrtc: remove parisc support
[PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
[PATCH v3 10/16] rtc: m68k: provide ioctl for q40
[PATCH v3 11/16] char/genrtc: remove m68k support
[PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
[PATCH v3 13/16] char/genrtc: remove powerpc support
[PATCH v3 14/16] rtc: generic: remove get_rtc_time/set_rtc_time
[PATCH v3 15/16] char/genrtc: remove asm-generic/rtc.h from mips
[PATCH v3 16/16] char/genrtc: remove the rest of the driver
^ permalink raw reply [flat|nested] 144+ messages in thread
* [PATCH v3 00/16] genrtc removal
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: geert, deller, benh, mpe, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch
I ended up stuffing the two patch series into one, as they are now
more dependent on one another. This now thoroughly removes the
genrtc driver including the asm/rtc.h headers it uses. For all
architectures that still have a meaningful asm/rtc.h, this goes
through two stages:
1) make the rtc-generic implementation independent of asm/rtc.h
2) remove the asm/rtc.h header and disallow the gen_rtc driver
As the last step, the driver itself gets removed.
Arnd
arch/alpha/include/asm/rtc.h | 1 -
arch/alpha/kernel/core_marvel.c | 1 -
arch/alpha/kernel/rtc.c | 6 +-
arch/frv/include/asm/mc146818rtc.h | 16 -
arch/h8300/include/asm/mc146818rtc.h | 9 -
arch/ia64/include/asm/mc146818rtc.h | 10 -
arch/m68k/amiga/config.c | 1 -
arch/m68k/apollo/config.c | 1 -
arch/m68k/bvme6000/config.c | 1 -
arch/m68k/hp300/config.c | 2 +-
arch/m68k/include/asm/rtc.h | 79 -----
arch/m68k/kernel/time.c | 49 +++-
arch/m68k/mac/config.c | 3 +-
arch/m68k/mac/misc.c | 1 -
arch/m68k/mvme147/config.c | 1 -
arch/m68k/mvme16x/config.c | 1 -
arch/m68k/q40/config.c | 2 +-
arch/m68k/sun3/config.c | 1 -
arch/m68k/sun3/intersil.c | 2 +-
arch/m68k/sun3x/time.c | 2 +-
arch/mips/sni/time.c | 1 -
arch/mn10300/include/asm/rtc.h | 2 -
arch/mn10300/kernel/rtc.c | 2 +-
arch/parisc/include/asm/mc146818rtc.h | 9 -
arch/parisc/include/asm/rtc.h | 131 ---------
arch/parisc/kernel/time.c | 36 ++-
arch/powerpc/include/asm/rtc.h | 78 -----
arch/powerpc/kernel/time.c | 29 +-
arch/powerpc/platforms/Kconfig | 11 +
arch/powerpc/platforms/ps3/time.c | 2 +-
arch/sh/include/asm/mc146818rtc.h | 7 -
arch/sh/include/asm/rtc.h | 11 -
arch/sh/kernel/time.c | 32 +-
arch/x86/include/asm/mc146818rtc.h | 1 -
arch/x86/include/asm/rtc.h | 1 -
arch/x86/kernel/hpet.c | 3 +-
arch/x86/kernel/rtc.c | 3 +-
arch/x86/platform/efi/efi.c | 1 -
drivers/acpi/acpi_cmos_rtc.c | 2 +-
drivers/base/power/trace.c | 6 +-
drivers/char/Kconfig | 26 --
drivers/char/Makefile | 1 -
drivers/char/genrtc.c | 539 ----------------------------------
drivers/rtc/rtc-cmos.c | 12 +-
drivers/rtc/rtc-generic.c | 36 +--
drivers/rtc/rtc-mrst.c | 2 +-
include/asm-generic/rtc.h | 247 ----------------
include/linux/mc146818rtc.h | 194 ++++++++++++
48 files changed, 358 insertions(+), 1256 deletions(-)
[PATCH v3 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files
[PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of
[PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h
[PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
[PATCH v3 05/16] char/genrtc: remove alpha support
[PATCH v3 06/16] char/genrtc: remove mn10300 support
[PATCH v3 07/16] rtc: parisc: provide rtc_class_ops directly
[PATCH v3 08/16] char/genrtc: remove parisc support
[PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
[PATCH v3 10/16] rtc: m68k: provide ioctl for q40
[PATCH v3 11/16] char/genrtc: remove m68k support
[PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
[PATCH v3 13/16] char/genrtc: remove powerpc support
[PATCH v3 14/16] rtc: generic: remove get_rtc_time/set_rtc_time
[PATCH v3 15/16] char/genrtc: remove asm-generic/rtc.h from mips
[PATCH v3 16/16] char/genrtc: remove the rest of the driver
^ permalink raw reply [flat|nested] 144+ messages in thread
* [PATCH v3 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files
2016-04-27 22:34 ` Arnd Bergmann
` (2 preceding siblings ...)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
Nothing on these architectures ever includes the asm/mc146818rtc.h
file, the drivers that used to do this have been fixed long ago,
and the remaining users are all PC-specific.
This removes the files for good.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
arch/frv/include/asm/mc146818rtc.h | 16 ----------------
arch/h8300/include/asm/mc146818rtc.h | 9 ---------
arch/ia64/include/asm/mc146818rtc.h | 10 ----------
arch/parisc/include/asm/mc146818rtc.h | 9 ---------
arch/sh/include/asm/mc146818rtc.h | 7 -------
5 files changed, 51 deletions(-)
delete mode 100644 arch/frv/include/asm/mc146818rtc.h
delete mode 100644 arch/h8300/include/asm/mc146818rtc.h
delete mode 100644 arch/ia64/include/asm/mc146818rtc.h
delete mode 100644 arch/parisc/include/asm/mc146818rtc.h
delete mode 100644 arch/sh/include/asm/mc146818rtc.h
diff --git a/arch/frv/include/asm/mc146818rtc.h b/arch/frv/include/asm/mc146818rtc.h
deleted file mode 100644
index 90dfb7a633d1..000000000000
--- a/arch/frv/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* mc146818rtc.h: RTC defs
- *
- * Copyright (C) 2005 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-
-#endif /* _ASM_MC146818RTC_H */
diff --git a/arch/h8300/include/asm/mc146818rtc.h b/arch/h8300/include/asm/mc146818rtc.h
deleted file mode 100644
index ab9d9646d241..000000000000
--- a/arch/h8300/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _H8300_MC146818RTC_H
-#define _H8300_MC146818RTC_H
-
-/* empty include file to satisfy the include in genrtc.c/ide-geometry.c */
-
-#endif /* _H8300_MC146818RTC_H */
diff --git a/arch/ia64/include/asm/mc146818rtc.h b/arch/ia64/include/asm/mc146818rtc.h
deleted file mode 100644
index 407787a237ba..000000000000
--- a/arch/ia64/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_IA64_MC146818RTC_H
-#define _ASM_IA64_MC146818RTC_H
-
-/*
- * Machine dependent access functions for RTC registers.
- */
-
-/* empty include file to satisfy the include in genrtc.c */
-
-#endif /* _ASM_IA64_MC146818RTC_H */
diff --git a/arch/parisc/include/asm/mc146818rtc.h b/arch/parisc/include/asm/mc146818rtc.h
deleted file mode 100644
index adf41631449f..000000000000
--- a/arch/parisc/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-/* empty include file to satisfy the include in genrtc.c */
-
-#endif /* _ASM_MC146818RTC_H */
diff --git a/arch/sh/include/asm/mc146818rtc.h b/arch/sh/include/asm/mc146818rtc.h
deleted file mode 100644
index 0aee96a97330..000000000000
--- a/arch/sh/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-#endif /* _ASM_MC146818RTC_H */
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files
2016-04-27 22:34 ` Arnd Bergmann
(?)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
Nothing on these architectures ever includes the asm/mc146818rtc.h
file, the drivers that used to do this have been fixed long ago,
and the remaining users are all PC-specific.
This removes the files for good.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
arch/frv/include/asm/mc146818rtc.h | 16 ----------------
arch/h8300/include/asm/mc146818rtc.h | 9 ---------
arch/ia64/include/asm/mc146818rtc.h | 10 ----------
arch/parisc/include/asm/mc146818rtc.h | 9 ---------
arch/sh/include/asm/mc146818rtc.h | 7 -------
5 files changed, 51 deletions(-)
delete mode 100644 arch/frv/include/asm/mc146818rtc.h
delete mode 100644 arch/h8300/include/asm/mc146818rtc.h
delete mode 100644 arch/ia64/include/asm/mc146818rtc.h
delete mode 100644 arch/parisc/include/asm/mc146818rtc.h
delete mode 100644 arch/sh/include/asm/mc146818rtc.h
diff --git a/arch/frv/include/asm/mc146818rtc.h b/arch/frv/include/asm/mc146818rtc.h
deleted file mode 100644
index 90dfb7a633d1..000000000000
--- a/arch/frv/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* mc146818rtc.h: RTC defs
- *
- * Copyright (C) 2005 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-
-#endif /* _ASM_MC146818RTC_H */
diff --git a/arch/h8300/include/asm/mc146818rtc.h b/arch/h8300/include/asm/mc146818rtc.h
deleted file mode 100644
index ab9d9646d241..000000000000
--- a/arch/h8300/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _H8300_MC146818RTC_H
-#define _H8300_MC146818RTC_H
-
-/* empty include file to satisfy the include in genrtc.c/ide-geometry.c */
-
-#endif /* _H8300_MC146818RTC_H */
diff --git a/arch/ia64/include/asm/mc146818rtc.h b/arch/ia64/include/asm/mc146818rtc.h
deleted file mode 100644
index 407787a237ba..000000000000
--- a/arch/ia64/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_IA64_MC146818RTC_H
-#define _ASM_IA64_MC146818RTC_H
-
-/*
- * Machine dependent access functions for RTC registers.
- */
-
-/* empty include file to satisfy the include in genrtc.c */
-
-#endif /* _ASM_IA64_MC146818RTC_H */
diff --git a/arch/parisc/include/asm/mc146818rtc.h b/arch/parisc/include/asm/mc146818rtc.h
deleted file mode 100644
index adf41631449f..000000000000
--- a/arch/parisc/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-/* empty include file to satisfy the include in genrtc.c */
-
-#endif /* _ASM_MC146818RTC_H */
diff --git a/arch/sh/include/asm/mc146818rtc.h b/arch/sh/include/asm/mc146818rtc.h
deleted file mode 100644
index 0aee96a97330..000000000000
--- a/arch/sh/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-#endif /* _ASM_MC146818RTC_H */
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread
* [rtc-linux] [PATCH v3 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
Nothing on these architectures ever includes the asm/mc146818rtc.h
file, the drivers that used to do this have been fixed long ago,
and the remaining users are all PC-specific.
This removes the files for good.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
arch/frv/include/asm/mc146818rtc.h | 16 ----------------
arch/h8300/include/asm/mc146818rtc.h | 9 ---------
arch/ia64/include/asm/mc146818rtc.h | 10 ----------
arch/parisc/include/asm/mc146818rtc.h | 9 ---------
arch/sh/include/asm/mc146818rtc.h | 7 -------
5 files changed, 51 deletions(-)
delete mode 100644 arch/frv/include/asm/mc146818rtc.h
delete mode 100644 arch/h8300/include/asm/mc146818rtc.h
delete mode 100644 arch/ia64/include/asm/mc146818rtc.h
delete mode 100644 arch/parisc/include/asm/mc146818rtc.h
delete mode 100644 arch/sh/include/asm/mc146818rtc.h
diff --git a/arch/frv/include/asm/mc146818rtc.h b/arch/frv/include/asm/mc146818rtc.h
deleted file mode 100644
index 90dfb7a633d1..000000000000
--- a/arch/frv/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* mc146818rtc.h: RTC defs
- *
- * Copyright (C) 2005 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-
-#endif /* _ASM_MC146818RTC_H */
diff --git a/arch/h8300/include/asm/mc146818rtc.h b/arch/h8300/include/asm/mc146818rtc.h
deleted file mode 100644
index ab9d9646d241..000000000000
--- a/arch/h8300/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _H8300_MC146818RTC_H
-#define _H8300_MC146818RTC_H
-
-/* empty include file to satisfy the include in genrtc.c/ide-geometry.c */
-
-#endif /* _H8300_MC146818RTC_H */
diff --git a/arch/ia64/include/asm/mc146818rtc.h b/arch/ia64/include/asm/mc146818rtc.h
deleted file mode 100644
index 407787a237ba..000000000000
--- a/arch/ia64/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_IA64_MC146818RTC_H
-#define _ASM_IA64_MC146818RTC_H
-
-/*
- * Machine dependent access functions for RTC registers.
- */
-
-/* empty include file to satisfy the include in genrtc.c */
-
-#endif /* _ASM_IA64_MC146818RTC_H */
diff --git a/arch/parisc/include/asm/mc146818rtc.h b/arch/parisc/include/asm/mc146818rtc.h
deleted file mode 100644
index adf41631449f..000000000000
--- a/arch/parisc/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-/* empty include file to satisfy the include in genrtc.c */
-
-#endif /* _ASM_MC146818RTC_H */
diff --git a/arch/sh/include/asm/mc146818rtc.h b/arch/sh/include/asm/mc146818rtc.h
deleted file mode 100644
index 0aee96a97330..000000000000
--- a/arch/sh/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-#endif /* _ASM_MC146818RTC_H */
--
2.7.0
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply related [flat|nested] 144+ messages in thread
* [PATCH v3 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
Nothing on these architectures ever includes the asm/mc146818rtc.h
file, the drivers that used to do this have been fixed long ago,
and the remaining users are all PC-specific.
This removes the files for good.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
arch/frv/include/asm/mc146818rtc.h | 16 ----------------
arch/h8300/include/asm/mc146818rtc.h | 9 ---------
arch/ia64/include/asm/mc146818rtc.h | 10 ----------
arch/parisc/include/asm/mc146818rtc.h | 9 ---------
arch/sh/include/asm/mc146818rtc.h | 7 -------
5 files changed, 51 deletions(-)
delete mode 100644 arch/frv/include/asm/mc146818rtc.h
delete mode 100644 arch/h8300/include/asm/mc146818rtc.h
delete mode 100644 arch/ia64/include/asm/mc146818rtc.h
delete mode 100644 arch/parisc/include/asm/mc146818rtc.h
delete mode 100644 arch/sh/include/asm/mc146818rtc.h
diff --git a/arch/frv/include/asm/mc146818rtc.h b/arch/frv/include/asm/mc146818rtc.h
deleted file mode 100644
index 90dfb7a633d1..000000000000
--- a/arch/frv/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* mc146818rtc.h: RTC defs
- *
- * Copyright (C) 2005 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-
-#endif /* _ASM_MC146818RTC_H */
diff --git a/arch/h8300/include/asm/mc146818rtc.h b/arch/h8300/include/asm/mc146818rtc.h
deleted file mode 100644
index ab9d9646d241..000000000000
--- a/arch/h8300/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _H8300_MC146818RTC_H
-#define _H8300_MC146818RTC_H
-
-/* empty include file to satisfy the include in genrtc.c/ide-geometry.c */
-
-#endif /* _H8300_MC146818RTC_H */
diff --git a/arch/ia64/include/asm/mc146818rtc.h b/arch/ia64/include/asm/mc146818rtc.h
deleted file mode 100644
index 407787a237ba..000000000000
--- a/arch/ia64/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_IA64_MC146818RTC_H
-#define _ASM_IA64_MC146818RTC_H
-
-/*
- * Machine dependent access functions for RTC registers.
- */
-
-/* empty include file to satisfy the include in genrtc.c */
-
-#endif /* _ASM_IA64_MC146818RTC_H */
diff --git a/arch/parisc/include/asm/mc146818rtc.h b/arch/parisc/include/asm/mc146818rtc.h
deleted file mode 100644
index adf41631449f..000000000000
--- a/arch/parisc/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-/* empty include file to satisfy the include in genrtc.c */
-
-#endif /* _ASM_MC146818RTC_H */
diff --git a/arch/sh/include/asm/mc146818rtc.h b/arch/sh/include/asm/mc146818rtc.h
deleted file mode 100644
index 0aee96a97330..000000000000
--- a/arch/sh/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-#endif /* _ASM_MC146818RTC_H */
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread
* [PATCH v3 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
Nothing on these architectures ever includes the asm/mc146818rtc.h
file, the drivers that used to do this have been fixed long ago,
and the remaining users are all PC-specific.
This removes the files for good.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
arch/frv/include/asm/mc146818rtc.h | 16 ----------------
arch/h8300/include/asm/mc146818rtc.h | 9 ---------
arch/ia64/include/asm/mc146818rtc.h | 10 ----------
arch/parisc/include/asm/mc146818rtc.h | 9 ---------
arch/sh/include/asm/mc146818rtc.h | 7 -------
5 files changed, 51 deletions(-)
delete mode 100644 arch/frv/include/asm/mc146818rtc.h
delete mode 100644 arch/h8300/include/asm/mc146818rtc.h
delete mode 100644 arch/ia64/include/asm/mc146818rtc.h
delete mode 100644 arch/parisc/include/asm/mc146818rtc.h
delete mode 100644 arch/sh/include/asm/mc146818rtc.h
diff --git a/arch/frv/include/asm/mc146818rtc.h b/arch/frv/include/asm/mc146818rtc.h
deleted file mode 100644
index 90dfb7a633d1..000000000000
--- a/arch/frv/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* mc146818rtc.h: RTC defs
- *
- * Copyright (C) 2005 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-
-#endif /* _ASM_MC146818RTC_H */
diff --git a/arch/h8300/include/asm/mc146818rtc.h b/arch/h8300/include/asm/mc146818rtc.h
deleted file mode 100644
index ab9d9646d241..000000000000
--- a/arch/h8300/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _H8300_MC146818RTC_H
-#define _H8300_MC146818RTC_H
-
-/* empty include file to satisfy the include in genrtc.c/ide-geometry.c */
-
-#endif /* _H8300_MC146818RTC_H */
diff --git a/arch/ia64/include/asm/mc146818rtc.h b/arch/ia64/include/asm/mc146818rtc.h
deleted file mode 100644
index 407787a237ba..000000000000
--- a/arch/ia64/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_IA64_MC146818RTC_H
-#define _ASM_IA64_MC146818RTC_H
-
-/*
- * Machine dependent access functions for RTC registers.
- */
-
-/* empty include file to satisfy the include in genrtc.c */
-
-#endif /* _ASM_IA64_MC146818RTC_H */
diff --git a/arch/parisc/include/asm/mc146818rtc.h b/arch/parisc/include/asm/mc146818rtc.h
deleted file mode 100644
index adf41631449f..000000000000
--- a/arch/parisc/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-/* empty include file to satisfy the include in genrtc.c */
-
-#endif /* _ASM_MC146818RTC_H */
diff --git a/arch/sh/include/asm/mc146818rtc.h b/arch/sh/include/asm/mc146818rtc.h
deleted file mode 100644
index 0aee96a97330..000000000000
--- a/arch/sh/include/asm/mc146818rtc.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-#endif /* _ASM_MC146818RTC_H */
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread
* [PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h
2016-04-27 22:34 ` Arnd Bergmann
(?)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
Drivers should not really include stuff from asm-generic directly,
and the PC-style cmos rtc driver does this in order to reuse the
mc146818 implementation of get_rtc_time/set_rtc_time rather than
the architecture specific one for the architecture it gets built for.
To make it more obvious what is going on, this moves and renames the
two functions into include/linux/mc146818rtc.h, which holds the
other mc146818 specific code. Ideally it would be in a .c file,
but that would require extra infrastructure as the functions are
called by multiple drivers with conflicting dependencies.
With this change, the asm-generic/rtc.h header also becomes much
more generic, so it can be reused more easily across any architecture
that still relies on the genrtc driver.
The only caller of the internal __get_rtc_time/__set_rtc_time
functions is in arch/alpha/kernel/rtc.c, and we just change those
over to the new naming.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
arch/alpha/kernel/rtc.c | 6 +-
arch/x86/include/asm/mc146818rtc.h | 1 -
drivers/rtc/rtc-cmos.c | 12 +--
include/asm-generic/rtc.h | 206 +------------------------------------
include/linux/mc146818rtc.h | 194 ++++++++++++++++++++++++++++++++++
5 files changed, 207 insertions(+), 212 deletions(-)
diff --git a/arch/alpha/kernel/rtc.c b/arch/alpha/kernel/rtc.c
index f535a3fd0f60..ceed68c7500b 100644
--- a/arch/alpha/kernel/rtc.c
+++ b/arch/alpha/kernel/rtc.c
@@ -15,8 +15,6 @@
#include <linux/rtc.h>
#include <linux/platform_device.h>
-#include <asm/rtc.h>
-
#include "proto.h"
@@ -81,7 +79,7 @@ init_rtc_epoch(void)
static int
alpha_rtc_read_time(struct device *dev, struct rtc_time *tm)
{
- __get_rtc_time(tm);
+ mc146818_get_time(tm);
/* Adjust for non-default epochs. It's easier to depend on the
generic __get_rtc_time and adjust the epoch here than create
@@ -112,7 +110,7 @@ alpha_rtc_set_time(struct device *dev, struct rtc_time *tm)
tm = &xtm;
}
- return __set_rtc_time(tm);
+ return mc146818_set_time(tm);
}
static int
diff --git a/arch/x86/include/asm/mc146818rtc.h b/arch/x86/include/asm/mc146818rtc.h
index 0f555cc31984..24acd9ba7837 100644
--- a/arch/x86/include/asm/mc146818rtc.h
+++ b/arch/x86/include/asm/mc146818rtc.h
@@ -6,7 +6,6 @@
#include <asm/io.h>
#include <asm/processor.h>
-#include <linux/mc146818rtc.h>
#ifndef RTC_PORT
#define RTC_PORT(x) (0x70 + (x))
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 84fb541038be..c7993f18edfa 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -43,7 +43,7 @@
#include <linux/of_platform.h>
/* this is for "generic access to PC-style RTC" using CMOS_READ/CMOS_WRITE */
-#include <asm-generic/rtc.h>
+#include <linux/mc146818rtc.h>
struct cmos_rtc {
struct rtc_device *rtc;
@@ -190,10 +190,10 @@ static inline void cmos_write_bank2(unsigned char val, unsigned char addr)
static int cmos_read_time(struct device *dev, struct rtc_time *t)
{
/* REVISIT: if the clock has a "century" register, use
- * that instead of the heuristic in get_rtc_time().
+ * that instead of the heuristic in mc146818_get_time().
* That'll make Y3K compatility (year > 2070) easy!
*/
- get_rtc_time(t);
+ mc146818_get_time(t);
return 0;
}
@@ -205,7 +205,7 @@ static int cmos_set_time(struct device *dev, struct rtc_time *t)
* takes effect exactly 500ms after we write the register.
* (Also queueing and other delays before we get this far.)
*/
- return set_rtc_time(t);
+ return mc146818_set_time(t);
}
static int cmos_read_alarm(struct device *dev, struct rtc_wkalrm *t)
@@ -1142,14 +1142,14 @@ static __init void cmos_of_init(struct platform_device *pdev)
if (val)
CMOS_WRITE(be32_to_cpup(val), RTC_FREQ_SELECT);
- get_rtc_time(&time);
+ cmos_read_time(&pdev->dev, &time);
ret = rtc_valid_tm(&time);
if (ret) {
struct rtc_time def_time = {
.tm_year = 1,
.tm_mday = 1,
};
- set_rtc_time(&def_time);
+ cmos_set_time(&pdev->dev, &def_time);
}
}
#else
diff --git a/include/asm-generic/rtc.h b/include/asm-generic/rtc.h
index 4e3b6558331e..4fcff22cd707 100644
--- a/include/asm-generic/rtc.h
+++ b/include/asm-generic/rtc.h
@@ -12,12 +12,12 @@
#ifndef __ASM_RTC_H__
#define __ASM_RTC_H__
-#include <linux/mc146818rtc.h>
#include <linux/rtc.h>
-#include <linux/bcd.h>
-#include <linux/delay.h>
-#ifdef CONFIG_ACPI
-#include <linux/acpi.h>
+
+#ifndef get_rtc_time
+#include <linux/mc146818rtc.h>
+#define get_rtc_time mc146818_get_time
+#define set_rtc_time mc146818_set_time
#endif
#define RTC_PIE 0x40 /* periodic interrupt enable */
@@ -31,202 +31,6 @@
#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-/*
- * Returns true if a clock update is in progress
- */
-static inline unsigned char rtc_is_updating(void)
-{
- unsigned char uip;
- unsigned long flags;
-
- spin_lock_irqsave(&rtc_lock, flags);
- uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP);
- spin_unlock_irqrestore(&rtc_lock, flags);
- return uip;
-}
-
-static inline unsigned int __get_rtc_time(struct rtc_time *time)
-{
- unsigned char ctrl;
- unsigned long flags;
- unsigned char century = 0;
-
-#ifdef CONFIG_MACH_DECSTATION
- unsigned int real_year;
-#endif
-
- /*
- * read RTC once any update in progress is done. The update
- * can take just over 2ms. We wait 20ms. There is no need to
- * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP.
- * If you need to know *exactly* when a second has started, enable
- * periodic update complete interrupts, (via ioctl) and then
- * immediately read /dev/rtc which will block until you get the IRQ.
- * Once the read clears, read the RTC time (again via ioctl). Easy.
- */
- if (rtc_is_updating())
- mdelay(20);
-
- /*
- * Only the values that we read from the RTC are set. We leave
- * tm_wday, tm_yday and tm_isdst untouched. Even though the
- * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
- * by the RTC when initially set to a non-zero value.
- */
- spin_lock_irqsave(&rtc_lock, flags);
- time->tm_sec = CMOS_READ(RTC_SECONDS);
- time->tm_min = CMOS_READ(RTC_MINUTES);
- time->tm_hour = CMOS_READ(RTC_HOURS);
- time->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);
- time->tm_mon = CMOS_READ(RTC_MONTH);
- time->tm_year = CMOS_READ(RTC_YEAR);
-#ifdef CONFIG_MACH_DECSTATION
- real_year = CMOS_READ(RTC_DEC_YEAR);
-#endif
-#ifdef CONFIG_ACPI
- if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
- acpi_gbl_FADT.century)
- century = CMOS_READ(acpi_gbl_FADT.century);
-#endif
- ctrl = CMOS_READ(RTC_CONTROL);
- spin_unlock_irqrestore(&rtc_lock, flags);
-
- if (!(ctrl & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
- {
- time->tm_sec = bcd2bin(time->tm_sec);
- time->tm_min = bcd2bin(time->tm_min);
- time->tm_hour = bcd2bin(time->tm_hour);
- time->tm_mday = bcd2bin(time->tm_mday);
- time->tm_mon = bcd2bin(time->tm_mon);
- time->tm_year = bcd2bin(time->tm_year);
- century = bcd2bin(century);
- }
-
-#ifdef CONFIG_MACH_DECSTATION
- time->tm_year += real_year - 72;
-#endif
-
- if (century)
- time->tm_year += (century - 19) * 100;
-
- /*
- * Account for differences between how the RTC uses the values
- * and how they are defined in a struct rtc_time;
- */
- if (time->tm_year <= 69)
- time->tm_year += 100;
-
- time->tm_mon--;
-
- return RTC_24H;
-}
-
-#ifndef get_rtc_time
-#define get_rtc_time __get_rtc_time
-#endif
-
-/* Set the current date and time in the real time clock. */
-static inline int __set_rtc_time(struct rtc_time *time)
-{
- unsigned long flags;
- unsigned char mon, day, hrs, min, sec;
- unsigned char save_control, save_freq_select;
- unsigned int yrs;
-#ifdef CONFIG_MACH_DECSTATION
- unsigned int real_yrs, leap_yr;
-#endif
- unsigned char century = 0;
-
- yrs = time->tm_year;
- mon = time->tm_mon + 1; /* tm_mon starts at zero */
- day = time->tm_mday;
- hrs = time->tm_hour;
- min = time->tm_min;
- sec = time->tm_sec;
-
- if (yrs > 255) /* They are unsigned */
- return -EINVAL;
-
- spin_lock_irqsave(&rtc_lock, flags);
-#ifdef CONFIG_MACH_DECSTATION
- real_yrs = yrs;
- leap_yr = ((!((yrs + 1900) % 4) && ((yrs + 1900) % 100)) ||
- !((yrs + 1900) % 400));
- yrs = 72;
-
- /*
- * We want to keep the year set to 73 until March
- * for non-leap years, so that Feb, 29th is handled
- * correctly.
- */
- if (!leap_yr && mon < 3) {
- real_yrs--;
- yrs = 73;
- }
-#endif
-
-#ifdef CONFIG_ACPI
- if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
- acpi_gbl_FADT.century) {
- century = (yrs + 1900) / 100;
- yrs %= 100;
- }
-#endif
-
- /* These limits and adjustments are independent of
- * whether the chip is in binary mode or not.
- */
- if (yrs > 169) {
- spin_unlock_irqrestore(&rtc_lock, flags);
- return -EINVAL;
- }
-
- if (yrs >= 100)
- yrs -= 100;
-
- if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY)
- || RTC_ALWAYS_BCD) {
- sec = bin2bcd(sec);
- min = bin2bcd(min);
- hrs = bin2bcd(hrs);
- day = bin2bcd(day);
- mon = bin2bcd(mon);
- yrs = bin2bcd(yrs);
- century = bin2bcd(century);
- }
-
- save_control = CMOS_READ(RTC_CONTROL);
- CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
- save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
- CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
-
-#ifdef CONFIG_MACH_DECSTATION
- CMOS_WRITE(real_yrs, RTC_DEC_YEAR);
-#endif
- CMOS_WRITE(yrs, RTC_YEAR);
- CMOS_WRITE(mon, RTC_MONTH);
- CMOS_WRITE(day, RTC_DAY_OF_MONTH);
- CMOS_WRITE(hrs, RTC_HOURS);
- CMOS_WRITE(min, RTC_MINUTES);
- CMOS_WRITE(sec, RTC_SECONDS);
-#ifdef CONFIG_ACPI
- if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
- acpi_gbl_FADT.century)
- CMOS_WRITE(century, acpi_gbl_FADT.century);
-#endif
-
- CMOS_WRITE(save_control, RTC_CONTROL);
- CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
-
- spin_unlock_irqrestore(&rtc_lock, flags);
-
- return 0;
-}
-
-#ifndef set_rtc_time
-#define set_rtc_time __set_rtc_time
-#endif
-
static inline unsigned int get_rtc_ss(void)
{
struct rtc_time h;
diff --git a/include/linux/mc146818rtc.h b/include/linux/mc146818rtc.h
index 433e0c74d643..e9e346b37846 100644
--- a/include/linux/mc146818rtc.h
+++ b/include/linux/mc146818rtc.h
@@ -14,6 +14,12 @@
#include <asm/io.h>
#include <linux/rtc.h> /* get the user-level API */
#include <asm/mc146818rtc.h> /* register access macros */
+#include <linux/bcd.h>
+#include <linux/delay.h>
+
+#ifdef CONFIG_ACPI
+#include <linux/acpi.h>
+#endif
#ifdef __KERNEL__
#include <linux/spinlock.h> /* spinlock_t */
@@ -120,4 +126,192 @@ struct cmos_rtc_board_info {
#define RTC_IO_EXTENT_USED RTC_IO_EXTENT
#endif /* ARCH_RTC_LOCATION */
+/*
+ * Returns true if a clock update is in progress
+ */
+static inline unsigned char mc146818_is_updating(void)
+{
+ unsigned char uip;
+ unsigned long flags;
+
+ spin_lock_irqsave(&rtc_lock, flags);
+ uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP);
+ spin_unlock_irqrestore(&rtc_lock, flags);
+ return uip;
+}
+
+static inline unsigned int mc146818_get_time(struct rtc_time *time)
+{
+ unsigned char ctrl;
+ unsigned long flags;
+ unsigned char century = 0;
+
+#ifdef CONFIG_MACH_DECSTATION
+ unsigned int real_year;
+#endif
+
+ /*
+ * read RTC once any update in progress is done. The update
+ * can take just over 2ms. We wait 20ms. There is no need to
+ * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP.
+ * If you need to know *exactly* when a second has started, enable
+ * periodic update complete interrupts, (via ioctl) and then
+ * immediately read /dev/rtc which will block until you get the IRQ.
+ * Once the read clears, read the RTC time (again via ioctl). Easy.
+ */
+ if (mc146818_is_updating())
+ mdelay(20);
+
+ /*
+ * Only the values that we read from the RTC are set. We leave
+ * tm_wday, tm_yday and tm_isdst untouched. Even though the
+ * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
+ * by the RTC when initially set to a non-zero value.
+ */
+ spin_lock_irqsave(&rtc_lock, flags);
+ time->tm_sec = CMOS_READ(RTC_SECONDS);
+ time->tm_min = CMOS_READ(RTC_MINUTES);
+ time->tm_hour = CMOS_READ(RTC_HOURS);
+ time->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);
+ time->tm_mon = CMOS_READ(RTC_MONTH);
+ time->tm_year = CMOS_READ(RTC_YEAR);
+#ifdef CONFIG_MACH_DECSTATION
+ real_year = CMOS_READ(RTC_DEC_YEAR);
+#endif
+#ifdef CONFIG_ACPI
+ if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
+ acpi_gbl_FADT.century)
+ century = CMOS_READ(acpi_gbl_FADT.century);
+#endif
+ ctrl = CMOS_READ(RTC_CONTROL);
+ spin_unlock_irqrestore(&rtc_lock, flags);
+
+ if (!(ctrl & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
+ {
+ time->tm_sec = bcd2bin(time->tm_sec);
+ time->tm_min = bcd2bin(time->tm_min);
+ time->tm_hour = bcd2bin(time->tm_hour);
+ time->tm_mday = bcd2bin(time->tm_mday);
+ time->tm_mon = bcd2bin(time->tm_mon);
+ time->tm_year = bcd2bin(time->tm_year);
+ century = bcd2bin(century);
+ }
+
+#ifdef CONFIG_MACH_DECSTATION
+ time->tm_year += real_year - 72;
+#endif
+
+ if (century)
+ time->tm_year += (century - 19) * 100;
+
+ /*
+ * Account for differences between how the RTC uses the values
+ * and how they are defined in a struct rtc_time;
+ */
+ if (time->tm_year <= 69)
+ time->tm_year += 100;
+
+ time->tm_mon--;
+
+ return RTC_24H;
+}
+
+/* Set the current date and time in the real time clock. */
+static inline int mc146818_set_time(struct rtc_time *time)
+{
+ unsigned long flags;
+ unsigned char mon, day, hrs, min, sec;
+ unsigned char save_control, save_freq_select;
+ unsigned int yrs;
+#ifdef CONFIG_MACH_DECSTATION
+ unsigned int real_yrs, leap_yr;
+#endif
+ unsigned char century = 0;
+
+ yrs = time->tm_year;
+ mon = time->tm_mon + 1; /* tm_mon starts at zero */
+ day = time->tm_mday;
+ hrs = time->tm_hour;
+ min = time->tm_min;
+ sec = time->tm_sec;
+
+ if (yrs > 255) /* They are unsigned */
+ return -EINVAL;
+
+ spin_lock_irqsave(&rtc_lock, flags);
+#ifdef CONFIG_MACH_DECSTATION
+ real_yrs = yrs;
+ leap_yr = ((!((yrs + 1900) % 4) && ((yrs + 1900) % 100)) ||
+ !((yrs + 1900) % 400));
+ yrs = 72;
+
+ /*
+ * We want to keep the year set to 73 until March
+ * for non-leap years, so that Feb, 29th is handled
+ * correctly.
+ */
+ if (!leap_yr && mon < 3) {
+ real_yrs--;
+ yrs = 73;
+ }
+#endif
+
+#ifdef CONFIG_ACPI
+ if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
+ acpi_gbl_FADT.century) {
+ century = (yrs + 1900) / 100;
+ yrs %= 100;
+ }
+#endif
+
+ /* These limits and adjustments are independent of
+ * whether the chip is in binary mode or not.
+ */
+ if (yrs > 169) {
+ spin_unlock_irqrestore(&rtc_lock, flags);
+ return -EINVAL;
+ }
+
+ if (yrs >= 100)
+ yrs -= 100;
+
+ if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY)
+ || RTC_ALWAYS_BCD) {
+ sec = bin2bcd(sec);
+ min = bin2bcd(min);
+ hrs = bin2bcd(hrs);
+ day = bin2bcd(day);
+ mon = bin2bcd(mon);
+ yrs = bin2bcd(yrs);
+ century = bin2bcd(century);
+ }
+
+ save_control = CMOS_READ(RTC_CONTROL);
+ CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
+ save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
+ CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
+
+#ifdef CONFIG_MACH_DECSTATION
+ CMOS_WRITE(real_yrs, RTC_DEC_YEAR);
+#endif
+ CMOS_WRITE(yrs, RTC_YEAR);
+ CMOS_WRITE(mon, RTC_MONTH);
+ CMOS_WRITE(day, RTC_DAY_OF_MONTH);
+ CMOS_WRITE(hrs, RTC_HOURS);
+ CMOS_WRITE(min, RTC_MINUTES);
+ CMOS_WRITE(sec, RTC_SECONDS);
+#ifdef CONFIG_ACPI
+ if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
+ acpi_gbl_FADT.century)
+ CMOS_WRITE(century, acpi_gbl_FADT.century);
+#endif
+
+ CMOS_WRITE(save_control, RTC_CONTROL);
+ CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
+
+ spin_unlock_irqrestore(&rtc_lock, flags);
+
+ return 0;
+}
+
#endif /* _MC146818RTC_H */
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [rtc-linux] [PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
Drivers should not really include stuff from asm-generic directly,
and the PC-style cmos rtc driver does this in order to reuse the
mc146818 implementation of get_rtc_time/set_rtc_time rather than
the architecture specific one for the architecture it gets built for.
To make it more obvious what is going on, this moves and renames the
two functions into include/linux/mc146818rtc.h, which holds the
other mc146818 specific code. Ideally it would be in a .c file,
but that would require extra infrastructure as the functions are
called by multiple drivers with conflicting dependencies.
With this change, the asm-generic/rtc.h header also becomes much
more generic, so it can be reused more easily across any architecture
that still relies on the genrtc driver.
The only caller of the internal __get_rtc_time/__set_rtc_time
functions is in arch/alpha/kernel/rtc.c, and we just change those
over to the new naming.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
arch/alpha/kernel/rtc.c | 6 +-
arch/x86/include/asm/mc146818rtc.h | 1 -
drivers/rtc/rtc-cmos.c | 12 +--
include/asm-generic/rtc.h | 206 +------------------------------------
include/linux/mc146818rtc.h | 194 ++++++++++++++++++++++++++++++++++
5 files changed, 207 insertions(+), 212 deletions(-)
diff --git a/arch/alpha/kernel/rtc.c b/arch/alpha/kernel/rtc.c
index f535a3fd0f60..ceed68c7500b 100644
--- a/arch/alpha/kernel/rtc.c
+++ b/arch/alpha/kernel/rtc.c
@@ -15,8 +15,6 @@
#include <linux/rtc.h>
#include <linux/platform_device.h>
-#include <asm/rtc.h>
-
#include "proto.h"
@@ -81,7 +79,7 @@ init_rtc_epoch(void)
static int
alpha_rtc_read_time(struct device *dev, struct rtc_time *tm)
{
- __get_rtc_time(tm);
+ mc146818_get_time(tm);
/* Adjust for non-default epochs. It's easier to depend on the
generic __get_rtc_time and adjust the epoch here than create
@@ -112,7 +110,7 @@ alpha_rtc_set_time(struct device *dev, struct rtc_time *tm)
tm = &xtm;
}
- return __set_rtc_time(tm);
+ return mc146818_set_time(tm);
}
static int
diff --git a/arch/x86/include/asm/mc146818rtc.h b/arch/x86/include/asm/mc146818rtc.h
index 0f555cc31984..24acd9ba7837 100644
--- a/arch/x86/include/asm/mc146818rtc.h
+++ b/arch/x86/include/asm/mc146818rtc.h
@@ -6,7 +6,6 @@
#include <asm/io.h>
#include <asm/processor.h>
-#include <linux/mc146818rtc.h>
#ifndef RTC_PORT
#define RTC_PORT(x) (0x70 + (x))
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 84fb541038be..c7993f18edfa 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -43,7 +43,7 @@
#include <linux/of_platform.h>
/* this is for "generic access to PC-style RTC" using CMOS_READ/CMOS_WRITE */
-#include <asm-generic/rtc.h>
+#include <linux/mc146818rtc.h>
struct cmos_rtc {
struct rtc_device *rtc;
@@ -190,10 +190,10 @@ static inline void cmos_write_bank2(unsigned char val, unsigned char addr)
static int cmos_read_time(struct device *dev, struct rtc_time *t)
{
/* REVISIT: if the clock has a "century" register, use
- * that instead of the heuristic in get_rtc_time().
+ * that instead of the heuristic in mc146818_get_time().
* That'll make Y3K compatility (year > 2070) easy!
*/
- get_rtc_time(t);
+ mc146818_get_time(t);
return 0;
}
@@ -205,7 +205,7 @@ static int cmos_set_time(struct device *dev, struct rtc_time *t)
* takes effect exactly 500ms after we write the register.
* (Also queueing and other delays before we get this far.)
*/
- return set_rtc_time(t);
+ return mc146818_set_time(t);
}
static int cmos_read_alarm(struct device *dev, struct rtc_wkalrm *t)
@@ -1142,14 +1142,14 @@ static __init void cmos_of_init(struct platform_device *pdev)
if (val)
CMOS_WRITE(be32_to_cpup(val), RTC_FREQ_SELECT);
- get_rtc_time(&time);
+ cmos_read_time(&pdev->dev, &time);
ret = rtc_valid_tm(&time);
if (ret) {
struct rtc_time def_time = {
.tm_year = 1,
.tm_mday = 1,
};
- set_rtc_time(&def_time);
+ cmos_set_time(&pdev->dev, &def_time);
}
}
#else
diff --git a/include/asm-generic/rtc.h b/include/asm-generic/rtc.h
index 4e3b6558331e..4fcff22cd707 100644
--- a/include/asm-generic/rtc.h
+++ b/include/asm-generic/rtc.h
@@ -12,12 +12,12 @@
#ifndef __ASM_RTC_H__
#define __ASM_RTC_H__
-#include <linux/mc146818rtc.h>
#include <linux/rtc.h>
-#include <linux/bcd.h>
-#include <linux/delay.h>
-#ifdef CONFIG_ACPI
-#include <linux/acpi.h>
+
+#ifndef get_rtc_time
+#include <linux/mc146818rtc.h>
+#define get_rtc_time mc146818_get_time
+#define set_rtc_time mc146818_set_time
#endif
#define RTC_PIE 0x40 /* periodic interrupt enable */
@@ -31,202 +31,6 @@
#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-/*
- * Returns true if a clock update is in progress
- */
-static inline unsigned char rtc_is_updating(void)
-{
- unsigned char uip;
- unsigned long flags;
-
- spin_lock_irqsave(&rtc_lock, flags);
- uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP);
- spin_unlock_irqrestore(&rtc_lock, flags);
- return uip;
-}
-
-static inline unsigned int __get_rtc_time(struct rtc_time *time)
-{
- unsigned char ctrl;
- unsigned long flags;
- unsigned char century = 0;
-
-#ifdef CONFIG_MACH_DECSTATION
- unsigned int real_year;
-#endif
-
- /*
- * read RTC once any update in progress is done. The update
- * can take just over 2ms. We wait 20ms. There is no need to
- * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP.
- * If you need to know *exactly* when a second has started, enable
- * periodic update complete interrupts, (via ioctl) and then
- * immediately read /dev/rtc which will block until you get the IRQ.
- * Once the read clears, read the RTC time (again via ioctl). Easy.
- */
- if (rtc_is_updating())
- mdelay(20);
-
- /*
- * Only the values that we read from the RTC are set. We leave
- * tm_wday, tm_yday and tm_isdst untouched. Even though the
- * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
- * by the RTC when initially set to a non-zero value.
- */
- spin_lock_irqsave(&rtc_lock, flags);
- time->tm_sec = CMOS_READ(RTC_SECONDS);
- time->tm_min = CMOS_READ(RTC_MINUTES);
- time->tm_hour = CMOS_READ(RTC_HOURS);
- time->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);
- time->tm_mon = CMOS_READ(RTC_MONTH);
- time->tm_year = CMOS_READ(RTC_YEAR);
-#ifdef CONFIG_MACH_DECSTATION
- real_year = CMOS_READ(RTC_DEC_YEAR);
-#endif
-#ifdef CONFIG_ACPI
- if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
- acpi_gbl_FADT.century)
- century = CMOS_READ(acpi_gbl_FADT.century);
-#endif
- ctrl = CMOS_READ(RTC_CONTROL);
- spin_unlock_irqrestore(&rtc_lock, flags);
-
- if (!(ctrl & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
- {
- time->tm_sec = bcd2bin(time->tm_sec);
- time->tm_min = bcd2bin(time->tm_min);
- time->tm_hour = bcd2bin(time->tm_hour);
- time->tm_mday = bcd2bin(time->tm_mday);
- time->tm_mon = bcd2bin(time->tm_mon);
- time->tm_year = bcd2bin(time->tm_year);
- century = bcd2bin(century);
- }
-
-#ifdef CONFIG_MACH_DECSTATION
- time->tm_year += real_year - 72;
-#endif
-
- if (century)
- time->tm_year += (century - 19) * 100;
-
- /*
- * Account for differences between how the RTC uses the values
- * and how they are defined in a struct rtc_time;
- */
- if (time->tm_year <= 69)
- time->tm_year += 100;
-
- time->tm_mon--;
-
- return RTC_24H;
-}
-
-#ifndef get_rtc_time
-#define get_rtc_time __get_rtc_time
-#endif
-
-/* Set the current date and time in the real time clock. */
-static inline int __set_rtc_time(struct rtc_time *time)
-{
- unsigned long flags;
- unsigned char mon, day, hrs, min, sec;
- unsigned char save_control, save_freq_select;
- unsigned int yrs;
-#ifdef CONFIG_MACH_DECSTATION
- unsigned int real_yrs, leap_yr;
-#endif
- unsigned char century = 0;
-
- yrs = time->tm_year;
- mon = time->tm_mon + 1; /* tm_mon starts at zero */
- day = time->tm_mday;
- hrs = time->tm_hour;
- min = time->tm_min;
- sec = time->tm_sec;
-
- if (yrs > 255) /* They are unsigned */
- return -EINVAL;
-
- spin_lock_irqsave(&rtc_lock, flags);
-#ifdef CONFIG_MACH_DECSTATION
- real_yrs = yrs;
- leap_yr = ((!((yrs + 1900) % 4) && ((yrs + 1900) % 100)) ||
- !((yrs + 1900) % 400));
- yrs = 72;
-
- /*
- * We want to keep the year set to 73 until March
- * for non-leap years, so that Feb, 29th is handled
- * correctly.
- */
- if (!leap_yr && mon < 3) {
- real_yrs--;
- yrs = 73;
- }
-#endif
-
-#ifdef CONFIG_ACPI
- if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
- acpi_gbl_FADT.century) {
- century = (yrs + 1900) / 100;
- yrs %= 100;
- }
-#endif
-
- /* These limits and adjustments are independent of
- * whether the chip is in binary mode or not.
- */
- if (yrs > 169) {
- spin_unlock_irqrestore(&rtc_lock, flags);
- return -EINVAL;
- }
-
- if (yrs >= 100)
- yrs -= 100;
-
- if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY)
- || RTC_ALWAYS_BCD) {
- sec = bin2bcd(sec);
- min = bin2bcd(min);
- hrs = bin2bcd(hrs);
- day = bin2bcd(day);
- mon = bin2bcd(mon);
- yrs = bin2bcd(yrs);
- century = bin2bcd(century);
- }
-
- save_control = CMOS_READ(RTC_CONTROL);
- CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
- save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
- CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
-
-#ifdef CONFIG_MACH_DECSTATION
- CMOS_WRITE(real_yrs, RTC_DEC_YEAR);
-#endif
- CMOS_WRITE(yrs, RTC_YEAR);
- CMOS_WRITE(mon, RTC_MONTH);
- CMOS_WRITE(day, RTC_DAY_OF_MONTH);
- CMOS_WRITE(hrs, RTC_HOURS);
- CMOS_WRITE(min, RTC_MINUTES);
- CMOS_WRITE(sec, RTC_SECONDS);
-#ifdef CONFIG_ACPI
- if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
- acpi_gbl_FADT.century)
- CMOS_WRITE(century, acpi_gbl_FADT.century);
-#endif
-
- CMOS_WRITE(save_control, RTC_CONTROL);
- CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
-
- spin_unlock_irqrestore(&rtc_lock, flags);
-
- return 0;
-}
-
-#ifndef set_rtc_time
-#define set_rtc_time __set_rtc_time
-#endif
-
static inline unsigned int get_rtc_ss(void)
{
struct rtc_time h;
diff --git a/include/linux/mc146818rtc.h b/include/linux/mc146818rtc.h
index 433e0c74d643..e9e346b37846 100644
--- a/include/linux/mc146818rtc.h
+++ b/include/linux/mc146818rtc.h
@@ -14,6 +14,12 @@
#include <asm/io.h>
#include <linux/rtc.h> /* get the user-level API */
#include <asm/mc146818rtc.h> /* register access macros */
+#include <linux/bcd.h>
+#include <linux/delay.h>
+
+#ifdef CONFIG_ACPI
+#include <linux/acpi.h>
+#endif
#ifdef __KERNEL__
#include <linux/spinlock.h> /* spinlock_t */
@@ -120,4 +126,192 @@ struct cmos_rtc_board_info {
#define RTC_IO_EXTENT_USED RTC_IO_EXTENT
#endif /* ARCH_RTC_LOCATION */
+/*
+ * Returns true if a clock update is in progress
+ */
+static inline unsigned char mc146818_is_updating(void)
+{
+ unsigned char uip;
+ unsigned long flags;
+
+ spin_lock_irqsave(&rtc_lock, flags);
+ uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP);
+ spin_unlock_irqrestore(&rtc_lock, flags);
+ return uip;
+}
+
+static inline unsigned int mc146818_get_time(struct rtc_time *time)
+{
+ unsigned char ctrl;
+ unsigned long flags;
+ unsigned char century = 0;
+
+#ifdef CONFIG_MACH_DECSTATION
+ unsigned int real_year;
+#endif
+
+ /*
+ * read RTC once any update in progress is done. The update
+ * can take just over 2ms. We wait 20ms. There is no need to
+ * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP.
+ * If you need to know *exactly* when a second has started, enable
+ * periodic update complete interrupts, (via ioctl) and then
+ * immediately read /dev/rtc which will block until you get the IRQ.
+ * Once the read clears, read the RTC time (again via ioctl). Easy.
+ */
+ if (mc146818_is_updating())
+ mdelay(20);
+
+ /*
+ * Only the values that we read from the RTC are set. We leave
+ * tm_wday, tm_yday and tm_isdst untouched. Even though the
+ * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
+ * by the RTC when initially set to a non-zero value.
+ */
+ spin_lock_irqsave(&rtc_lock, flags);
+ time->tm_sec = CMOS_READ(RTC_SECONDS);
+ time->tm_min = CMOS_READ(RTC_MINUTES);
+ time->tm_hour = CMOS_READ(RTC_HOURS);
+ time->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);
+ time->tm_mon = CMOS_READ(RTC_MONTH);
+ time->tm_year = CMOS_READ(RTC_YEAR);
+#ifdef CONFIG_MACH_DECSTATION
+ real_year = CMOS_READ(RTC_DEC_YEAR);
+#endif
+#ifdef CONFIG_ACPI
+ if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
+ acpi_gbl_FADT.century)
+ century = CMOS_READ(acpi_gbl_FADT.century);
+#endif
+ ctrl = CMOS_READ(RTC_CONTROL);
+ spin_unlock_irqrestore(&rtc_lock, flags);
+
+ if (!(ctrl & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
+ {
+ time->tm_sec = bcd2bin(time->tm_sec);
+ time->tm_min = bcd2bin(time->tm_min);
+ time->tm_hour = bcd2bin(time->tm_hour);
+ time->tm_mday = bcd2bin(time->tm_mday);
+ time->tm_mon = bcd2bin(time->tm_mon);
+ time->tm_year = bcd2bin(time->tm_year);
+ century = bcd2bin(century);
+ }
+
+#ifdef CONFIG_MACH_DECSTATION
+ time->tm_year += real_year - 72;
+#endif
+
+ if (century)
+ time->tm_year += (century - 19) * 100;
+
+ /*
+ * Account for differences between how the RTC uses the values
+ * and how they are defined in a struct rtc_time;
+ */
+ if (time->tm_year <= 69)
+ time->tm_year += 100;
+
+ time->tm_mon--;
+
+ return RTC_24H;
+}
+
+/* Set the current date and time in the real time clock. */
+static inline int mc146818_set_time(struct rtc_time *time)
+{
+ unsigned long flags;
+ unsigned char mon, day, hrs, min, sec;
+ unsigned char save_control, save_freq_select;
+ unsigned int yrs;
+#ifdef CONFIG_MACH_DECSTATION
+ unsigned int real_yrs, leap_yr;
+#endif
+ unsigned char century = 0;
+
+ yrs = time->tm_year;
+ mon = time->tm_mon + 1; /* tm_mon starts at zero */
+ day = time->tm_mday;
+ hrs = time->tm_hour;
+ min = time->tm_min;
+ sec = time->tm_sec;
+
+ if (yrs > 255) /* They are unsigned */
+ return -EINVAL;
+
+ spin_lock_irqsave(&rtc_lock, flags);
+#ifdef CONFIG_MACH_DECSTATION
+ real_yrs = yrs;
+ leap_yr = ((!((yrs + 1900) % 4) && ((yrs + 1900) % 100)) ||
+ !((yrs + 1900) % 400));
+ yrs = 72;
+
+ /*
+ * We want to keep the year set to 73 until March
+ * for non-leap years, so that Feb, 29th is handled
+ * correctly.
+ */
+ if (!leap_yr && mon < 3) {
+ real_yrs--;
+ yrs = 73;
+ }
+#endif
+
+#ifdef CONFIG_ACPI
+ if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
+ acpi_gbl_FADT.century) {
+ century = (yrs + 1900) / 100;
+ yrs %= 100;
+ }
+#endif
+
+ /* These limits and adjustments are independent of
+ * whether the chip is in binary mode or not.
+ */
+ if (yrs > 169) {
+ spin_unlock_irqrestore(&rtc_lock, flags);
+ return -EINVAL;
+ }
+
+ if (yrs >= 100)
+ yrs -= 100;
+
+ if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY)
+ || RTC_ALWAYS_BCD) {
+ sec = bin2bcd(sec);
+ min = bin2bcd(min);
+ hrs = bin2bcd(hrs);
+ day = bin2bcd(day);
+ mon = bin2bcd(mon);
+ yrs = bin2bcd(yrs);
+ century = bin2bcd(century);
+ }
+
+ save_control = CMOS_READ(RTC_CONTROL);
+ CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
+ save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
+ CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
+
+#ifdef CONFIG_MACH_DECSTATION
+ CMOS_WRITE(real_yrs, RTC_DEC_YEAR);
+#endif
+ CMOS_WRITE(yrs, RTC_YEAR);
+ CMOS_WRITE(mon, RTC_MONTH);
+ CMOS_WRITE(day, RTC_DAY_OF_MONTH);
+ CMOS_WRITE(hrs, RTC_HOURS);
+ CMOS_WRITE(min, RTC_MINUTES);
+ CMOS_WRITE(sec, RTC_SECONDS);
+#ifdef CONFIG_ACPI
+ if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
+ acpi_gbl_FADT.century)
+ CMOS_WRITE(century, acpi_gbl_FADT.century);
+#endif
+
+ CMOS_WRITE(save_control, RTC_CONTROL);
+ CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
+
+ spin_unlock_irqrestore(&rtc_lock, flags);
+
+ return 0;
+}
+
#endif /* _MC146818RTC_H */
--
2.7.0
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
Drivers should not really include stuff from asm-generic directly,
and the PC-style cmos rtc driver does this in order to reuse the
mc146818 implementation of get_rtc_time/set_rtc_time rather than
the architecture specific one for the architecture it gets built for.
To make it more obvious what is going on, this moves and renames the
two functions into include/linux/mc146818rtc.h, which holds the
other mc146818 specific code. Ideally it would be in a .c file,
but that would require extra infrastructure as the functions are
called by multiple drivers with conflicting dependencies.
With this change, the asm-generic/rtc.h header also becomes much
more generic, so it can be reused more easily across any architecture
that still relies on the genrtc driver.
The only caller of the internal __get_rtc_time/__set_rtc_time
functions is in arch/alpha/kernel/rtc.c, and we just change those
over to the new naming.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
arch/alpha/kernel/rtc.c | 6 +-
arch/x86/include/asm/mc146818rtc.h | 1 -
drivers/rtc/rtc-cmos.c | 12 +--
include/asm-generic/rtc.h | 206 +------------------------------------
include/linux/mc146818rtc.h | 194 ++++++++++++++++++++++++++++++++++
5 files changed, 207 insertions(+), 212 deletions(-)
diff --git a/arch/alpha/kernel/rtc.c b/arch/alpha/kernel/rtc.c
index f535a3fd0f60..ceed68c7500b 100644
--- a/arch/alpha/kernel/rtc.c
+++ b/arch/alpha/kernel/rtc.c
@@ -15,8 +15,6 @@
#include <linux/rtc.h>
#include <linux/platform_device.h>
-#include <asm/rtc.h>
-
#include "proto.h"
@@ -81,7 +79,7 @@ init_rtc_epoch(void)
static int
alpha_rtc_read_time(struct device *dev, struct rtc_time *tm)
{
- __get_rtc_time(tm);
+ mc146818_get_time(tm);
/* Adjust for non-default epochs. It's easier to depend on the
generic __get_rtc_time and adjust the epoch here than create
@@ -112,7 +110,7 @@ alpha_rtc_set_time(struct device *dev, struct rtc_time *tm)
tm = &xtm;
}
- return __set_rtc_time(tm);
+ return mc146818_set_time(tm);
}
static int
diff --git a/arch/x86/include/asm/mc146818rtc.h b/arch/x86/include/asm/mc146818rtc.h
index 0f555cc31984..24acd9ba7837 100644
--- a/arch/x86/include/asm/mc146818rtc.h
+++ b/arch/x86/include/asm/mc146818rtc.h
@@ -6,7 +6,6 @@
#include <asm/io.h>
#include <asm/processor.h>
-#include <linux/mc146818rtc.h>
#ifndef RTC_PORT
#define RTC_PORT(x) (0x70 + (x))
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 84fb541038be..c7993f18edfa 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -43,7 +43,7 @@
#include <linux/of_platform.h>
/* this is for "generic access to PC-style RTC" using CMOS_READ/CMOS_WRITE */
-#include <asm-generic/rtc.h>
+#include <linux/mc146818rtc.h>
struct cmos_rtc {
struct rtc_device *rtc;
@@ -190,10 +190,10 @@ static inline void cmos_write_bank2(unsigned char val, unsigned char addr)
static int cmos_read_time(struct device *dev, struct rtc_time *t)
{
/* REVISIT: if the clock has a "century" register, use
- * that instead of the heuristic in get_rtc_time().
+ * that instead of the heuristic in mc146818_get_time().
* That'll make Y3K compatility (year > 2070) easy!
*/
- get_rtc_time(t);
+ mc146818_get_time(t);
return 0;
}
@@ -205,7 +205,7 @@ static int cmos_set_time(struct device *dev, struct rtc_time *t)
* takes effect exactly 500ms after we write the register.
* (Also queueing and other delays before we get this far.)
*/
- return set_rtc_time(t);
+ return mc146818_set_time(t);
}
static int cmos_read_alarm(struct device *dev, struct rtc_wkalrm *t)
@@ -1142,14 +1142,14 @@ static __init void cmos_of_init(struct platform_device *pdev)
if (val)
CMOS_WRITE(be32_to_cpup(val), RTC_FREQ_SELECT);
- get_rtc_time(&time);
+ cmos_read_time(&pdev->dev, &time);
ret = rtc_valid_tm(&time);
if (ret) {
struct rtc_time def_time = {
.tm_year = 1,
.tm_mday = 1,
};
- set_rtc_time(&def_time);
+ cmos_set_time(&pdev->dev, &def_time);
}
}
#else
diff --git a/include/asm-generic/rtc.h b/include/asm-generic/rtc.h
index 4e3b6558331e..4fcff22cd707 100644
--- a/include/asm-generic/rtc.h
+++ b/include/asm-generic/rtc.h
@@ -12,12 +12,12 @@
#ifndef __ASM_RTC_H__
#define __ASM_RTC_H__
-#include <linux/mc146818rtc.h>
#include <linux/rtc.h>
-#include <linux/bcd.h>
-#include <linux/delay.h>
-#ifdef CONFIG_ACPI
-#include <linux/acpi.h>
+
+#ifndef get_rtc_time
+#include <linux/mc146818rtc.h>
+#define get_rtc_time mc146818_get_time
+#define set_rtc_time mc146818_set_time
#endif
#define RTC_PIE 0x40 /* periodic interrupt enable */
@@ -31,202 +31,6 @@
#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-/*
- * Returns true if a clock update is in progress
- */
-static inline unsigned char rtc_is_updating(void)
-{
- unsigned char uip;
- unsigned long flags;
-
- spin_lock_irqsave(&rtc_lock, flags);
- uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP);
- spin_unlock_irqrestore(&rtc_lock, flags);
- return uip;
-}
-
-static inline unsigned int __get_rtc_time(struct rtc_time *time)
-{
- unsigned char ctrl;
- unsigned long flags;
- unsigned char century = 0;
-
-#ifdef CONFIG_MACH_DECSTATION
- unsigned int real_year;
-#endif
-
- /*
- * read RTC once any update in progress is done. The update
- * can take just over 2ms. We wait 20ms. There is no need to
- * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP.
- * If you need to know *exactly* when a second has started, enable
- * periodic update complete interrupts, (via ioctl) and then
- * immediately read /dev/rtc which will block until you get the IRQ.
- * Once the read clears, read the RTC time (again via ioctl). Easy.
- */
- if (rtc_is_updating())
- mdelay(20);
-
- /*
- * Only the values that we read from the RTC are set. We leave
- * tm_wday, tm_yday and tm_isdst untouched. Even though the
- * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
- * by the RTC when initially set to a non-zero value.
- */
- spin_lock_irqsave(&rtc_lock, flags);
- time->tm_sec = CMOS_READ(RTC_SECONDS);
- time->tm_min = CMOS_READ(RTC_MINUTES);
- time->tm_hour = CMOS_READ(RTC_HOURS);
- time->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);
- time->tm_mon = CMOS_READ(RTC_MONTH);
- time->tm_year = CMOS_READ(RTC_YEAR);
-#ifdef CONFIG_MACH_DECSTATION
- real_year = CMOS_READ(RTC_DEC_YEAR);
-#endif
-#ifdef CONFIG_ACPI
- if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
- acpi_gbl_FADT.century)
- century = CMOS_READ(acpi_gbl_FADT.century);
-#endif
- ctrl = CMOS_READ(RTC_CONTROL);
- spin_unlock_irqrestore(&rtc_lock, flags);
-
- if (!(ctrl & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
- {
- time->tm_sec = bcd2bin(time->tm_sec);
- time->tm_min = bcd2bin(time->tm_min);
- time->tm_hour = bcd2bin(time->tm_hour);
- time->tm_mday = bcd2bin(time->tm_mday);
- time->tm_mon = bcd2bin(time->tm_mon);
- time->tm_year = bcd2bin(time->tm_year);
- century = bcd2bin(century);
- }
-
-#ifdef CONFIG_MACH_DECSTATION
- time->tm_year += real_year - 72;
-#endif
-
- if (century)
- time->tm_year += (century - 19) * 100;
-
- /*
- * Account for differences between how the RTC uses the values
- * and how they are defined in a struct rtc_time;
- */
- if (time->tm_year <= 69)
- time->tm_year += 100;
-
- time->tm_mon--;
-
- return RTC_24H;
-}
-
-#ifndef get_rtc_time
-#define get_rtc_time __get_rtc_time
-#endif
-
-/* Set the current date and time in the real time clock. */
-static inline int __set_rtc_time(struct rtc_time *time)
-{
- unsigned long flags;
- unsigned char mon, day, hrs, min, sec;
- unsigned char save_control, save_freq_select;
- unsigned int yrs;
-#ifdef CONFIG_MACH_DECSTATION
- unsigned int real_yrs, leap_yr;
-#endif
- unsigned char century = 0;
-
- yrs = time->tm_year;
- mon = time->tm_mon + 1; /* tm_mon starts at zero */
- day = time->tm_mday;
- hrs = time->tm_hour;
- min = time->tm_min;
- sec = time->tm_sec;
-
- if (yrs > 255) /* They are unsigned */
- return -EINVAL;
-
- spin_lock_irqsave(&rtc_lock, flags);
-#ifdef CONFIG_MACH_DECSTATION
- real_yrs = yrs;
- leap_yr = ((!((yrs + 1900) % 4) && ((yrs + 1900) % 100)) ||
- !((yrs + 1900) % 400));
- yrs = 72;
-
- /*
- * We want to keep the year set to 73 until March
- * for non-leap years, so that Feb, 29th is handled
- * correctly.
- */
- if (!leap_yr && mon < 3) {
- real_yrs--;
- yrs = 73;
- }
-#endif
-
-#ifdef CONFIG_ACPI
- if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
- acpi_gbl_FADT.century) {
- century = (yrs + 1900) / 100;
- yrs %= 100;
- }
-#endif
-
- /* These limits and adjustments are independent of
- * whether the chip is in binary mode or not.
- */
- if (yrs > 169) {
- spin_unlock_irqrestore(&rtc_lock, flags);
- return -EINVAL;
- }
-
- if (yrs >= 100)
- yrs -= 100;
-
- if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY)
- || RTC_ALWAYS_BCD) {
- sec = bin2bcd(sec);
- min = bin2bcd(min);
- hrs = bin2bcd(hrs);
- day = bin2bcd(day);
- mon = bin2bcd(mon);
- yrs = bin2bcd(yrs);
- century = bin2bcd(century);
- }
-
- save_control = CMOS_READ(RTC_CONTROL);
- CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
- save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
- CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
-
-#ifdef CONFIG_MACH_DECSTATION
- CMOS_WRITE(real_yrs, RTC_DEC_YEAR);
-#endif
- CMOS_WRITE(yrs, RTC_YEAR);
- CMOS_WRITE(mon, RTC_MONTH);
- CMOS_WRITE(day, RTC_DAY_OF_MONTH);
- CMOS_WRITE(hrs, RTC_HOURS);
- CMOS_WRITE(min, RTC_MINUTES);
- CMOS_WRITE(sec, RTC_SECONDS);
-#ifdef CONFIG_ACPI
- if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
- acpi_gbl_FADT.century)
- CMOS_WRITE(century, acpi_gbl_FADT.century);
-#endif
-
- CMOS_WRITE(save_control, RTC_CONTROL);
- CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
-
- spin_unlock_irqrestore(&rtc_lock, flags);
-
- return 0;
-}
-
-#ifndef set_rtc_time
-#define set_rtc_time __set_rtc_time
-#endif
-
static inline unsigned int get_rtc_ss(void)
{
struct rtc_time h;
diff --git a/include/linux/mc146818rtc.h b/include/linux/mc146818rtc.h
index 433e0c74d643..e9e346b37846 100644
--- a/include/linux/mc146818rtc.h
+++ b/include/linux/mc146818rtc.h
@@ -14,6 +14,12 @@
#include <asm/io.h>
#include <linux/rtc.h> /* get the user-level API */
#include <asm/mc146818rtc.h> /* register access macros */
+#include <linux/bcd.h>
+#include <linux/delay.h>
+
+#ifdef CONFIG_ACPI
+#include <linux/acpi.h>
+#endif
#ifdef __KERNEL__
#include <linux/spinlock.h> /* spinlock_t */
@@ -120,4 +126,192 @@ struct cmos_rtc_board_info {
#define RTC_IO_EXTENT_USED RTC_IO_EXTENT
#endif /* ARCH_RTC_LOCATION */
+/*
+ * Returns true if a clock update is in progress
+ */
+static inline unsigned char mc146818_is_updating(void)
+{
+ unsigned char uip;
+ unsigned long flags;
+
+ spin_lock_irqsave(&rtc_lock, flags);
+ uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP);
+ spin_unlock_irqrestore(&rtc_lock, flags);
+ return uip;
+}
+
+static inline unsigned int mc146818_get_time(struct rtc_time *time)
+{
+ unsigned char ctrl;
+ unsigned long flags;
+ unsigned char century = 0;
+
+#ifdef CONFIG_MACH_DECSTATION
+ unsigned int real_year;
+#endif
+
+ /*
+ * read RTC once any update in progress is done. The update
+ * can take just over 2ms. We wait 20ms. There is no need to
+ * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP.
+ * If you need to know *exactly* when a second has started, enable
+ * periodic update complete interrupts, (via ioctl) and then
+ * immediately read /dev/rtc which will block until you get the IRQ.
+ * Once the read clears, read the RTC time (again via ioctl). Easy.
+ */
+ if (mc146818_is_updating())
+ mdelay(20);
+
+ /*
+ * Only the values that we read from the RTC are set. We leave
+ * tm_wday, tm_yday and tm_isdst untouched. Even though the
+ * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
+ * by the RTC when initially set to a non-zero value.
+ */
+ spin_lock_irqsave(&rtc_lock, flags);
+ time->tm_sec = CMOS_READ(RTC_SECONDS);
+ time->tm_min = CMOS_READ(RTC_MINUTES);
+ time->tm_hour = CMOS_READ(RTC_HOURS);
+ time->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);
+ time->tm_mon = CMOS_READ(RTC_MONTH);
+ time->tm_year = CMOS_READ(RTC_YEAR);
+#ifdef CONFIG_MACH_DECSTATION
+ real_year = CMOS_READ(RTC_DEC_YEAR);
+#endif
+#ifdef CONFIG_ACPI
+ if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
+ acpi_gbl_FADT.century)
+ century = CMOS_READ(acpi_gbl_FADT.century);
+#endif
+ ctrl = CMOS_READ(RTC_CONTROL);
+ spin_unlock_irqrestore(&rtc_lock, flags);
+
+ if (!(ctrl & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
+ {
+ time->tm_sec = bcd2bin(time->tm_sec);
+ time->tm_min = bcd2bin(time->tm_min);
+ time->tm_hour = bcd2bin(time->tm_hour);
+ time->tm_mday = bcd2bin(time->tm_mday);
+ time->tm_mon = bcd2bin(time->tm_mon);
+ time->tm_year = bcd2bin(time->tm_year);
+ century = bcd2bin(century);
+ }
+
+#ifdef CONFIG_MACH_DECSTATION
+ time->tm_year += real_year - 72;
+#endif
+
+ if (century)
+ time->tm_year += (century - 19) * 100;
+
+ /*
+ * Account for differences between how the RTC uses the values
+ * and how they are defined in a struct rtc_time;
+ */
+ if (time->tm_year <= 69)
+ time->tm_year += 100;
+
+ time->tm_mon--;
+
+ return RTC_24H;
+}
+
+/* Set the current date and time in the real time clock. */
+static inline int mc146818_set_time(struct rtc_time *time)
+{
+ unsigned long flags;
+ unsigned char mon, day, hrs, min, sec;
+ unsigned char save_control, save_freq_select;
+ unsigned int yrs;
+#ifdef CONFIG_MACH_DECSTATION
+ unsigned int real_yrs, leap_yr;
+#endif
+ unsigned char century = 0;
+
+ yrs = time->tm_year;
+ mon = time->tm_mon + 1; /* tm_mon starts at zero */
+ day = time->tm_mday;
+ hrs = time->tm_hour;
+ min = time->tm_min;
+ sec = time->tm_sec;
+
+ if (yrs > 255) /* They are unsigned */
+ return -EINVAL;
+
+ spin_lock_irqsave(&rtc_lock, flags);
+#ifdef CONFIG_MACH_DECSTATION
+ real_yrs = yrs;
+ leap_yr = ((!((yrs + 1900) % 4) && ((yrs + 1900) % 100)) ||
+ !((yrs + 1900) % 400));
+ yrs = 72;
+
+ /*
+ * We want to keep the year set to 73 until March
+ * for non-leap years, so that Feb, 29th is handled
+ * correctly.
+ */
+ if (!leap_yr && mon < 3) {
+ real_yrs--;
+ yrs = 73;
+ }
+#endif
+
+#ifdef CONFIG_ACPI
+ if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
+ acpi_gbl_FADT.century) {
+ century = (yrs + 1900) / 100;
+ yrs %= 100;
+ }
+#endif
+
+ /* These limits and adjustments are independent of
+ * whether the chip is in binary mode or not.
+ */
+ if (yrs > 169) {
+ spin_unlock_irqrestore(&rtc_lock, flags);
+ return -EINVAL;
+ }
+
+ if (yrs >= 100)
+ yrs -= 100;
+
+ if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY)
+ || RTC_ALWAYS_BCD) {
+ sec = bin2bcd(sec);
+ min = bin2bcd(min);
+ hrs = bin2bcd(hrs);
+ day = bin2bcd(day);
+ mon = bin2bcd(mon);
+ yrs = bin2bcd(yrs);
+ century = bin2bcd(century);
+ }
+
+ save_control = CMOS_READ(RTC_CONTROL);
+ CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
+ save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
+ CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
+
+#ifdef CONFIG_MACH_DECSTATION
+ CMOS_WRITE(real_yrs, RTC_DEC_YEAR);
+#endif
+ CMOS_WRITE(yrs, RTC_YEAR);
+ CMOS_WRITE(mon, RTC_MONTH);
+ CMOS_WRITE(day, RTC_DAY_OF_MONTH);
+ CMOS_WRITE(hrs, RTC_HOURS);
+ CMOS_WRITE(min, RTC_MINUTES);
+ CMOS_WRITE(sec, RTC_SECONDS);
+#ifdef CONFIG_ACPI
+ if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
+ acpi_gbl_FADT.century)
+ CMOS_WRITE(century, acpi_gbl_FADT.century);
+#endif
+
+ CMOS_WRITE(save_control, RTC_CONTROL);
+ CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
+
+ spin_unlock_irqrestore(&rtc_lock, flags);
+
+ return 0;
+}
+
#endif /* _MC146818RTC_H */
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
Drivers should not really include stuff from asm-generic directly,
and the PC-style cmos rtc driver does this in order to reuse the
mc146818 implementation of get_rtc_time/set_rtc_time rather than
the architecture specific one for the architecture it gets built for.
To make it more obvious what is going on, this moves and renames the
two functions into include/linux/mc146818rtc.h, which holds the
other mc146818 specific code. Ideally it would be in a .c file,
but that would require extra infrastructure as the functions are
called by multiple drivers with conflicting dependencies.
With this change, the asm-generic/rtc.h header also becomes much
more generic, so it can be reused more easily across any architecture
that still relies on the genrtc driver.
The only caller of the internal __get_rtc_time/__set_rtc_time
functions is in arch/alpha/kernel/rtc.c, and we just change those
over to the new naming.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
arch/alpha/kernel/rtc.c | 6 +-
arch/x86/include/asm/mc146818rtc.h | 1 -
drivers/rtc/rtc-cmos.c | 12 +--
include/asm-generic/rtc.h | 206 +------------------------------------
include/linux/mc146818rtc.h | 194 ++++++++++++++++++++++++++++++++++
5 files changed, 207 insertions(+), 212 deletions(-)
diff --git a/arch/alpha/kernel/rtc.c b/arch/alpha/kernel/rtc.c
index f535a3fd0f60..ceed68c7500b 100644
--- a/arch/alpha/kernel/rtc.c
+++ b/arch/alpha/kernel/rtc.c
@@ -15,8 +15,6 @@
#include <linux/rtc.h>
#include <linux/platform_device.h>
-#include <asm/rtc.h>
-
#include "proto.h"
@@ -81,7 +79,7 @@ init_rtc_epoch(void)
static int
alpha_rtc_read_time(struct device *dev, struct rtc_time *tm)
{
- __get_rtc_time(tm);
+ mc146818_get_time(tm);
/* Adjust for non-default epochs. It's easier to depend on the
generic __get_rtc_time and adjust the epoch here than create
@@ -112,7 +110,7 @@ alpha_rtc_set_time(struct device *dev, struct rtc_time *tm)
tm = &xtm;
}
- return __set_rtc_time(tm);
+ return mc146818_set_time(tm);
}
static int
diff --git a/arch/x86/include/asm/mc146818rtc.h b/arch/x86/include/asm/mc146818rtc.h
index 0f555cc31984..24acd9ba7837 100644
--- a/arch/x86/include/asm/mc146818rtc.h
+++ b/arch/x86/include/asm/mc146818rtc.h
@@ -6,7 +6,6 @@
#include <asm/io.h>
#include <asm/processor.h>
-#include <linux/mc146818rtc.h>
#ifndef RTC_PORT
#define RTC_PORT(x) (0x70 + (x))
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 84fb541038be..c7993f18edfa 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -43,7 +43,7 @@
#include <linux/of_platform.h>
/* this is for "generic access to PC-style RTC" using CMOS_READ/CMOS_WRITE */
-#include <asm-generic/rtc.h>
+#include <linux/mc146818rtc.h>
struct cmos_rtc {
struct rtc_device *rtc;
@@ -190,10 +190,10 @@ static inline void cmos_write_bank2(unsigned char val, unsigned char addr)
static int cmos_read_time(struct device *dev, struct rtc_time *t)
{
/* REVISIT: if the clock has a "century" register, use
- * that instead of the heuristic in get_rtc_time().
+ * that instead of the heuristic in mc146818_get_time().
* That'll make Y3K compatility (year > 2070) easy!
*/
- get_rtc_time(t);
+ mc146818_get_time(t);
return 0;
}
@@ -205,7 +205,7 @@ static int cmos_set_time(struct device *dev, struct rtc_time *t)
* takes effect exactly 500ms after we write the register.
* (Also queueing and other delays before we get this far.)
*/
- return set_rtc_time(t);
+ return mc146818_set_time(t);
}
static int cmos_read_alarm(struct device *dev, struct rtc_wkalrm *t)
@@ -1142,14 +1142,14 @@ static __init void cmos_of_init(struct platform_device *pdev)
if (val)
CMOS_WRITE(be32_to_cpup(val), RTC_FREQ_SELECT);
- get_rtc_time(&time);
+ cmos_read_time(&pdev->dev, &time);
ret = rtc_valid_tm(&time);
if (ret) {
struct rtc_time def_time = {
.tm_year = 1,
.tm_mday = 1,
};
- set_rtc_time(&def_time);
+ cmos_set_time(&pdev->dev, &def_time);
}
}
#else
diff --git a/include/asm-generic/rtc.h b/include/asm-generic/rtc.h
index 4e3b6558331e..4fcff22cd707 100644
--- a/include/asm-generic/rtc.h
+++ b/include/asm-generic/rtc.h
@@ -12,12 +12,12 @@
#ifndef __ASM_RTC_H__
#define __ASM_RTC_H__
-#include <linux/mc146818rtc.h>
#include <linux/rtc.h>
-#include <linux/bcd.h>
-#include <linux/delay.h>
-#ifdef CONFIG_ACPI
-#include <linux/acpi.h>
+
+#ifndef get_rtc_time
+#include <linux/mc146818rtc.h>
+#define get_rtc_time mc146818_get_time
+#define set_rtc_time mc146818_set_time
#endif
#define RTC_PIE 0x40 /* periodic interrupt enable */
@@ -31,202 +31,6 @@
#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-/*
- * Returns true if a clock update is in progress
- */
-static inline unsigned char rtc_is_updating(void)
-{
- unsigned char uip;
- unsigned long flags;
-
- spin_lock_irqsave(&rtc_lock, flags);
- uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP);
- spin_unlock_irqrestore(&rtc_lock, flags);
- return uip;
-}
-
-static inline unsigned int __get_rtc_time(struct rtc_time *time)
-{
- unsigned char ctrl;
- unsigned long flags;
- unsigned char century = 0;
-
-#ifdef CONFIG_MACH_DECSTATION
- unsigned int real_year;
-#endif
-
- /*
- * read RTC once any update in progress is done. The update
- * can take just over 2ms. We wait 20ms. There is no need to
- * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP.
- * If you need to know *exactly* when a second has started, enable
- * periodic update complete interrupts, (via ioctl) and then
- * immediately read /dev/rtc which will block until you get the IRQ.
- * Once the read clears, read the RTC time (again via ioctl). Easy.
- */
- if (rtc_is_updating())
- mdelay(20);
-
- /*
- * Only the values that we read from the RTC are set. We leave
- * tm_wday, tm_yday and tm_isdst untouched. Even though the
- * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
- * by the RTC when initially set to a non-zero value.
- */
- spin_lock_irqsave(&rtc_lock, flags);
- time->tm_sec = CMOS_READ(RTC_SECONDS);
- time->tm_min = CMOS_READ(RTC_MINUTES);
- time->tm_hour = CMOS_READ(RTC_HOURS);
- time->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);
- time->tm_mon = CMOS_READ(RTC_MONTH);
- time->tm_year = CMOS_READ(RTC_YEAR);
-#ifdef CONFIG_MACH_DECSTATION
- real_year = CMOS_READ(RTC_DEC_YEAR);
-#endif
-#ifdef CONFIG_ACPI
- if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
- acpi_gbl_FADT.century)
- century = CMOS_READ(acpi_gbl_FADT.century);
-#endif
- ctrl = CMOS_READ(RTC_CONTROL);
- spin_unlock_irqrestore(&rtc_lock, flags);
-
- if (!(ctrl & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
- {
- time->tm_sec = bcd2bin(time->tm_sec);
- time->tm_min = bcd2bin(time->tm_min);
- time->tm_hour = bcd2bin(time->tm_hour);
- time->tm_mday = bcd2bin(time->tm_mday);
- time->tm_mon = bcd2bin(time->tm_mon);
- time->tm_year = bcd2bin(time->tm_year);
- century = bcd2bin(century);
- }
-
-#ifdef CONFIG_MACH_DECSTATION
- time->tm_year += real_year - 72;
-#endif
-
- if (century)
- time->tm_year += (century - 19) * 100;
-
- /*
- * Account for differences between how the RTC uses the values
- * and how they are defined in a struct rtc_time;
- */
- if (time->tm_year <= 69)
- time->tm_year += 100;
-
- time->tm_mon--;
-
- return RTC_24H;
-}
-
-#ifndef get_rtc_time
-#define get_rtc_time __get_rtc_time
-#endif
-
-/* Set the current date and time in the real time clock. */
-static inline int __set_rtc_time(struct rtc_time *time)
-{
- unsigned long flags;
- unsigned char mon, day, hrs, min, sec;
- unsigned char save_control, save_freq_select;
- unsigned int yrs;
-#ifdef CONFIG_MACH_DECSTATION
- unsigned int real_yrs, leap_yr;
-#endif
- unsigned char century = 0;
-
- yrs = time->tm_year;
- mon = time->tm_mon + 1; /* tm_mon starts at zero */
- day = time->tm_mday;
- hrs = time->tm_hour;
- min = time->tm_min;
- sec = time->tm_sec;
-
- if (yrs > 255) /* They are unsigned */
- return -EINVAL;
-
- spin_lock_irqsave(&rtc_lock, flags);
-#ifdef CONFIG_MACH_DECSTATION
- real_yrs = yrs;
- leap_yr = ((!((yrs + 1900) % 4) && ((yrs + 1900) % 100)) ||
- !((yrs + 1900) % 400));
- yrs = 72;
-
- /*
- * We want to keep the year set to 73 until March
- * for non-leap years, so that Feb, 29th is handled
- * correctly.
- */
- if (!leap_yr && mon < 3) {
- real_yrs--;
- yrs = 73;
- }
-#endif
-
-#ifdef CONFIG_ACPI
- if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
- acpi_gbl_FADT.century) {
- century = (yrs + 1900) / 100;
- yrs %= 100;
- }
-#endif
-
- /* These limits and adjustments are independent of
- * whether the chip is in binary mode or not.
- */
- if (yrs > 169) {
- spin_unlock_irqrestore(&rtc_lock, flags);
- return -EINVAL;
- }
-
- if (yrs >= 100)
- yrs -= 100;
-
- if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY)
- || RTC_ALWAYS_BCD) {
- sec = bin2bcd(sec);
- min = bin2bcd(min);
- hrs = bin2bcd(hrs);
- day = bin2bcd(day);
- mon = bin2bcd(mon);
- yrs = bin2bcd(yrs);
- century = bin2bcd(century);
- }
-
- save_control = CMOS_READ(RTC_CONTROL);
- CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
- save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
- CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
-
-#ifdef CONFIG_MACH_DECSTATION
- CMOS_WRITE(real_yrs, RTC_DEC_YEAR);
-#endif
- CMOS_WRITE(yrs, RTC_YEAR);
- CMOS_WRITE(mon, RTC_MONTH);
- CMOS_WRITE(day, RTC_DAY_OF_MONTH);
- CMOS_WRITE(hrs, RTC_HOURS);
- CMOS_WRITE(min, RTC_MINUTES);
- CMOS_WRITE(sec, RTC_SECONDS);
-#ifdef CONFIG_ACPI
- if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
- acpi_gbl_FADT.century)
- CMOS_WRITE(century, acpi_gbl_FADT.century);
-#endif
-
- CMOS_WRITE(save_control, RTC_CONTROL);
- CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
-
- spin_unlock_irqrestore(&rtc_lock, flags);
-
- return 0;
-}
-
-#ifndef set_rtc_time
-#define set_rtc_time __set_rtc_time
-#endif
-
static inline unsigned int get_rtc_ss(void)
{
struct rtc_time h;
diff --git a/include/linux/mc146818rtc.h b/include/linux/mc146818rtc.h
index 433e0c74d643..e9e346b37846 100644
--- a/include/linux/mc146818rtc.h
+++ b/include/linux/mc146818rtc.h
@@ -14,6 +14,12 @@
#include <asm/io.h>
#include <linux/rtc.h> /* get the user-level API */
#include <asm/mc146818rtc.h> /* register access macros */
+#include <linux/bcd.h>
+#include <linux/delay.h>
+
+#ifdef CONFIG_ACPI
+#include <linux/acpi.h>
+#endif
#ifdef __KERNEL__
#include <linux/spinlock.h> /* spinlock_t */
@@ -120,4 +126,192 @@ struct cmos_rtc_board_info {
#define RTC_IO_EXTENT_USED RTC_IO_EXTENT
#endif /* ARCH_RTC_LOCATION */
+/*
+ * Returns true if a clock update is in progress
+ */
+static inline unsigned char mc146818_is_updating(void)
+{
+ unsigned char uip;
+ unsigned long flags;
+
+ spin_lock_irqsave(&rtc_lock, flags);
+ uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP);
+ spin_unlock_irqrestore(&rtc_lock, flags);
+ return uip;
+}
+
+static inline unsigned int mc146818_get_time(struct rtc_time *time)
+{
+ unsigned char ctrl;
+ unsigned long flags;
+ unsigned char century = 0;
+
+#ifdef CONFIG_MACH_DECSTATION
+ unsigned int real_year;
+#endif
+
+ /*
+ * read RTC once any update in progress is done. The update
+ * can take just over 2ms. We wait 20ms. There is no need to
+ * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP.
+ * If you need to know *exactly* when a second has started, enable
+ * periodic update complete interrupts, (via ioctl) and then
+ * immediately read /dev/rtc which will block until you get the IRQ.
+ * Once the read clears, read the RTC time (again via ioctl). Easy.
+ */
+ if (mc146818_is_updating())
+ mdelay(20);
+
+ /*
+ * Only the values that we read from the RTC are set. We leave
+ * tm_wday, tm_yday and tm_isdst untouched. Even though the
+ * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
+ * by the RTC when initially set to a non-zero value.
+ */
+ spin_lock_irqsave(&rtc_lock, flags);
+ time->tm_sec = CMOS_READ(RTC_SECONDS);
+ time->tm_min = CMOS_READ(RTC_MINUTES);
+ time->tm_hour = CMOS_READ(RTC_HOURS);
+ time->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);
+ time->tm_mon = CMOS_READ(RTC_MONTH);
+ time->tm_year = CMOS_READ(RTC_YEAR);
+#ifdef CONFIG_MACH_DECSTATION
+ real_year = CMOS_READ(RTC_DEC_YEAR);
+#endif
+#ifdef CONFIG_ACPI
+ if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
+ acpi_gbl_FADT.century)
+ century = CMOS_READ(acpi_gbl_FADT.century);
+#endif
+ ctrl = CMOS_READ(RTC_CONTROL);
+ spin_unlock_irqrestore(&rtc_lock, flags);
+
+ if (!(ctrl & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
+ {
+ time->tm_sec = bcd2bin(time->tm_sec);
+ time->tm_min = bcd2bin(time->tm_min);
+ time->tm_hour = bcd2bin(time->tm_hour);
+ time->tm_mday = bcd2bin(time->tm_mday);
+ time->tm_mon = bcd2bin(time->tm_mon);
+ time->tm_year = bcd2bin(time->tm_year);
+ century = bcd2bin(century);
+ }
+
+#ifdef CONFIG_MACH_DECSTATION
+ time->tm_year += real_year - 72;
+#endif
+
+ if (century)
+ time->tm_year += (century - 19) * 100;
+
+ /*
+ * Account for differences between how the RTC uses the values
+ * and how they are defined in a struct rtc_time;
+ */
+ if (time->tm_year <= 69)
+ time->tm_year += 100;
+
+ time->tm_mon--;
+
+ return RTC_24H;
+}
+
+/* Set the current date and time in the real time clock. */
+static inline int mc146818_set_time(struct rtc_time *time)
+{
+ unsigned long flags;
+ unsigned char mon, day, hrs, min, sec;
+ unsigned char save_control, save_freq_select;
+ unsigned int yrs;
+#ifdef CONFIG_MACH_DECSTATION
+ unsigned int real_yrs, leap_yr;
+#endif
+ unsigned char century = 0;
+
+ yrs = time->tm_year;
+ mon = time->tm_mon + 1; /* tm_mon starts at zero */
+ day = time->tm_mday;
+ hrs = time->tm_hour;
+ min = time->tm_min;
+ sec = time->tm_sec;
+
+ if (yrs > 255) /* They are unsigned */
+ return -EINVAL;
+
+ spin_lock_irqsave(&rtc_lock, flags);
+#ifdef CONFIG_MACH_DECSTATION
+ real_yrs = yrs;
+ leap_yr = ((!((yrs + 1900) % 4) && ((yrs + 1900) % 100)) ||
+ !((yrs + 1900) % 400));
+ yrs = 72;
+
+ /*
+ * We want to keep the year set to 73 until March
+ * for non-leap years, so that Feb, 29th is handled
+ * correctly.
+ */
+ if (!leap_yr && mon < 3) {
+ real_yrs--;
+ yrs = 73;
+ }
+#endif
+
+#ifdef CONFIG_ACPI
+ if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
+ acpi_gbl_FADT.century) {
+ century = (yrs + 1900) / 100;
+ yrs %= 100;
+ }
+#endif
+
+ /* These limits and adjustments are independent of
+ * whether the chip is in binary mode or not.
+ */
+ if (yrs > 169) {
+ spin_unlock_irqrestore(&rtc_lock, flags);
+ return -EINVAL;
+ }
+
+ if (yrs >= 100)
+ yrs -= 100;
+
+ if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY)
+ || RTC_ALWAYS_BCD) {
+ sec = bin2bcd(sec);
+ min = bin2bcd(min);
+ hrs = bin2bcd(hrs);
+ day = bin2bcd(day);
+ mon = bin2bcd(mon);
+ yrs = bin2bcd(yrs);
+ century = bin2bcd(century);
+ }
+
+ save_control = CMOS_READ(RTC_CONTROL);
+ CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
+ save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
+ CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
+
+#ifdef CONFIG_MACH_DECSTATION
+ CMOS_WRITE(real_yrs, RTC_DEC_YEAR);
+#endif
+ CMOS_WRITE(yrs, RTC_YEAR);
+ CMOS_WRITE(mon, RTC_MONTH);
+ CMOS_WRITE(day, RTC_DAY_OF_MONTH);
+ CMOS_WRITE(hrs, RTC_HOURS);
+ CMOS_WRITE(min, RTC_MINUTES);
+ CMOS_WRITE(sec, RTC_SECONDS);
+#ifdef CONFIG_ACPI
+ if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
+ acpi_gbl_FADT.century)
+ CMOS_WRITE(century, acpi_gbl_FADT.century);
+#endif
+
+ CMOS_WRITE(save_control, RTC_CONTROL);
+ CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
+
+ spin_unlock_irqrestore(&rtc_lock, flags);
+
+ return 0;
+}
+
#endif /* _MC146818RTC_H */
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread
* [PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h
2016-04-27 22:34 ` Arnd Bergmann
` (5 preceding siblings ...)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
Drivers should not really include stuff from asm-generic directly,
and the PC-style cmos rtc driver does this in order to reuse the
mc146818 implementation of get_rtc_time/set_rtc_time rather than
the architecture specific one for the architecture it gets built for.
To make it more obvious what is going on, this moves and renames the
two functions into include/linux/mc146818rtc.h, which holds the
other mc146818 specific code. Ideally it would be in a .c file,
but that would require extra infrastructure as the functions are
called by multiple drivers with conflicting dependencies.
With this change, the asm-generic/rtc.h header also becomes much
more generic, so it can be reused more easily across any architecture
that still relies on the genrtc driver.
The only caller of the internal __get_rtc_time/__set_rtc_time
functions is in arch/alpha/kernel/rtc.c, and we just change those
over to the new naming.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
arch/alpha/kernel/rtc.c | 6 +-
arch/x86/include/asm/mc146818rtc.h | 1 -
drivers/rtc/rtc-cmos.c | 12 +--
include/asm-generic/rtc.h | 206 +------------------------------------
include/linux/mc146818rtc.h | 194 ++++++++++++++++++++++++++++++++++
5 files changed, 207 insertions(+), 212 deletions(-)
diff --git a/arch/alpha/kernel/rtc.c b/arch/alpha/kernel/rtc.c
index f535a3fd0f60..ceed68c7500b 100644
--- a/arch/alpha/kernel/rtc.c
+++ b/arch/alpha/kernel/rtc.c
@@ -15,8 +15,6 @@
#include <linux/rtc.h>
#include <linux/platform_device.h>
-#include <asm/rtc.h>
-
#include "proto.h"
@@ -81,7 +79,7 @@ init_rtc_epoch(void)
static int
alpha_rtc_read_time(struct device *dev, struct rtc_time *tm)
{
- __get_rtc_time(tm);
+ mc146818_get_time(tm);
/* Adjust for non-default epochs. It's easier to depend on the
generic __get_rtc_time and adjust the epoch here than create
@@ -112,7 +110,7 @@ alpha_rtc_set_time(struct device *dev, struct rtc_time *tm)
tm = &xtm;
}
- return __set_rtc_time(tm);
+ return mc146818_set_time(tm);
}
static int
diff --git a/arch/x86/include/asm/mc146818rtc.h b/arch/x86/include/asm/mc146818rtc.h
index 0f555cc31984..24acd9ba7837 100644
--- a/arch/x86/include/asm/mc146818rtc.h
+++ b/arch/x86/include/asm/mc146818rtc.h
@@ -6,7 +6,6 @@
#include <asm/io.h>
#include <asm/processor.h>
-#include <linux/mc146818rtc.h>
#ifndef RTC_PORT
#define RTC_PORT(x) (0x70 + (x))
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 84fb541038be..c7993f18edfa 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -43,7 +43,7 @@
#include <linux/of_platform.h>
/* this is for "generic access to PC-style RTC" using CMOS_READ/CMOS_WRITE */
-#include <asm-generic/rtc.h>
+#include <linux/mc146818rtc.h>
struct cmos_rtc {
struct rtc_device *rtc;
@@ -190,10 +190,10 @@ static inline void cmos_write_bank2(unsigned char val, unsigned char addr)
static int cmos_read_time(struct device *dev, struct rtc_time *t)
{
/* REVISIT: if the clock has a "century" register, use
- * that instead of the heuristic in get_rtc_time().
+ * that instead of the heuristic in mc146818_get_time().
* That'll make Y3K compatility (year > 2070) easy!
*/
- get_rtc_time(t);
+ mc146818_get_time(t);
return 0;
}
@@ -205,7 +205,7 @@ static int cmos_set_time(struct device *dev, struct rtc_time *t)
* takes effect exactly 500ms after we write the register.
* (Also queueing and other delays before we get this far.)
*/
- return set_rtc_time(t);
+ return mc146818_set_time(t);
}
static int cmos_read_alarm(struct device *dev, struct rtc_wkalrm *t)
@@ -1142,14 +1142,14 @@ static __init void cmos_of_init(struct platform_device *pdev)
if (val)
CMOS_WRITE(be32_to_cpup(val), RTC_FREQ_SELECT);
- get_rtc_time(&time);
+ cmos_read_time(&pdev->dev, &time);
ret = rtc_valid_tm(&time);
if (ret) {
struct rtc_time def_time = {
.tm_year = 1,
.tm_mday = 1,
};
- set_rtc_time(&def_time);
+ cmos_set_time(&pdev->dev, &def_time);
}
}
#else
diff --git a/include/asm-generic/rtc.h b/include/asm-generic/rtc.h
index 4e3b6558331e..4fcff22cd707 100644
--- a/include/asm-generic/rtc.h
+++ b/include/asm-generic/rtc.h
@@ -12,12 +12,12 @@
#ifndef __ASM_RTC_H__
#define __ASM_RTC_H__
-#include <linux/mc146818rtc.h>
#include <linux/rtc.h>
-#include <linux/bcd.h>
-#include <linux/delay.h>
-#ifdef CONFIG_ACPI
-#include <linux/acpi.h>
+
+#ifndef get_rtc_time
+#include <linux/mc146818rtc.h>
+#define get_rtc_time mc146818_get_time
+#define set_rtc_time mc146818_set_time
#endif
#define RTC_PIE 0x40 /* periodic interrupt enable */
@@ -31,202 +31,6 @@
#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-/*
- * Returns true if a clock update is in progress
- */
-static inline unsigned char rtc_is_updating(void)
-{
- unsigned char uip;
- unsigned long flags;
-
- spin_lock_irqsave(&rtc_lock, flags);
- uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP);
- spin_unlock_irqrestore(&rtc_lock, flags);
- return uip;
-}
-
-static inline unsigned int __get_rtc_time(struct rtc_time *time)
-{
- unsigned char ctrl;
- unsigned long flags;
- unsigned char century = 0;
-
-#ifdef CONFIG_MACH_DECSTATION
- unsigned int real_year;
-#endif
-
- /*
- * read RTC once any update in progress is done. The update
- * can take just over 2ms. We wait 20ms. There is no need to
- * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP.
- * If you need to know *exactly* when a second has started, enable
- * periodic update complete interrupts, (via ioctl) and then
- * immediately read /dev/rtc which will block until you get the IRQ.
- * Once the read clears, read the RTC time (again via ioctl). Easy.
- */
- if (rtc_is_updating())
- mdelay(20);
-
- /*
- * Only the values that we read from the RTC are set. We leave
- * tm_wday, tm_yday and tm_isdst untouched. Even though the
- * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
- * by the RTC when initially set to a non-zero value.
- */
- spin_lock_irqsave(&rtc_lock, flags);
- time->tm_sec = CMOS_READ(RTC_SECONDS);
- time->tm_min = CMOS_READ(RTC_MINUTES);
- time->tm_hour = CMOS_READ(RTC_HOURS);
- time->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);
- time->tm_mon = CMOS_READ(RTC_MONTH);
- time->tm_year = CMOS_READ(RTC_YEAR);
-#ifdef CONFIG_MACH_DECSTATION
- real_year = CMOS_READ(RTC_DEC_YEAR);
-#endif
-#ifdef CONFIG_ACPI
- if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
- acpi_gbl_FADT.century)
- century = CMOS_READ(acpi_gbl_FADT.century);
-#endif
- ctrl = CMOS_READ(RTC_CONTROL);
- spin_unlock_irqrestore(&rtc_lock, flags);
-
- if (!(ctrl & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
- {
- time->tm_sec = bcd2bin(time->tm_sec);
- time->tm_min = bcd2bin(time->tm_min);
- time->tm_hour = bcd2bin(time->tm_hour);
- time->tm_mday = bcd2bin(time->tm_mday);
- time->tm_mon = bcd2bin(time->tm_mon);
- time->tm_year = bcd2bin(time->tm_year);
- century = bcd2bin(century);
- }
-
-#ifdef CONFIG_MACH_DECSTATION
- time->tm_year += real_year - 72;
-#endif
-
- if (century)
- time->tm_year += (century - 19) * 100;
-
- /*
- * Account for differences between how the RTC uses the values
- * and how they are defined in a struct rtc_time;
- */
- if (time->tm_year <= 69)
- time->tm_year += 100;
-
- time->tm_mon--;
-
- return RTC_24H;
-}
-
-#ifndef get_rtc_time
-#define get_rtc_time __get_rtc_time
-#endif
-
-/* Set the current date and time in the real time clock. */
-static inline int __set_rtc_time(struct rtc_time *time)
-{
- unsigned long flags;
- unsigned char mon, day, hrs, min, sec;
- unsigned char save_control, save_freq_select;
- unsigned int yrs;
-#ifdef CONFIG_MACH_DECSTATION
- unsigned int real_yrs, leap_yr;
-#endif
- unsigned char century = 0;
-
- yrs = time->tm_year;
- mon = time->tm_mon + 1; /* tm_mon starts at zero */
- day = time->tm_mday;
- hrs = time->tm_hour;
- min = time->tm_min;
- sec = time->tm_sec;
-
- if (yrs > 255) /* They are unsigned */
- return -EINVAL;
-
- spin_lock_irqsave(&rtc_lock, flags);
-#ifdef CONFIG_MACH_DECSTATION
- real_yrs = yrs;
- leap_yr = ((!((yrs + 1900) % 4) && ((yrs + 1900) % 100)) ||
- !((yrs + 1900) % 400));
- yrs = 72;
-
- /*
- * We want to keep the year set to 73 until March
- * for non-leap years, so that Feb, 29th is handled
- * correctly.
- */
- if (!leap_yr && mon < 3) {
- real_yrs--;
- yrs = 73;
- }
-#endif
-
-#ifdef CONFIG_ACPI
- if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
- acpi_gbl_FADT.century) {
- century = (yrs + 1900) / 100;
- yrs %= 100;
- }
-#endif
-
- /* These limits and adjustments are independent of
- * whether the chip is in binary mode or not.
- */
- if (yrs > 169) {
- spin_unlock_irqrestore(&rtc_lock, flags);
- return -EINVAL;
- }
-
- if (yrs >= 100)
- yrs -= 100;
-
- if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY)
- || RTC_ALWAYS_BCD) {
- sec = bin2bcd(sec);
- min = bin2bcd(min);
- hrs = bin2bcd(hrs);
- day = bin2bcd(day);
- mon = bin2bcd(mon);
- yrs = bin2bcd(yrs);
- century = bin2bcd(century);
- }
-
- save_control = CMOS_READ(RTC_CONTROL);
- CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
- save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
- CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
-
-#ifdef CONFIG_MACH_DECSTATION
- CMOS_WRITE(real_yrs, RTC_DEC_YEAR);
-#endif
- CMOS_WRITE(yrs, RTC_YEAR);
- CMOS_WRITE(mon, RTC_MONTH);
- CMOS_WRITE(day, RTC_DAY_OF_MONTH);
- CMOS_WRITE(hrs, RTC_HOURS);
- CMOS_WRITE(min, RTC_MINUTES);
- CMOS_WRITE(sec, RTC_SECONDS);
-#ifdef CONFIG_ACPI
- if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
- acpi_gbl_FADT.century)
- CMOS_WRITE(century, acpi_gbl_FADT.century);
-#endif
-
- CMOS_WRITE(save_control, RTC_CONTROL);
- CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
-
- spin_unlock_irqrestore(&rtc_lock, flags);
-
- return 0;
-}
-
-#ifndef set_rtc_time
-#define set_rtc_time __set_rtc_time
-#endif
-
static inline unsigned int get_rtc_ss(void)
{
struct rtc_time h;
diff --git a/include/linux/mc146818rtc.h b/include/linux/mc146818rtc.h
index 433e0c74d643..e9e346b37846 100644
--- a/include/linux/mc146818rtc.h
+++ b/include/linux/mc146818rtc.h
@@ -14,6 +14,12 @@
#include <asm/io.h>
#include <linux/rtc.h> /* get the user-level API */
#include <asm/mc146818rtc.h> /* register access macros */
+#include <linux/bcd.h>
+#include <linux/delay.h>
+
+#ifdef CONFIG_ACPI
+#include <linux/acpi.h>
+#endif
#ifdef __KERNEL__
#include <linux/spinlock.h> /* spinlock_t */
@@ -120,4 +126,192 @@ struct cmos_rtc_board_info {
#define RTC_IO_EXTENT_USED RTC_IO_EXTENT
#endif /* ARCH_RTC_LOCATION */
+/*
+ * Returns true if a clock update is in progress
+ */
+static inline unsigned char mc146818_is_updating(void)
+{
+ unsigned char uip;
+ unsigned long flags;
+
+ spin_lock_irqsave(&rtc_lock, flags);
+ uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP);
+ spin_unlock_irqrestore(&rtc_lock, flags);
+ return uip;
+}
+
+static inline unsigned int mc146818_get_time(struct rtc_time *time)
+{
+ unsigned char ctrl;
+ unsigned long flags;
+ unsigned char century = 0;
+
+#ifdef CONFIG_MACH_DECSTATION
+ unsigned int real_year;
+#endif
+
+ /*
+ * read RTC once any update in progress is done. The update
+ * can take just over 2ms. We wait 20ms. There is no need to
+ * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP.
+ * If you need to know *exactly* when a second has started, enable
+ * periodic update complete interrupts, (via ioctl) and then
+ * immediately read /dev/rtc which will block until you get the IRQ.
+ * Once the read clears, read the RTC time (again via ioctl). Easy.
+ */
+ if (mc146818_is_updating())
+ mdelay(20);
+
+ /*
+ * Only the values that we read from the RTC are set. We leave
+ * tm_wday, tm_yday and tm_isdst untouched. Even though the
+ * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
+ * by the RTC when initially set to a non-zero value.
+ */
+ spin_lock_irqsave(&rtc_lock, flags);
+ time->tm_sec = CMOS_READ(RTC_SECONDS);
+ time->tm_min = CMOS_READ(RTC_MINUTES);
+ time->tm_hour = CMOS_READ(RTC_HOURS);
+ time->tm_mday = CMOS_READ(RTC_DAY_OF_MONTH);
+ time->tm_mon = CMOS_READ(RTC_MONTH);
+ time->tm_year = CMOS_READ(RTC_YEAR);
+#ifdef CONFIG_MACH_DECSTATION
+ real_year = CMOS_READ(RTC_DEC_YEAR);
+#endif
+#ifdef CONFIG_ACPI
+ if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
+ acpi_gbl_FADT.century)
+ century = CMOS_READ(acpi_gbl_FADT.century);
+#endif
+ ctrl = CMOS_READ(RTC_CONTROL);
+ spin_unlock_irqrestore(&rtc_lock, flags);
+
+ if (!(ctrl & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
+ {
+ time->tm_sec = bcd2bin(time->tm_sec);
+ time->tm_min = bcd2bin(time->tm_min);
+ time->tm_hour = bcd2bin(time->tm_hour);
+ time->tm_mday = bcd2bin(time->tm_mday);
+ time->tm_mon = bcd2bin(time->tm_mon);
+ time->tm_year = bcd2bin(time->tm_year);
+ century = bcd2bin(century);
+ }
+
+#ifdef CONFIG_MACH_DECSTATION
+ time->tm_year += real_year - 72;
+#endif
+
+ if (century)
+ time->tm_year += (century - 19) * 100;
+
+ /*
+ * Account for differences between how the RTC uses the values
+ * and how they are defined in a struct rtc_time;
+ */
+ if (time->tm_year <= 69)
+ time->tm_year += 100;
+
+ time->tm_mon--;
+
+ return RTC_24H;
+}
+
+/* Set the current date and time in the real time clock. */
+static inline int mc146818_set_time(struct rtc_time *time)
+{
+ unsigned long flags;
+ unsigned char mon, day, hrs, min, sec;
+ unsigned char save_control, save_freq_select;
+ unsigned int yrs;
+#ifdef CONFIG_MACH_DECSTATION
+ unsigned int real_yrs, leap_yr;
+#endif
+ unsigned char century = 0;
+
+ yrs = time->tm_year;
+ mon = time->tm_mon + 1; /* tm_mon starts at zero */
+ day = time->tm_mday;
+ hrs = time->tm_hour;
+ min = time->tm_min;
+ sec = time->tm_sec;
+
+ if (yrs > 255) /* They are unsigned */
+ return -EINVAL;
+
+ spin_lock_irqsave(&rtc_lock, flags);
+#ifdef CONFIG_MACH_DECSTATION
+ real_yrs = yrs;
+ leap_yr = ((!((yrs + 1900) % 4) && ((yrs + 1900) % 100)) ||
+ !((yrs + 1900) % 400));
+ yrs = 72;
+
+ /*
+ * We want to keep the year set to 73 until March
+ * for non-leap years, so that Feb, 29th is handled
+ * correctly.
+ */
+ if (!leap_yr && mon < 3) {
+ real_yrs--;
+ yrs = 73;
+ }
+#endif
+
+#ifdef CONFIG_ACPI
+ if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
+ acpi_gbl_FADT.century) {
+ century = (yrs + 1900) / 100;
+ yrs %= 100;
+ }
+#endif
+
+ /* These limits and adjustments are independent of
+ * whether the chip is in binary mode or not.
+ */
+ if (yrs > 169) {
+ spin_unlock_irqrestore(&rtc_lock, flags);
+ return -EINVAL;
+ }
+
+ if (yrs >= 100)
+ yrs -= 100;
+
+ if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY)
+ || RTC_ALWAYS_BCD) {
+ sec = bin2bcd(sec);
+ min = bin2bcd(min);
+ hrs = bin2bcd(hrs);
+ day = bin2bcd(day);
+ mon = bin2bcd(mon);
+ yrs = bin2bcd(yrs);
+ century = bin2bcd(century);
+ }
+
+ save_control = CMOS_READ(RTC_CONTROL);
+ CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
+ save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
+ CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
+
+#ifdef CONFIG_MACH_DECSTATION
+ CMOS_WRITE(real_yrs, RTC_DEC_YEAR);
+#endif
+ CMOS_WRITE(yrs, RTC_YEAR);
+ CMOS_WRITE(mon, RTC_MONTH);
+ CMOS_WRITE(day, RTC_DAY_OF_MONTH);
+ CMOS_WRITE(hrs, RTC_HOURS);
+ CMOS_WRITE(min, RTC_MINUTES);
+ CMOS_WRITE(sec, RTC_SECONDS);
+#ifdef CONFIG_ACPI
+ if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&
+ acpi_gbl_FADT.century)
+ CMOS_WRITE(century, acpi_gbl_FADT.century);
+#endif
+
+ CMOS_WRITE(save_control, RTC_CONTROL);
+ CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
+
+ spin_unlock_irqrestore(&rtc_lock, flags);
+
+ return 0;
+}
+
#endif /* _MC146818RTC_H */
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h
2016-04-27 22:34 ` Arnd Bergmann
` (6 preceding siblings ...)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
Commit 3195ef59cb42 ("x86: Do full rtc synchronization with ntp") had
the side-effect of unconditionally enabling the RTC_LIB symbol on x86,
which in turn disables the selection of the CONFIG_RTC and
CONFIG_GEN_RTC drivers that contain a two older implementations of
the CONFIG_RTC_DRV_CMOS driver.
This removes x86 from the list for genrtc, and changes all references
to the asm/rtc.h header to instead point to the interfaces
from linux/mc146818rtc.h.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/x86/include/asm/rtc.h | 1 -
arch/x86/kernel/hpet.c | 3 +--
arch/x86/kernel/rtc.c | 3 +--
arch/x86/platform/efi/efi.c | 1 -
drivers/acpi/acpi_cmos_rtc.c | 2 +-
drivers/base/power/trace.c | 6 +++---
drivers/char/Kconfig | 2 +-
drivers/rtc/rtc-mrst.c | 2 +-
8 files changed, 8 insertions(+), 12 deletions(-)
delete mode 100644 arch/x86/include/asm/rtc.h
diff --git a/arch/x86/include/asm/rtc.h b/arch/x86/include/asm/rtc.h
deleted file mode 100644
index f71c3b0ed360..000000000000
--- a/arch/x86/include/asm/rtc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/rtc.h>
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index f112af7aa62e..357900aad62c 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -1020,7 +1020,6 @@ void hpet_disable(void)
*/
#include <linux/mc146818rtc.h>
#include <linux/rtc.h>
-#include <asm/rtc.h>
#define DEFAULT_RTC_INT_FREQ 64
#define DEFAULT_RTC_SHIFT 6
@@ -1244,7 +1243,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
memset(&curr_time, 0, sizeof(struct rtc_time));
if (hpet_rtc_flags & (RTC_UIE | RTC_AIE))
- get_rtc_time(&curr_time);
+ mc146818_set_time(&curr_time);
if (hpet_rtc_flags & RTC_UIE &&
curr_time.tm_sec != hpet_prev_update_sec) {
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index eceaa082ec3f..79c6311cd912 100644
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -13,7 +13,6 @@
#include <asm/x86_init.h>
#include <asm/time.h>
#include <asm/intel-mid.h>
-#include <asm/rtc.h>
#include <asm/setup.h>
#ifdef CONFIG_X86_32
@@ -47,7 +46,7 @@ int mach_set_rtc_mmss(const struct timespec *now)
rtc_time_to_tm(nowtime, &tm);
if (!rtc_valid_tm(&tm)) {
- retval = set_rtc_time(&tm);
+ retval = mc146818_set_time(&tm);
if (retval)
printk(KERN_ERR "%s: RTC write failed with error %d\n",
__func__, retval);
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 994a7df84a7b..13b216f71191 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -51,7 +51,6 @@
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
#include <asm/x86_init.h>
-#include <asm/rtc.h>
#include <asm/uv/uv.h>
#define EFI_DEBUG
diff --git a/drivers/acpi/acpi_cmos_rtc.c b/drivers/acpi/acpi_cmos_rtc.c
index 81dc75033f15..0980a133916f 100644
--- a/drivers/acpi/acpi_cmos_rtc.c
+++ b/drivers/acpi/acpi_cmos_rtc.c
@@ -14,7 +14,7 @@
#include <linux/err.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <asm-generic/rtc.h>
+#include <linux/mc146818rtc.h>
#include "internal.h"
diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c
index a6975795e7f3..efec10b49d59 100644
--- a/drivers/base/power/trace.c
+++ b/drivers/base/power/trace.c
@@ -11,7 +11,7 @@
#include <linux/export.h>
#include <linux/rtc.h>
-#include <asm/rtc.h>
+#include <linux/mc146818rtc.h>
#include "power.h"
@@ -103,7 +103,7 @@ static int set_magic_time(unsigned int user, unsigned int file, unsigned int dev
n /= 24;
time.tm_min = (n % 20) * 3;
n /= 20;
- set_rtc_time(&time);
+ mc146818_set_time(&time);
return n ? -1 : 0;
}
@@ -112,7 +112,7 @@ static unsigned int read_magic_time(void)
struct rtc_time time;
unsigned int val;
- get_rtc_time(&time);
+ mc146818_get_time(&time);
pr_info("RTC time: %2d:%02d:%02d, date: %02d/%02d/%02d\n",
time.tm_hour, time.tm_min, time.tm_sec,
time.tm_mon + 1, time.tm_mday, time.tm_year % 100);
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index ca397384dc15..9bdb629fbaae 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on ALPHA || M68K || MN10300 || PARISC || PPC || X86
+ depends on ALPHA || M68K || MN10300 || PARISC || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
index 548ea6f6f384..bb8ac7c5e217 100644
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
@@ -32,11 +32,11 @@
#include <linux/interrupt.h>
#include <linux/spinlock.h>
#include <linux/kernel.h>
+#include <linux/mc146818rtc.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/sfi.h>
-#include <asm-generic/rtc.h>
#include <asm/intel_scu_ipc.h>
#include <asm/intel-mid.h>
#include <asm/intel_mid_vrtc.h>
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h
2016-04-27 22:34 ` Arnd Bergmann
(?)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
Commit 3195ef59cb42 ("x86: Do full rtc synchronization with ntp") had
the side-effect of unconditionally enabling the RTC_LIB symbol on x86,
which in turn disables the selection of the CONFIG_RTC and
CONFIG_GEN_RTC drivers that contain a two older implementations of
the CONFIG_RTC_DRV_CMOS driver.
This removes x86 from the list for genrtc, and changes all references
to the asm/rtc.h header to instead point to the interfaces
from linux/mc146818rtc.h.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/x86/include/asm/rtc.h | 1 -
arch/x86/kernel/hpet.c | 3 +--
arch/x86/kernel/rtc.c | 3 +--
arch/x86/platform/efi/efi.c | 1 -
drivers/acpi/acpi_cmos_rtc.c | 2 +-
drivers/base/power/trace.c | 6 +++---
drivers/char/Kconfig | 2 +-
drivers/rtc/rtc-mrst.c | 2 +-
8 files changed, 8 insertions(+), 12 deletions(-)
delete mode 100644 arch/x86/include/asm/rtc.h
diff --git a/arch/x86/include/asm/rtc.h b/arch/x86/include/asm/rtc.h
deleted file mode 100644
index f71c3b0ed360..000000000000
--- a/arch/x86/include/asm/rtc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/rtc.h>
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index f112af7aa62e..357900aad62c 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -1020,7 +1020,6 @@ void hpet_disable(void)
*/
#include <linux/mc146818rtc.h>
#include <linux/rtc.h>
-#include <asm/rtc.h>
#define DEFAULT_RTC_INT_FREQ 64
#define DEFAULT_RTC_SHIFT 6
@@ -1244,7 +1243,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
memset(&curr_time, 0, sizeof(struct rtc_time));
if (hpet_rtc_flags & (RTC_UIE | RTC_AIE))
- get_rtc_time(&curr_time);
+ mc146818_set_time(&curr_time);
if (hpet_rtc_flags & RTC_UIE &&
curr_time.tm_sec != hpet_prev_update_sec) {
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index eceaa082ec3f..79c6311cd912 100644
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -13,7 +13,6 @@
#include <asm/x86_init.h>
#include <asm/time.h>
#include <asm/intel-mid.h>
-#include <asm/rtc.h>
#include <asm/setup.h>
#ifdef CONFIG_X86_32
@@ -47,7 +46,7 @@ int mach_set_rtc_mmss(const struct timespec *now)
rtc_time_to_tm(nowtime, &tm);
if (!rtc_valid_tm(&tm)) {
- retval = set_rtc_time(&tm);
+ retval = mc146818_set_time(&tm);
if (retval)
printk(KERN_ERR "%s: RTC write failed with error %d\n",
__func__, retval);
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 994a7df84a7b..13b216f71191 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -51,7 +51,6 @@
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
#include <asm/x86_init.h>
-#include <asm/rtc.h>
#include <asm/uv/uv.h>
#define EFI_DEBUG
diff --git a/drivers/acpi/acpi_cmos_rtc.c b/drivers/acpi/acpi_cmos_rtc.c
index 81dc75033f15..0980a133916f 100644
--- a/drivers/acpi/acpi_cmos_rtc.c
+++ b/drivers/acpi/acpi_cmos_rtc.c
@@ -14,7 +14,7 @@
#include <linux/err.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <asm-generic/rtc.h>
+#include <linux/mc146818rtc.h>
#include "internal.h"
diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c
index a6975795e7f3..efec10b49d59 100644
--- a/drivers/base/power/trace.c
+++ b/drivers/base/power/trace.c
@@ -11,7 +11,7 @@
#include <linux/export.h>
#include <linux/rtc.h>
-#include <asm/rtc.h>
+#include <linux/mc146818rtc.h>
#include "power.h"
@@ -103,7 +103,7 @@ static int set_magic_time(unsigned int user, unsigned int file, unsigned int dev
n /= 24;
time.tm_min = (n % 20) * 3;
n /= 20;
- set_rtc_time(&time);
+ mc146818_set_time(&time);
return n ? -1 : 0;
}
@@ -112,7 +112,7 @@ static unsigned int read_magic_time(void)
struct rtc_time time;
unsigned int val;
- get_rtc_time(&time);
+ mc146818_get_time(&time);
pr_info("RTC time: %2d:%02d:%02d, date: %02d/%02d/%02d\n",
time.tm_hour, time.tm_min, time.tm_sec,
time.tm_mon + 1, time.tm_mday, time.tm_year % 100);
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index ca397384dc15..9bdb629fbaae 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on ALPHA || M68K || MN10300 || PARISC || PPC || X86
+ depends on ALPHA || M68K || MN10300 || PARISC || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
index 548ea6f6f384..bb8ac7c5e217 100644
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
@@ -32,11 +32,11 @@
#include <linux/interrupt.h>
#include <linux/spinlock.h>
#include <linux/kernel.h>
+#include <linux/mc146818rtc.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/sfi.h>
-#include <asm-generic/rtc.h>
#include <asm/intel_scu_ipc.h>
#include <asm/intel-mid.h>
#include <asm/intel_mid_vrtc.h>
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [rtc-linux] [PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
Commit 3195ef59cb42 ("x86: Do full rtc synchronization with ntp") had
the side-effect of unconditionally enabling the RTC_LIB symbol on x86,
which in turn disables the selection of the CONFIG_RTC and
CONFIG_GEN_RTC drivers that contain a two older implementations of
the CONFIG_RTC_DRV_CMOS driver.
This removes x86 from the list for genrtc, and changes all references
to the asm/rtc.h header to instead point to the interfaces
from linux/mc146818rtc.h.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/x86/include/asm/rtc.h | 1 -
arch/x86/kernel/hpet.c | 3 +--
arch/x86/kernel/rtc.c | 3 +--
arch/x86/platform/efi/efi.c | 1 -
drivers/acpi/acpi_cmos_rtc.c | 2 +-
drivers/base/power/trace.c | 6 +++---
drivers/char/Kconfig | 2 +-
drivers/rtc/rtc-mrst.c | 2 +-
8 files changed, 8 insertions(+), 12 deletions(-)
delete mode 100644 arch/x86/include/asm/rtc.h
diff --git a/arch/x86/include/asm/rtc.h b/arch/x86/include/asm/rtc.h
deleted file mode 100644
index f71c3b0ed360..000000000000
--- a/arch/x86/include/asm/rtc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/rtc.h>
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index f112af7aa62e..357900aad62c 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -1020,7 +1020,6 @@ void hpet_disable(void)
*/
#include <linux/mc146818rtc.h>
#include <linux/rtc.h>
-#include <asm/rtc.h>
#define DEFAULT_RTC_INT_FREQ 64
#define DEFAULT_RTC_SHIFT 6
@@ -1244,7 +1243,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
memset(&curr_time, 0, sizeof(struct rtc_time));
if (hpet_rtc_flags & (RTC_UIE | RTC_AIE))
- get_rtc_time(&curr_time);
+ mc146818_set_time(&curr_time);
if (hpet_rtc_flags & RTC_UIE &&
curr_time.tm_sec != hpet_prev_update_sec) {
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index eceaa082ec3f..79c6311cd912 100644
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -13,7 +13,6 @@
#include <asm/x86_init.h>
#include <asm/time.h>
#include <asm/intel-mid.h>
-#include <asm/rtc.h>
#include <asm/setup.h>
#ifdef CONFIG_X86_32
@@ -47,7 +46,7 @@ int mach_set_rtc_mmss(const struct timespec *now)
rtc_time_to_tm(nowtime, &tm);
if (!rtc_valid_tm(&tm)) {
- retval = set_rtc_time(&tm);
+ retval = mc146818_set_time(&tm);
if (retval)
printk(KERN_ERR "%s: RTC write failed with error %d\n",
__func__, retval);
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 994a7df84a7b..13b216f71191 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -51,7 +51,6 @@
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
#include <asm/x86_init.h>
-#include <asm/rtc.h>
#include <asm/uv/uv.h>
#define EFI_DEBUG
diff --git a/drivers/acpi/acpi_cmos_rtc.c b/drivers/acpi/acpi_cmos_rtc.c
index 81dc75033f15..0980a133916f 100644
--- a/drivers/acpi/acpi_cmos_rtc.c
+++ b/drivers/acpi/acpi_cmos_rtc.c
@@ -14,7 +14,7 @@
#include <linux/err.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <asm-generic/rtc.h>
+#include <linux/mc146818rtc.h>
#include "internal.h"
diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c
index a6975795e7f3..efec10b49d59 100644
--- a/drivers/base/power/trace.c
+++ b/drivers/base/power/trace.c
@@ -11,7 +11,7 @@
#include <linux/export.h>
#include <linux/rtc.h>
-#include <asm/rtc.h>
+#include <linux/mc146818rtc.h>
#include "power.h"
@@ -103,7 +103,7 @@ static int set_magic_time(unsigned int user, unsigned int file, unsigned int dev
n /= 24;
time.tm_min = (n % 20) * 3;
n /= 20;
- set_rtc_time(&time);
+ mc146818_set_time(&time);
return n ? -1 : 0;
}
@@ -112,7 +112,7 @@ static unsigned int read_magic_time(void)
struct rtc_time time;
unsigned int val;
- get_rtc_time(&time);
+ mc146818_get_time(&time);
pr_info("RTC time: %2d:%02d:%02d, date: %02d/%02d/%02d\n",
time.tm_hour, time.tm_min, time.tm_sec,
time.tm_mon + 1, time.tm_mday, time.tm_year % 100);
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index ca397384dc15..9bdb629fbaae 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on ALPHA || M68K || MN10300 || PARISC || PPC || X86
+ depends on ALPHA || M68K || MN10300 || PARISC || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
index 548ea6f6f384..bb8ac7c5e217 100644
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
@@ -32,11 +32,11 @@
#include <linux/interrupt.h>
#include <linux/spinlock.h>
#include <linux/kernel.h>
+#include <linux/mc146818rtc.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/sfi.h>
-#include <asm-generic/rtc.h>
#include <asm/intel_scu_ipc.h>
#include <asm/intel-mid.h>
#include <asm/intel_mid_vrtc.h>
--
2.7.0
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
Commit 3195ef59cb42 ("x86: Do full rtc synchronization with ntp") had
the side-effect of unconditionally enabling the RTC_LIB symbol on x86,
which in turn disables the selection of the CONFIG_RTC and
CONFIG_GEN_RTC drivers that contain a two older implementations of
the CONFIG_RTC_DRV_CMOS driver.
This removes x86 from the list for genrtc, and changes all references
to the asm/rtc.h header to instead point to the interfaces
from linux/mc146818rtc.h.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/x86/include/asm/rtc.h | 1 -
arch/x86/kernel/hpet.c | 3 +--
arch/x86/kernel/rtc.c | 3 +--
arch/x86/platform/efi/efi.c | 1 -
drivers/acpi/acpi_cmos_rtc.c | 2 +-
drivers/base/power/trace.c | 6 +++---
drivers/char/Kconfig | 2 +-
drivers/rtc/rtc-mrst.c | 2 +-
8 files changed, 8 insertions(+), 12 deletions(-)
delete mode 100644 arch/x86/include/asm/rtc.h
diff --git a/arch/x86/include/asm/rtc.h b/arch/x86/include/asm/rtc.h
deleted file mode 100644
index f71c3b0ed360..000000000000
--- a/arch/x86/include/asm/rtc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/rtc.h>
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index f112af7aa62e..357900aad62c 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -1020,7 +1020,6 @@ void hpet_disable(void)
*/
#include <linux/mc146818rtc.h>
#include <linux/rtc.h>
-#include <asm/rtc.h>
#define DEFAULT_RTC_INT_FREQ 64
#define DEFAULT_RTC_SHIFT 6
@@ -1244,7 +1243,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
memset(&curr_time, 0, sizeof(struct rtc_time));
if (hpet_rtc_flags & (RTC_UIE | RTC_AIE))
- get_rtc_time(&curr_time);
+ mc146818_set_time(&curr_time);
if (hpet_rtc_flags & RTC_UIE &&
curr_time.tm_sec != hpet_prev_update_sec) {
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index eceaa082ec3f..79c6311cd912 100644
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -13,7 +13,6 @@
#include <asm/x86_init.h>
#include <asm/time.h>
#include <asm/intel-mid.h>
-#include <asm/rtc.h>
#include <asm/setup.h>
#ifdef CONFIG_X86_32
@@ -47,7 +46,7 @@ int mach_set_rtc_mmss(const struct timespec *now)
rtc_time_to_tm(nowtime, &tm);
if (!rtc_valid_tm(&tm)) {
- retval = set_rtc_time(&tm);
+ retval = mc146818_set_time(&tm);
if (retval)
printk(KERN_ERR "%s: RTC write failed with error %d\n",
__func__, retval);
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 994a7df84a7b..13b216f71191 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -51,7 +51,6 @@
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
#include <asm/x86_init.h>
-#include <asm/rtc.h>
#include <asm/uv/uv.h>
#define EFI_DEBUG
diff --git a/drivers/acpi/acpi_cmos_rtc.c b/drivers/acpi/acpi_cmos_rtc.c
index 81dc75033f15..0980a133916f 100644
--- a/drivers/acpi/acpi_cmos_rtc.c
+++ b/drivers/acpi/acpi_cmos_rtc.c
@@ -14,7 +14,7 @@
#include <linux/err.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <asm-generic/rtc.h>
+#include <linux/mc146818rtc.h>
#include "internal.h"
diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c
index a6975795e7f3..efec10b49d59 100644
--- a/drivers/base/power/trace.c
+++ b/drivers/base/power/trace.c
@@ -11,7 +11,7 @@
#include <linux/export.h>
#include <linux/rtc.h>
-#include <asm/rtc.h>
+#include <linux/mc146818rtc.h>
#include "power.h"
@@ -103,7 +103,7 @@ static int set_magic_time(unsigned int user, unsigned int file, unsigned int dev
n /= 24;
time.tm_min = (n % 20) * 3;
n /= 20;
- set_rtc_time(&time);
+ mc146818_set_time(&time);
return n ? -1 : 0;
}
@@ -112,7 +112,7 @@ static unsigned int read_magic_time(void)
struct rtc_time time;
unsigned int val;
- get_rtc_time(&time);
+ mc146818_get_time(&time);
pr_info("RTC time: %2d:%02d:%02d, date: %02d/%02d/%02d\n",
time.tm_hour, time.tm_min, time.tm_sec,
time.tm_mon + 1, time.tm_mday, time.tm_year % 100);
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index ca397384dc15..9bdb629fbaae 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on ALPHA || M68K || MN10300 || PARISC || PPC || X86
+ depends on ALPHA || M68K || MN10300 || PARISC || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
index 548ea6f6f384..bb8ac7c5e217 100644
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
@@ -32,11 +32,11 @@
#include <linux/interrupt.h>
#include <linux/spinlock.h>
#include <linux/kernel.h>
+#include <linux/mc146818rtc.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/sfi.h>
-#include <asm-generic/rtc.h>
#include <asm/intel_scu_ipc.h>
#include <asm/intel-mid.h>
#include <asm/intel_mid_vrtc.h>
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
Commit 3195ef59cb42 ("x86: Do full rtc synchronization with ntp") had
the side-effect of unconditionally enabling the RTC_LIB symbol on x86,
which in turn disables the selection of the CONFIG_RTC and
CONFIG_GEN_RTC drivers that contain a two older implementations of
the CONFIG_RTC_DRV_CMOS driver.
This removes x86 from the list for genrtc, and changes all references
to the asm/rtc.h header to instead point to the interfaces
from linux/mc146818rtc.h.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/x86/include/asm/rtc.h | 1 -
arch/x86/kernel/hpet.c | 3 +--
arch/x86/kernel/rtc.c | 3 +--
arch/x86/platform/efi/efi.c | 1 -
drivers/acpi/acpi_cmos_rtc.c | 2 +-
drivers/base/power/trace.c | 6 +++---
drivers/char/Kconfig | 2 +-
drivers/rtc/rtc-mrst.c | 2 +-
8 files changed, 8 insertions(+), 12 deletions(-)
delete mode 100644 arch/x86/include/asm/rtc.h
diff --git a/arch/x86/include/asm/rtc.h b/arch/x86/include/asm/rtc.h
deleted file mode 100644
index f71c3b0ed360..000000000000
--- a/arch/x86/include/asm/rtc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/rtc.h>
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index f112af7aa62e..357900aad62c 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -1020,7 +1020,6 @@ void hpet_disable(void)
*/
#include <linux/mc146818rtc.h>
#include <linux/rtc.h>
-#include <asm/rtc.h>
#define DEFAULT_RTC_INT_FREQ 64
#define DEFAULT_RTC_SHIFT 6
@@ -1244,7 +1243,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
memset(&curr_time, 0, sizeof(struct rtc_time));
if (hpet_rtc_flags & (RTC_UIE | RTC_AIE))
- get_rtc_time(&curr_time);
+ mc146818_set_time(&curr_time);
if (hpet_rtc_flags & RTC_UIE &&
curr_time.tm_sec != hpet_prev_update_sec) {
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index eceaa082ec3f..79c6311cd912 100644
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -13,7 +13,6 @@
#include <asm/x86_init.h>
#include <asm/time.h>
#include <asm/intel-mid.h>
-#include <asm/rtc.h>
#include <asm/setup.h>
#ifdef CONFIG_X86_32
@@ -47,7 +46,7 @@ int mach_set_rtc_mmss(const struct timespec *now)
rtc_time_to_tm(nowtime, &tm);
if (!rtc_valid_tm(&tm)) {
- retval = set_rtc_time(&tm);
+ retval = mc146818_set_time(&tm);
if (retval)
printk(KERN_ERR "%s: RTC write failed with error %d\n",
__func__, retval);
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 994a7df84a7b..13b216f71191 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -51,7 +51,6 @@
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
#include <asm/x86_init.h>
-#include <asm/rtc.h>
#include <asm/uv/uv.h>
#define EFI_DEBUG
diff --git a/drivers/acpi/acpi_cmos_rtc.c b/drivers/acpi/acpi_cmos_rtc.c
index 81dc75033f15..0980a133916f 100644
--- a/drivers/acpi/acpi_cmos_rtc.c
+++ b/drivers/acpi/acpi_cmos_rtc.c
@@ -14,7 +14,7 @@
#include <linux/err.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <asm-generic/rtc.h>
+#include <linux/mc146818rtc.h>
#include "internal.h"
diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c
index a6975795e7f3..efec10b49d59 100644
--- a/drivers/base/power/trace.c
+++ b/drivers/base/power/trace.c
@@ -11,7 +11,7 @@
#include <linux/export.h>
#include <linux/rtc.h>
-#include <asm/rtc.h>
+#include <linux/mc146818rtc.h>
#include "power.h"
@@ -103,7 +103,7 @@ static int set_magic_time(unsigned int user, unsigned int file, unsigned int dev
n /= 24;
time.tm_min = (n % 20) * 3;
n /= 20;
- set_rtc_time(&time);
+ mc146818_set_time(&time);
return n ? -1 : 0;
}
@@ -112,7 +112,7 @@ static unsigned int read_magic_time(void)
struct rtc_time time;
unsigned int val;
- get_rtc_time(&time);
+ mc146818_get_time(&time);
pr_info("RTC time: %2d:%02d:%02d, date: %02d/%02d/%02d\n",
time.tm_hour, time.tm_min, time.tm_sec,
time.tm_mon + 1, time.tm_mday, time.tm_year % 100);
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index ca397384dc15..9bdb629fbaae 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on ALPHA || M68K || MN10300 || PARISC || PPC || X86
+ depends on ALPHA || M68K || MN10300 || PARISC || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
index 548ea6f6f384..bb8ac7c5e217 100644
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
@@ -32,11 +32,11 @@
#include <linux/interrupt.h>
#include <linux/spinlock.h>
#include <linux/kernel.h>
+#include <linux/mc146818rtc.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/sfi.h>
-#include <asm-generic/rtc.h>
#include <asm/intel_scu_ipc.h>
#include <asm/intel-mid.h>
#include <asm/intel_mid_vrtc.h>
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread
* [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
2016-04-27 22:34 ` Arnd Bergmann
(?)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and on sh, that goes through another indirection using
the rtc_sh_get_time/rtc_sh_set_time functions.
This changes the sh rtc-generic device to provide its
rtc_class_ops directly, skipping one of the abstraction
levels.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/sh/include/asm/rtc.h | 11 -----------
arch/sh/kernel/time.c | 32 +++++++++++++++++++-------------
drivers/rtc/rtc-generic.c | 2 +-
3 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/arch/sh/include/asm/rtc.h b/arch/sh/include/asm/rtc.h
index 52b0c2dba979..f7b010d48af7 100644
--- a/arch/sh/include/asm/rtc.h
+++ b/arch/sh/include/asm/rtc.h
@@ -6,17 +6,6 @@ extern void (*board_time_init)(void);
extern void (*rtc_sh_get_time)(struct timespec *);
extern int (*rtc_sh_set_time)(const time_t);
-/* some dummy definitions */
-#define RTC_BATT_BAD 0x100 /* battery bad */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-struct rtc_time;
-unsigned int get_rtc_time(struct rtc_time *);
-int set_rtc_time(struct rtc_time *);
-
#define RTC_CAP_4_DIGIT_YEAR (1 << 0)
struct sh_rtc_platform_info {
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index d6d0a986c6e9..92cd676970d9 100644
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time.c
@@ -50,27 +50,30 @@ int update_persistent_clock(struct timespec now)
}
#endif
-unsigned int get_rtc_time(struct rtc_time *tm)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
{
- if (rtc_sh_get_time != null_rtc_get_time) {
- struct timespec tv;
+ struct timespec tv;
- rtc_sh_get_time(&tv);
- rtc_time_to_tm(tv.tv_sec, tm);
- }
-
- return RTC_24H;
+ rtc_sh_get_time(&tv);
+ rtc_time_to_tm(tv.tv_sec, tm);
+ return 0;
}
-EXPORT_SYMBOL(get_rtc_time);
-int set_rtc_time(struct rtc_time *tm)
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
{
unsigned long secs;
rtc_tm_to_time(tm, &secs);
- return rtc_sh_set_time(secs);
+ if (!rtc_sh_set_time || rtc_sh_set_time(secs) < 0)
+ return -EOPNOTSUPP;
+
+ return 0;
}
-EXPORT_SYMBOL(set_rtc_time);
+
+static const struct rtc_class_ops rtc_generic_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
static int __init rtc_generic_init(void)
{
@@ -79,7 +82,10 @@ static int __init rtc_generic_init(void)
if (rtc_sh_get_time = null_rtc_get_time)
return -ENODEV;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &rtc_generic_ops,
+ sizeof(rtc_generic_ops));
+
return PTR_ERR_OR_ZERO(pdev);
}
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index d726c6aa96a8..3958e87a05fa 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -10,7 +10,7 @@
#include <linux/rtc.h>
#if defined(CONFIG_M68K) || defined(CONFIG_PARISC) || \
- defined(CONFIG_PPC) || defined(CONFIG_SUPERH32)
+ defined(CONFIG_PPC)
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [rtc-linux] [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and on sh, that goes through another indirection using
the rtc_sh_get_time/rtc_sh_set_time functions.
This changes the sh rtc-generic device to provide its
rtc_class_ops directly, skipping one of the abstraction
levels.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/sh/include/asm/rtc.h | 11 -----------
arch/sh/kernel/time.c | 32 +++++++++++++++++++-------------
drivers/rtc/rtc-generic.c | 2 +-
3 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/arch/sh/include/asm/rtc.h b/arch/sh/include/asm/rtc.h
index 52b0c2dba979..f7b010d48af7 100644
--- a/arch/sh/include/asm/rtc.h
+++ b/arch/sh/include/asm/rtc.h
@@ -6,17 +6,6 @@ extern void (*board_time_init)(void);
extern void (*rtc_sh_get_time)(struct timespec *);
extern int (*rtc_sh_set_time)(const time_t);
-/* some dummy definitions */
-#define RTC_BATT_BAD 0x100 /* battery bad */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-struct rtc_time;
-unsigned int get_rtc_time(struct rtc_time *);
-int set_rtc_time(struct rtc_time *);
-
#define RTC_CAP_4_DIGIT_YEAR (1 << 0)
struct sh_rtc_platform_info {
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index d6d0a986c6e9..92cd676970d9 100644
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time.c
@@ -50,27 +50,30 @@ int update_persistent_clock(struct timespec now)
}
#endif
-unsigned int get_rtc_time(struct rtc_time *tm)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
{
- if (rtc_sh_get_time != null_rtc_get_time) {
- struct timespec tv;
+ struct timespec tv;
- rtc_sh_get_time(&tv);
- rtc_time_to_tm(tv.tv_sec, tm);
- }
-
- return RTC_24H;
+ rtc_sh_get_time(&tv);
+ rtc_time_to_tm(tv.tv_sec, tm);
+ return 0;
}
-EXPORT_SYMBOL(get_rtc_time);
-int set_rtc_time(struct rtc_time *tm)
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
{
unsigned long secs;
rtc_tm_to_time(tm, &secs);
- return rtc_sh_set_time(secs);
+ if (!rtc_sh_set_time || rtc_sh_set_time(secs) < 0)
+ return -EOPNOTSUPP;
+
+ return 0;
}
-EXPORT_SYMBOL(set_rtc_time);
+
+static const struct rtc_class_ops rtc_generic_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
static int __init rtc_generic_init(void)
{
@@ -79,7 +82,10 @@ static int __init rtc_generic_init(void)
if (rtc_sh_get_time == null_rtc_get_time)
return -ENODEV;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &rtc_generic_ops,
+ sizeof(rtc_generic_ops));
+
return PTR_ERR_OR_ZERO(pdev);
}
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index d726c6aa96a8..3958e87a05fa 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -10,7 +10,7 @@
#include <linux/rtc.h>
#if defined(CONFIG_M68K) || defined(CONFIG_PARISC) || \
- defined(CONFIG_PPC) || defined(CONFIG_SUPERH32)
+ defined(CONFIG_PPC)
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and on sh, that goes through another indirection using
the rtc_sh_get_time/rtc_sh_set_time functions.
This changes the sh rtc-generic device to provide its
rtc_class_ops directly, skipping one of the abstraction
levels.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/sh/include/asm/rtc.h | 11 -----------
arch/sh/kernel/time.c | 32 +++++++++++++++++++-------------
drivers/rtc/rtc-generic.c | 2 +-
3 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/arch/sh/include/asm/rtc.h b/arch/sh/include/asm/rtc.h
index 52b0c2dba979..f7b010d48af7 100644
--- a/arch/sh/include/asm/rtc.h
+++ b/arch/sh/include/asm/rtc.h
@@ -6,17 +6,6 @@ extern void (*board_time_init)(void);
extern void (*rtc_sh_get_time)(struct timespec *);
extern int (*rtc_sh_set_time)(const time_t);
-/* some dummy definitions */
-#define RTC_BATT_BAD 0x100 /* battery bad */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-struct rtc_time;
-unsigned int get_rtc_time(struct rtc_time *);
-int set_rtc_time(struct rtc_time *);
-
#define RTC_CAP_4_DIGIT_YEAR (1 << 0)
struct sh_rtc_platform_info {
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index d6d0a986c6e9..92cd676970d9 100644
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time.c
@@ -50,27 +50,30 @@ int update_persistent_clock(struct timespec now)
}
#endif
-unsigned int get_rtc_time(struct rtc_time *tm)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
{
- if (rtc_sh_get_time != null_rtc_get_time) {
- struct timespec tv;
+ struct timespec tv;
- rtc_sh_get_time(&tv);
- rtc_time_to_tm(tv.tv_sec, tm);
- }
-
- return RTC_24H;
+ rtc_sh_get_time(&tv);
+ rtc_time_to_tm(tv.tv_sec, tm);
+ return 0;
}
-EXPORT_SYMBOL(get_rtc_time);
-int set_rtc_time(struct rtc_time *tm)
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
{
unsigned long secs;
rtc_tm_to_time(tm, &secs);
- return rtc_sh_set_time(secs);
+ if (!rtc_sh_set_time || rtc_sh_set_time(secs) < 0)
+ return -EOPNOTSUPP;
+
+ return 0;
}
-EXPORT_SYMBOL(set_rtc_time);
+
+static const struct rtc_class_ops rtc_generic_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
static int __init rtc_generic_init(void)
{
@@ -79,7 +82,10 @@ static int __init rtc_generic_init(void)
if (rtc_sh_get_time == null_rtc_get_time)
return -ENODEV;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &rtc_generic_ops,
+ sizeof(rtc_generic_ops));
+
return PTR_ERR_OR_ZERO(pdev);
}
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index d726c6aa96a8..3958e87a05fa 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -10,7 +10,7 @@
#include <linux/rtc.h>
#if defined(CONFIG_M68K) || defined(CONFIG_PARISC) || \
- defined(CONFIG_PPC) || defined(CONFIG_SUPERH32)
+ defined(CONFIG_PPC)
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and on sh, that goes through another indirection using
the rtc_sh_get_time/rtc_sh_set_time functions.
This changes the sh rtc-generic device to provide its
rtc_class_ops directly, skipping one of the abstraction
levels.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/sh/include/asm/rtc.h | 11 -----------
arch/sh/kernel/time.c | 32 +++++++++++++++++++-------------
drivers/rtc/rtc-generic.c | 2 +-
3 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/arch/sh/include/asm/rtc.h b/arch/sh/include/asm/rtc.h
index 52b0c2dba979..f7b010d48af7 100644
--- a/arch/sh/include/asm/rtc.h
+++ b/arch/sh/include/asm/rtc.h
@@ -6,17 +6,6 @@ extern void (*board_time_init)(void);
extern void (*rtc_sh_get_time)(struct timespec *);
extern int (*rtc_sh_set_time)(const time_t);
-/* some dummy definitions */
-#define RTC_BATT_BAD 0x100 /* battery bad */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-struct rtc_time;
-unsigned int get_rtc_time(struct rtc_time *);
-int set_rtc_time(struct rtc_time *);
-
#define RTC_CAP_4_DIGIT_YEAR (1 << 0)
struct sh_rtc_platform_info {
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index d6d0a986c6e9..92cd676970d9 100644
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time.c
@@ -50,27 +50,30 @@ int update_persistent_clock(struct timespec now)
}
#endif
-unsigned int get_rtc_time(struct rtc_time *tm)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
{
- if (rtc_sh_get_time != null_rtc_get_time) {
- struct timespec tv;
+ struct timespec tv;
- rtc_sh_get_time(&tv);
- rtc_time_to_tm(tv.tv_sec, tm);
- }
-
- return RTC_24H;
+ rtc_sh_get_time(&tv);
+ rtc_time_to_tm(tv.tv_sec, tm);
+ return 0;
}
-EXPORT_SYMBOL(get_rtc_time);
-int set_rtc_time(struct rtc_time *tm)
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
{
unsigned long secs;
rtc_tm_to_time(tm, &secs);
- return rtc_sh_set_time(secs);
+ if (!rtc_sh_set_time || rtc_sh_set_time(secs) < 0)
+ return -EOPNOTSUPP;
+
+ return 0;
}
-EXPORT_SYMBOL(set_rtc_time);
+
+static const struct rtc_class_ops rtc_generic_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
static int __init rtc_generic_init(void)
{
@@ -79,7 +82,10 @@ static int __init rtc_generic_init(void)
if (rtc_sh_get_time == null_rtc_get_time)
return -ENODEV;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &rtc_generic_ops,
+ sizeof(rtc_generic_ops));
+
return PTR_ERR_OR_ZERO(pdev);
}
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index d726c6aa96a8..3958e87a05fa 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -10,7 +10,7 @@
#include <linux/rtc.h>
#if defined(CONFIG_M68K) || defined(CONFIG_PARISC) || \
- defined(CONFIG_PPC) || defined(CONFIG_SUPERH32)
+ defined(CONFIG_PPC)
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
2016-04-27 22:34 ` Arnd Bergmann
(?)
(?)
@ 2016-04-27 23:21 ` Rich Felker
-1 siblings, 0 replies; 144+ messages in thread
From: Rich Felker @ 2016-04-27 23:21 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, geert, deller, benh, mpe, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
On Thu, Apr 28, 2016 at 12:34:18AM +0200, Arnd Bergmann wrote:
> The rtc-generic driver provides an architecture specific
> wrapper on top of the generic rtc_class_ops abstraction,
> and on sh, that goes through another indirection using
> the rtc_sh_get_time/rtc_sh_set_time functions.
>
> This changes the sh rtc-generic device to provide its
> rtc_class_ops directly, skipping one of the abstraction
> levels.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Looks ok in principle. Have you tested that it builds? Some questions
inline:
> ---
> arch/sh/include/asm/rtc.h | 11 -----------
> arch/sh/kernel/time.c | 32 +++++++++++++++++++-------------
> drivers/rtc/rtc-generic.c | 2 +-
> 3 files changed, 20 insertions(+), 25 deletions(-)
>
> diff --git a/arch/sh/include/asm/rtc.h b/arch/sh/include/asm/rtc.h
> index 52b0c2dba979..f7b010d48af7 100644
> --- a/arch/sh/include/asm/rtc.h
> +++ b/arch/sh/include/asm/rtc.h
> @@ -6,17 +6,6 @@ extern void (*board_time_init)(void);
> extern void (*rtc_sh_get_time)(struct timespec *);
> extern int (*rtc_sh_set_time)(const time_t);
>
> -/* some dummy definitions */
> -#define RTC_BATT_BAD 0x100 /* battery bad */
> -#define RTC_SQWE 0x08 /* enable square-wave output */
> -#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
> -#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
> -#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
> -
> -struct rtc_time;
> -unsigned int get_rtc_time(struct rtc_time *);
> -int set_rtc_time(struct rtc_time *);
> -
> #define RTC_CAP_4_DIGIT_YEAR (1 << 0)
>
> struct sh_rtc_platform_info {
> diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
> index d6d0a986c6e9..92cd676970d9 100644
> --- a/arch/sh/kernel/time.c
> +++ b/arch/sh/kernel/time.c
> @@ -50,27 +50,30 @@ int update_persistent_clock(struct timespec now)
> }
> #endif
>
> -unsigned int get_rtc_time(struct rtc_time *tm)
> +static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
> {
> - if (rtc_sh_get_time != null_rtc_get_time) {
This seems like a functional change -- whereas previously the
null_rtc_get_time case left *tm unchanged, now the function gets
called and junk gets filled in. Is that desired?
> - struct timespec tv;
> + struct timespec tv;
>
> - rtc_sh_get_time(&tv);
> - rtc_time_to_tm(tv.tv_sec, tm);
> - }
> -
> - return RTC_24H;
> + rtc_sh_get_time(&tv);
> + rtc_time_to_tm(tv.tv_sec, tm);
> + return 0;
Also the return value is changed. Is this correct?
> }
> -EXPORT_SYMBOL(get_rtc_time);
>
> -int set_rtc_time(struct rtc_time *tm)
> +static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
> {
> unsigned long secs;
>
> rtc_tm_to_time(tm, &secs);
> - return rtc_sh_set_time(secs);
> + if (!rtc_sh_set_time || rtc_sh_set_time(secs) < 0)
> + return -EOPNOTSUPP;
> +
> + return 0;
> }
> -EXPORT_SYMBOL(set_rtc_time);
Why checking rtc_sh_set_time for a null pointer? null_rtc_set_time is
not a null pointer but a dummy function that's always safe to call, I
think.
> +
> +static const struct rtc_class_ops rtc_generic_ops = {
> + .read_time = rtc_generic_get_time,
> + .set_time = rtc_generic_set_time,
> +};
>
> static int __init rtc_generic_init(void)
> {
> @@ -79,7 +82,10 @@ static int __init rtc_generic_init(void)
> if (rtc_sh_get_time = null_rtc_get_time)
> return -ENODEV;
>
> - pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
> + pdev = platform_device_register_data(NULL, "rtc-generic", -1,
> + &rtc_generic_ops,
> + sizeof(rtc_generic_ops));
> +
Not a complaint about your patch, but I'd like to get rid of this
platform device and abstraction layer completely since it doesn't seem
like something that can be modeled correctly in device tree. When
you're done cleaning this up, will it be possible to just have rtc
drivers that use whatever generic framework is left, where the right
driver is automatically attached to compatible DT nodes? I'm trying to
move all of arch/sh over to device tree and remove hard-coded platform
devices.
Rich
^ permalink raw reply [flat|nested] 144+ messages in thread* [rtc-linux] Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
@ 2016-04-27 23:21 ` Rich Felker
0 siblings, 0 replies; 144+ messages in thread
From: Rich Felker @ 2016-04-27 23:21 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, geert, deller, benh, mpe, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
On Thu, Apr 28, 2016 at 12:34:18AM +0200, Arnd Bergmann wrote:
> The rtc-generic driver provides an architecture specific
> wrapper on top of the generic rtc_class_ops abstraction,
> and on sh, that goes through another indirection using
> the rtc_sh_get_time/rtc_sh_set_time functions.
>
> This changes the sh rtc-generic device to provide its
> rtc_class_ops directly, skipping one of the abstraction
> levels.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Looks ok in principle. Have you tested that it builds? Some questions
inline:
> ---
> arch/sh/include/asm/rtc.h | 11 -----------
> arch/sh/kernel/time.c | 32 +++++++++++++++++++-------------
> drivers/rtc/rtc-generic.c | 2 +-
> 3 files changed, 20 insertions(+), 25 deletions(-)
>
> diff --git a/arch/sh/include/asm/rtc.h b/arch/sh/include/asm/rtc.h
> index 52b0c2dba979..f7b010d48af7 100644
> --- a/arch/sh/include/asm/rtc.h
> +++ b/arch/sh/include/asm/rtc.h
> @@ -6,17 +6,6 @@ extern void (*board_time_init)(void);
> extern void (*rtc_sh_get_time)(struct timespec *);
> extern int (*rtc_sh_set_time)(const time_t);
>
> -/* some dummy definitions */
> -#define RTC_BATT_BAD 0x100 /* battery bad */
> -#define RTC_SQWE 0x08 /* enable square-wave output */
> -#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
> -#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
> -#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
> -
> -struct rtc_time;
> -unsigned int get_rtc_time(struct rtc_time *);
> -int set_rtc_time(struct rtc_time *);
> -
> #define RTC_CAP_4_DIGIT_YEAR (1 << 0)
>
> struct sh_rtc_platform_info {
> diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
> index d6d0a986c6e9..92cd676970d9 100644
> --- a/arch/sh/kernel/time.c
> +++ b/arch/sh/kernel/time.c
> @@ -50,27 +50,30 @@ int update_persistent_clock(struct timespec now)
> }
> #endif
>
> -unsigned int get_rtc_time(struct rtc_time *tm)
> +static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
> {
> - if (rtc_sh_get_time != null_rtc_get_time) {
This seems like a functional change -- whereas previously the
null_rtc_get_time case left *tm unchanged, now the function gets
called and junk gets filled in. Is that desired?
> - struct timespec tv;
> + struct timespec tv;
>
> - rtc_sh_get_time(&tv);
> - rtc_time_to_tm(tv.tv_sec, tm);
> - }
> -
> - return RTC_24H;
> + rtc_sh_get_time(&tv);
> + rtc_time_to_tm(tv.tv_sec, tm);
> + return 0;
Also the return value is changed. Is this correct?
> }
> -EXPORT_SYMBOL(get_rtc_time);
>
> -int set_rtc_time(struct rtc_time *tm)
> +static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
> {
> unsigned long secs;
>
> rtc_tm_to_time(tm, &secs);
> - return rtc_sh_set_time(secs);
> + if (!rtc_sh_set_time || rtc_sh_set_time(secs) < 0)
> + return -EOPNOTSUPP;
> +
> + return 0;
> }
> -EXPORT_SYMBOL(set_rtc_time);
Why checking rtc_sh_set_time for a null pointer? null_rtc_set_time is
not a null pointer but a dummy function that's always safe to call, I
think.
> +
> +static const struct rtc_class_ops rtc_generic_ops = {
> + .read_time = rtc_generic_get_time,
> + .set_time = rtc_generic_set_time,
> +};
>
> static int __init rtc_generic_init(void)
> {
> @@ -79,7 +82,10 @@ static int __init rtc_generic_init(void)
> if (rtc_sh_get_time == null_rtc_get_time)
> return -ENODEV;
>
> - pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
> + pdev = platform_device_register_data(NULL, "rtc-generic", -1,
> + &rtc_generic_ops,
> + sizeof(rtc_generic_ops));
> +
Not a complaint about your patch, but I'd like to get rid of this
platform device and abstraction layer completely since it doesn't seem
like something that can be modeled correctly in device tree. When
you're done cleaning this up, will it be possible to just have rtc
drivers that use whatever generic framework is left, where the right
driver is automatically attached to compatible DT nodes? I'm trying to
move all of arch/sh over to device tree and remove hard-coded platform
devices.
Rich
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
@ 2016-04-27 23:21 ` Rich Felker
0 siblings, 0 replies; 144+ messages in thread
From: Rich Felker @ 2016-04-27 23:21 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, geert, deller, benh, mpe, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
On Thu, Apr 28, 2016 at 12:34:18AM +0200, Arnd Bergmann wrote:
> The rtc-generic driver provides an architecture specific
> wrapper on top of the generic rtc_class_ops abstraction,
> and on sh, that goes through another indirection using
> the rtc_sh_get_time/rtc_sh_set_time functions.
>
> This changes the sh rtc-generic device to provide its
> rtc_class_ops directly, skipping one of the abstraction
> levels.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Looks ok in principle. Have you tested that it builds? Some questions
inline:
> ---
> arch/sh/include/asm/rtc.h | 11 -----------
> arch/sh/kernel/time.c | 32 +++++++++++++++++++-------------
> drivers/rtc/rtc-generic.c | 2 +-
> 3 files changed, 20 insertions(+), 25 deletions(-)
>
> diff --git a/arch/sh/include/asm/rtc.h b/arch/sh/include/asm/rtc.h
> index 52b0c2dba979..f7b010d48af7 100644
> --- a/arch/sh/include/asm/rtc.h
> +++ b/arch/sh/include/asm/rtc.h
> @@ -6,17 +6,6 @@ extern void (*board_time_init)(void);
> extern void (*rtc_sh_get_time)(struct timespec *);
> extern int (*rtc_sh_set_time)(const time_t);
>
> -/* some dummy definitions */
> -#define RTC_BATT_BAD 0x100 /* battery bad */
> -#define RTC_SQWE 0x08 /* enable square-wave output */
> -#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
> -#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
> -#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
> -
> -struct rtc_time;
> -unsigned int get_rtc_time(struct rtc_time *);
> -int set_rtc_time(struct rtc_time *);
> -
> #define RTC_CAP_4_DIGIT_YEAR (1 << 0)
>
> struct sh_rtc_platform_info {
> diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
> index d6d0a986c6e9..92cd676970d9 100644
> --- a/arch/sh/kernel/time.c
> +++ b/arch/sh/kernel/time.c
> @@ -50,27 +50,30 @@ int update_persistent_clock(struct timespec now)
> }
> #endif
>
> -unsigned int get_rtc_time(struct rtc_time *tm)
> +static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
> {
> - if (rtc_sh_get_time != null_rtc_get_time) {
This seems like a functional change -- whereas previously the
null_rtc_get_time case left *tm unchanged, now the function gets
called and junk gets filled in. Is that desired?
> - struct timespec tv;
> + struct timespec tv;
>
> - rtc_sh_get_time(&tv);
> - rtc_time_to_tm(tv.tv_sec, tm);
> - }
> -
> - return RTC_24H;
> + rtc_sh_get_time(&tv);
> + rtc_time_to_tm(tv.tv_sec, tm);
> + return 0;
Also the return value is changed. Is this correct?
> }
> -EXPORT_SYMBOL(get_rtc_time);
>
> -int set_rtc_time(struct rtc_time *tm)
> +static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
> {
> unsigned long secs;
>
> rtc_tm_to_time(tm, &secs);
> - return rtc_sh_set_time(secs);
> + if (!rtc_sh_set_time || rtc_sh_set_time(secs) < 0)
> + return -EOPNOTSUPP;
> +
> + return 0;
> }
> -EXPORT_SYMBOL(set_rtc_time);
Why checking rtc_sh_set_time for a null pointer? null_rtc_set_time is
not a null pointer but a dummy function that's always safe to call, I
think.
> +
> +static const struct rtc_class_ops rtc_generic_ops = {
> + .read_time = rtc_generic_get_time,
> + .set_time = rtc_generic_set_time,
> +};
>
> static int __init rtc_generic_init(void)
> {
> @@ -79,7 +82,10 @@ static int __init rtc_generic_init(void)
> if (rtc_sh_get_time == null_rtc_get_time)
> return -ENODEV;
>
> - pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
> + pdev = platform_device_register_data(NULL, "rtc-generic", -1,
> + &rtc_generic_ops,
> + sizeof(rtc_generic_ops));
> +
Not a complaint about your patch, but I'd like to get rid of this
platform device and abstraction layer completely since it doesn't seem
like something that can be modeled correctly in device tree. When
you're done cleaning this up, will it be possible to just have rtc
drivers that use whatever generic framework is left, where the right
driver is automatically attached to compatible DT nodes? I'm trying to
move all of arch/sh over to device tree and remove hard-coded platform
devices.
Rich
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
@ 2016-04-27 23:21 ` Rich Felker
0 siblings, 0 replies; 144+ messages in thread
From: Rich Felker @ 2016-04-27 23:21 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, geert, deller, benh, mpe, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
On Thu, Apr 28, 2016 at 12:34:18AM +0200, Arnd Bergmann wrote:
> The rtc-generic driver provides an architecture specific
> wrapper on top of the generic rtc_class_ops abstraction,
> and on sh, that goes through another indirection using
> the rtc_sh_get_time/rtc_sh_set_time functions.
>
> This changes the sh rtc-generic device to provide its
> rtc_class_ops directly, skipping one of the abstraction
> levels.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Looks ok in principle. Have you tested that it builds? Some questions
inline:
> ---
> arch/sh/include/asm/rtc.h | 11 -----------
> arch/sh/kernel/time.c | 32 +++++++++++++++++++-------------
> drivers/rtc/rtc-generic.c | 2 +-
> 3 files changed, 20 insertions(+), 25 deletions(-)
>
> diff --git a/arch/sh/include/asm/rtc.h b/arch/sh/include/asm/rtc.h
> index 52b0c2dba979..f7b010d48af7 100644
> --- a/arch/sh/include/asm/rtc.h
> +++ b/arch/sh/include/asm/rtc.h
> @@ -6,17 +6,6 @@ extern void (*board_time_init)(void);
> extern void (*rtc_sh_get_time)(struct timespec *);
> extern int (*rtc_sh_set_time)(const time_t);
>
> -/* some dummy definitions */
> -#define RTC_BATT_BAD 0x100 /* battery bad */
> -#define RTC_SQWE 0x08 /* enable square-wave output */
> -#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
> -#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
> -#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
> -
> -struct rtc_time;
> -unsigned int get_rtc_time(struct rtc_time *);
> -int set_rtc_time(struct rtc_time *);
> -
> #define RTC_CAP_4_DIGIT_YEAR (1 << 0)
>
> struct sh_rtc_platform_info {
> diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
> index d6d0a986c6e9..92cd676970d9 100644
> --- a/arch/sh/kernel/time.c
> +++ b/arch/sh/kernel/time.c
> @@ -50,27 +50,30 @@ int update_persistent_clock(struct timespec now)
> }
> #endif
>
> -unsigned int get_rtc_time(struct rtc_time *tm)
> +static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
> {
> - if (rtc_sh_get_time != null_rtc_get_time) {
This seems like a functional change -- whereas previously the
null_rtc_get_time case left *tm unchanged, now the function gets
called and junk gets filled in. Is that desired?
> - struct timespec tv;
> + struct timespec tv;
>
> - rtc_sh_get_time(&tv);
> - rtc_time_to_tm(tv.tv_sec, tm);
> - }
> -
> - return RTC_24H;
> + rtc_sh_get_time(&tv);
> + rtc_time_to_tm(tv.tv_sec, tm);
> + return 0;
Also the return value is changed. Is this correct?
> }
> -EXPORT_SYMBOL(get_rtc_time);
>
> -int set_rtc_time(struct rtc_time *tm)
> +static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
> {
> unsigned long secs;
>
> rtc_tm_to_time(tm, &secs);
> - return rtc_sh_set_time(secs);
> + if (!rtc_sh_set_time || rtc_sh_set_time(secs) < 0)
> + return -EOPNOTSUPP;
> +
> + return 0;
> }
> -EXPORT_SYMBOL(set_rtc_time);
Why checking rtc_sh_set_time for a null pointer? null_rtc_set_time is
not a null pointer but a dummy function that's always safe to call, I
think.
> +
> +static const struct rtc_class_ops rtc_generic_ops = {
> + .read_time = rtc_generic_get_time,
> + .set_time = rtc_generic_set_time,
> +};
>
> static int __init rtc_generic_init(void)
> {
> @@ -79,7 +82,10 @@ static int __init rtc_generic_init(void)
> if (rtc_sh_get_time == null_rtc_get_time)
> return -ENODEV;
>
> - pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
> + pdev = platform_device_register_data(NULL, "rtc-generic", -1,
> + &rtc_generic_ops,
> + sizeof(rtc_generic_ops));
> +
Not a complaint about your patch, but I'd like to get rid of this
platform device and abstraction layer completely since it doesn't seem
like something that can be modeled correctly in device tree. When
you're done cleaning this up, will it be possible to just have rtc
drivers that use whatever generic framework is left, where the right
driver is automatically attached to compatible DT nodes? I'm trying to
move all of arch/sh over to device tree and remove hard-coded platform
devices.
Rich
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
2016-04-27 23:21 ` Rich Felker
` (2 preceding siblings ...)
(?)
@ 2016-04-28 7:21 ` Geert Uytterhoeven
-1 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-04-28 7:21 UTC (permalink / raw)
To: Rich Felker
Cc: Arnd Bergmann, Alexandre Belloni, Helge Deller,
Benjamin Herrenschmidt, Michael Ellerman, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
Hi Rich,
On Thu, Apr 28, 2016 at 1:21 AM, Rich Felker <dalias@libc.org> wrote:
> Not a complaint about your patch, but I'd like to get rid of this
> platform device and abstraction layer completely since it doesn't seem
> like something that can be modeled correctly in device tree. When
> you're done cleaning this up, will it be possible to just have rtc
> drivers that use whatever generic framework is left, where the right
> driver is automatically attached to compatible DT nodes? I'm trying to
> move all of arch/sh over to device tree and remove hard-coded platform
> devices.
If you describe the RTC in DT, it can bound to a hardware-specific driver
in drivers/rtc/rtc-*.c.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
2016-04-27 23:21 ` Rich Felker
(?)
(?)
@ 2016-04-28 7:21 ` Geert Uytterhoeven
-1 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-04-28 7:21 UTC (permalink / raw)
To: Rich Felker
Cc: Arnd Bergmann, Alexandre Belloni, Helge Deller,
Benjamin Herrenschmidt, Michael Ellerman, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
Hi Rich,
On Thu, Apr 28, 2016 at 1:21 AM, Rich Felker <dalias@libc.org> wrote:
> Not a complaint about your patch, but I'd like to get rid of this
> platform device and abstraction layer completely since it doesn't seem
> like something that can be modeled correctly in device tree. When
> you're done cleaning this up, will it be possible to just have rtc
> drivers that use whatever generic framework is left, where the right
> driver is automatically attached to compatible DT nodes? I'm trying to
> move all of arch/sh over to device tree and remove hard-coded platform
> devices.
If you describe the RTC in DT, it can bound to a hardware-specific driver
in drivers/rtc/rtc-*.c.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 144+ messages in thread* [rtc-linux] Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
@ 2016-04-28 7:21 ` Geert Uytterhoeven
0 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-04-28 7:21 UTC (permalink / raw)
To: Rich Felker
Cc: Arnd Bergmann, Alexandre Belloni, Helge Deller,
Benjamin Herrenschmidt, Michael Ellerman, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
Hi Rich,
On Thu, Apr 28, 2016 at 1:21 AM, Rich Felker <dalias@libc.org> wrote:
> Not a complaint about your patch, but I'd like to get rid of this
> platform device and abstraction layer completely since it doesn't seem
> like something that can be modeled correctly in device tree. When
> you're done cleaning this up, will it be possible to just have rtc
> drivers that use whatever generic framework is left, where the right
> driver is automatically attached to compatible DT nodes? I'm trying to
> move all of arch/sh over to device tree and remove hard-coded platform
> devices.
If you describe the RTC in DT, it can bound to a hardware-specific driver
in drivers/rtc/rtc-*.c.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
@ 2016-04-28 7:21 ` Geert Uytterhoeven
0 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-04-28 7:21 UTC (permalink / raw)
To: Rich Felker
Cc: Arnd Bergmann, Alexandre Belloni, Helge Deller,
Benjamin Herrenschmidt, Michael Ellerman, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
Hi Rich,
On Thu, Apr 28, 2016 at 1:21 AM, Rich Felker <dalias@libc.org> wrote:
> Not a complaint about your patch, but I'd like to get rid of this
> platform device and abstraction layer completely since it doesn't seem
> like something that can be modeled correctly in device tree. When
> you're done cleaning this up, will it be possible to just have rtc
> drivers that use whatever generic framework is left, where the right
> driver is automatically attached to compatible DT nodes? I'm trying to
> move all of arch/sh over to device tree and remove hard-coded platform
> devices.
If you describe the RTC in DT, it can bound to a hardware-specific driver
in drivers/rtc/rtc-*.c.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
@ 2016-04-28 7:21 ` Geert Uytterhoeven
0 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-04-28 7:21 UTC (permalink / raw)
To: Rich Felker
Cc: Arnd Bergmann, Alexandre Belloni, Helge Deller,
Benjamin Herrenschmidt, Michael Ellerman, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
Hi Rich,
On Thu, Apr 28, 2016 at 1:21 AM, Rich Felker <dalias@libc.org> wrote:
> Not a complaint about your patch, but I'd like to get rid of this
> platform device and abstraction layer completely since it doesn't seem
> like something that can be modeled correctly in device tree. When
> you're done cleaning this up, will it be possible to just have rtc
> drivers that use whatever generic framework is left, where the right
> driver is automatically attached to compatible DT nodes? I'm trying to
> move all of arch/sh over to device tree and remove hard-coded platform
> devices.
If you describe the RTC in DT, it can bound to a hardware-specific driver
in drivers/rtc/rtc-*.c.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
2016-04-27 23:21 ` Rich Felker
(?)
(?)
@ 2016-04-28 9:08 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-28 9:08 UTC (permalink / raw)
To: Rich Felker
Cc: Alexandre Belloni, geert, deller, benh, mpe, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
On Wednesday 27 April 2016 19:21:22 Rich Felker wrote:
> On Thu, Apr 28, 2016 at 12:34:18AM +0200, Arnd Bergmann wrote:
> > The rtc-generic driver provides an architecture specific
> > wrapper on top of the generic rtc_class_ops abstraction,
> > and on sh, that goes through another indirection using
> > the rtc_sh_get_time/rtc_sh_set_time functions.
> >
> > This changes the sh rtc-generic device to provide its
> > rtc_class_ops directly, skipping one of the abstraction
> > levels.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Looks ok in principle. Have you tested that it builds?
I think I build tested version 1, but not the current version.
> > diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
> > index d6d0a986c6e9..92cd676970d9 100644
> > --- a/arch/sh/kernel/time.c
> > +++ b/arch/sh/kernel/time.c
> > @@ -50,27 +50,30 @@ int update_persistent_clock(struct timespec now)
> > }
> > #endif
> >
> > -unsigned int get_rtc_time(struct rtc_time *tm)
> > +static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
> > {
> > - if (rtc_sh_get_time != null_rtc_get_time) {
>
> This seems like a functional change -- whereas previously the
> null_rtc_get_time case left *tm unchanged, now the function gets
> called and junk gets filled in. Is that desired?
I dropped the check because it duplicates the check in rtc_generic_init()
below it: the old genrtc driver needed the check in get_rtc_time()
because it would call that function unconditionally, but with the
rtc-generic driver, we know that we only ever call this after
registering the device successfully.
> > - struct timespec tv;
> > + struct timespec tv;
> >
> > - rtc_sh_get_time(&tv);
> > - rtc_time_to_tm(tv.tv_sec, tm);
> > - }
> > -
> > - return RTC_24H;
> > + rtc_sh_get_time(&tv);
> > + rtc_time_to_tm(tv.tv_sec, tm);
> > + return 0;
>
> Also the return value is changed. Is this correct?
Yes: again, the genrtc driver had obscure calling conventions requiring
RTC_24H to be returned on success, while the rtc-generic driver uses
the normal kernel coding style of using 0 for success.
Previously, this function was used to convert from get_rtc_time()
calling conventions (without a device) to the normal rtc_class_ops:
static int generic_get_time(struct device *dev, struct rtc_time *tm)
{
unsigned int ret = get_rtc_time(tm);
if (ret & RTC_BATT_BAD)
return -EOPNOTSUPP;
return rtc_valid_tm(tm);
}
> > }
> > -EXPORT_SYMBOL(get_rtc_time);
> >
> > -int set_rtc_time(struct rtc_time *tm)
> > +static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
> > {
> > unsigned long secs;
> >
> > rtc_tm_to_time(tm, &secs);
> > - return rtc_sh_set_time(secs);
> > + if (!rtc_sh_set_time || rtc_sh_set_time(secs) < 0)
> > + return -EOPNOTSUPP;
> > +
> > + return 0;
> > }
> > -EXPORT_SYMBOL(set_rtc_time);
>
> Why checking rtc_sh_set_time for a null pointer? null_rtc_set_time is
> not a null pointer but a dummy function that's always safe to call, I
> think.
You are right, it should check for null_rtc_set_time instead, I probably
copied it from powerpc, which does this a bit differently.
Actually calling null_rtc_set_time however would be (slightly) wrong here,
because we want to return an error to user space if we try to set a
read-only rtc.
> > +static const struct rtc_class_ops rtc_generic_ops = {
> > + .read_time = rtc_generic_get_time,
> > + .set_time = rtc_generic_set_time,
> > +};
> >
> > static int __init rtc_generic_init(void)
> > {
> > @@ -79,7 +82,10 @@ static int __init rtc_generic_init(void)
> > if (rtc_sh_get_time = null_rtc_get_time)
> > return -ENODEV;
> >
> > - pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
> > + pdev = platform_device_register_data(NULL, "rtc-generic", -1,
> > + &rtc_generic_ops,
> > + sizeof(rtc_generic_ops));
> > +
>
> Not a complaint about your patch, but I'd like to get rid of this
> platform device and abstraction layer completely since it doesn't seem
> like something that can be modeled correctly in device tree. When
> you're done cleaning this up, will it be possible to just have rtc
> drivers that use whatever generic framework is left, where the right
> driver is automatically attached to compatible DT nodes? I'm trying to
> move all of arch/sh over to device tree and remove hard-coded platform
> devices.
Yes, I think that would be great. When an rtc driver is registered, you
don't actually need the read_persistent_clock/update_persistent_clock
functions (there are __weak versions of them that do nothing and cause
a fallback to calling into the rtc subsystem), so you can replace
the rtc_sh_get_time/rtc_sh_set_time with proper drivers one at a time.
I only see two of them anyway (dreamcast and sh03), so that should
be easy enough to do. For instance in arch/sh/boards/mach-sh03/rtc.c,
the sh03_time_init() function should register a platform driver,
whose probe function calls devm_rtc_device_register() to register
with the rtc subsystem. Then you move the entire file to drivers/rtc/
and change the callers of sh03_time_init() to create the device
manually (for the classic board file) or drop it (for DT).
After you have done that, all rtc related code can be removed from
arch/sh/kernel/time.c.
Arnd
^ permalink raw reply [flat|nested] 144+ messages in thread* [rtc-linux] Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
@ 2016-04-28 9:08 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-28 9:08 UTC (permalink / raw)
To: Rich Felker
Cc: Alexandre Belloni, geert, deller, benh, mpe, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
On Wednesday 27 April 2016 19:21:22 Rich Felker wrote:
> On Thu, Apr 28, 2016 at 12:34:18AM +0200, Arnd Bergmann wrote:
> > The rtc-generic driver provides an architecture specific
> > wrapper on top of the generic rtc_class_ops abstraction,
> > and on sh, that goes through another indirection using
> > the rtc_sh_get_time/rtc_sh_set_time functions.
> >
> > This changes the sh rtc-generic device to provide its
> > rtc_class_ops directly, skipping one of the abstraction
> > levels.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Looks ok in principle. Have you tested that it builds?
I think I build tested version 1, but not the current version.
> > diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
> > index d6d0a986c6e9..92cd676970d9 100644
> > --- a/arch/sh/kernel/time.c
> > +++ b/arch/sh/kernel/time.c
> > @@ -50,27 +50,30 @@ int update_persistent_clock(struct timespec now)
> > }
> > #endif
> >
> > -unsigned int get_rtc_time(struct rtc_time *tm)
> > +static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
> > {
> > - if (rtc_sh_get_time != null_rtc_get_time) {
>
> This seems like a functional change -- whereas previously the
> null_rtc_get_time case left *tm unchanged, now the function gets
> called and junk gets filled in. Is that desired?
I dropped the check because it duplicates the check in rtc_generic_init()
below it: the old genrtc driver needed the check in get_rtc_time()
because it would call that function unconditionally, but with the
rtc-generic driver, we know that we only ever call this after
registering the device successfully.
> > - struct timespec tv;
> > + struct timespec tv;
> >
> > - rtc_sh_get_time(&tv);
> > - rtc_time_to_tm(tv.tv_sec, tm);
> > - }
> > -
> > - return RTC_24H;
> > + rtc_sh_get_time(&tv);
> > + rtc_time_to_tm(tv.tv_sec, tm);
> > + return 0;
>
> Also the return value is changed. Is this correct?
Yes: again, the genrtc driver had obscure calling conventions requiring
RTC_24H to be returned on success, while the rtc-generic driver uses
the normal kernel coding style of using 0 for success.
Previously, this function was used to convert from get_rtc_time()
calling conventions (without a device) to the normal rtc_class_ops:
static int generic_get_time(struct device *dev, struct rtc_time *tm)
{
unsigned int ret = get_rtc_time(tm);
if (ret & RTC_BATT_BAD)
return -EOPNOTSUPP;
return rtc_valid_tm(tm);
}
> > }
> > -EXPORT_SYMBOL(get_rtc_time);
> >
> > -int set_rtc_time(struct rtc_time *tm)
> > +static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
> > {
> > unsigned long secs;
> >
> > rtc_tm_to_time(tm, &secs);
> > - return rtc_sh_set_time(secs);
> > + if (!rtc_sh_set_time || rtc_sh_set_time(secs) < 0)
> > + return -EOPNOTSUPP;
> > +
> > + return 0;
> > }
> > -EXPORT_SYMBOL(set_rtc_time);
>
> Why checking rtc_sh_set_time for a null pointer? null_rtc_set_time is
> not a null pointer but a dummy function that's always safe to call, I
> think.
You are right, it should check for null_rtc_set_time instead, I probably
copied it from powerpc, which does this a bit differently.
Actually calling null_rtc_set_time however would be (slightly) wrong here,
because we want to return an error to user space if we try to set a
read-only rtc.
> > +static const struct rtc_class_ops rtc_generic_ops = {
> > + .read_time = rtc_generic_get_time,
> > + .set_time = rtc_generic_set_time,
> > +};
> >
> > static int __init rtc_generic_init(void)
> > {
> > @@ -79,7 +82,10 @@ static int __init rtc_generic_init(void)
> > if (rtc_sh_get_time == null_rtc_get_time)
> > return -ENODEV;
> >
> > - pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
> > + pdev = platform_device_register_data(NULL, "rtc-generic", -1,
> > + &rtc_generic_ops,
> > + sizeof(rtc_generic_ops));
> > +
>
> Not a complaint about your patch, but I'd like to get rid of this
> platform device and abstraction layer completely since it doesn't seem
> like something that can be modeled correctly in device tree. When
> you're done cleaning this up, will it be possible to just have rtc
> drivers that use whatever generic framework is left, where the right
> driver is automatically attached to compatible DT nodes? I'm trying to
> move all of arch/sh over to device tree and remove hard-coded platform
> devices.
Yes, I think that would be great. When an rtc driver is registered, you
don't actually need the read_persistent_clock/update_persistent_clock
functions (there are __weak versions of them that do nothing and cause
a fallback to calling into the rtc subsystem), so you can replace
the rtc_sh_get_time/rtc_sh_set_time with proper drivers one at a time.
I only see two of them anyway (dreamcast and sh03), so that should
be easy enough to do. For instance in arch/sh/boards/mach-sh03/rtc.c,
the sh03_time_init() function should register a platform driver,
whose probe function calls devm_rtc_device_register() to register
with the rtc subsystem. Then you move the entire file to drivers/rtc/
and change the callers of sh03_time_init() to create the device
manually (for the classic board file) or drop it (for DT).
After you have done that, all rtc related code can be removed from
arch/sh/kernel/time.c.
Arnd
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
@ 2016-04-28 9:08 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-28 9:08 UTC (permalink / raw)
To: Rich Felker
Cc: Alexandre Belloni, geert, deller, benh, mpe, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
On Wednesday 27 April 2016 19:21:22 Rich Felker wrote:
> On Thu, Apr 28, 2016 at 12:34:18AM +0200, Arnd Bergmann wrote:
> > The rtc-generic driver provides an architecture specific
> > wrapper on top of the generic rtc_class_ops abstraction,
> > and on sh, that goes through another indirection using
> > the rtc_sh_get_time/rtc_sh_set_time functions.
> >
> > This changes the sh rtc-generic device to provide its
> > rtc_class_ops directly, skipping one of the abstraction
> > levels.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Looks ok in principle. Have you tested that it builds?
I think I build tested version 1, but not the current version.
> > diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
> > index d6d0a986c6e9..92cd676970d9 100644
> > --- a/arch/sh/kernel/time.c
> > +++ b/arch/sh/kernel/time.c
> > @@ -50,27 +50,30 @@ int update_persistent_clock(struct timespec now)
> > }
> > #endif
> >
> > -unsigned int get_rtc_time(struct rtc_time *tm)
> > +static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
> > {
> > - if (rtc_sh_get_time != null_rtc_get_time) {
>
> This seems like a functional change -- whereas previously the
> null_rtc_get_time case left *tm unchanged, now the function gets
> called and junk gets filled in. Is that desired?
I dropped the check because it duplicates the check in rtc_generic_init()
below it: the old genrtc driver needed the check in get_rtc_time()
because it would call that function unconditionally, but with the
rtc-generic driver, we know that we only ever call this after
registering the device successfully.
> > - struct timespec tv;
> > + struct timespec tv;
> >
> > - rtc_sh_get_time(&tv);
> > - rtc_time_to_tm(tv.tv_sec, tm);
> > - }
> > -
> > - return RTC_24H;
> > + rtc_sh_get_time(&tv);
> > + rtc_time_to_tm(tv.tv_sec, tm);
> > + return 0;
>
> Also the return value is changed. Is this correct?
Yes: again, the genrtc driver had obscure calling conventions requiring
RTC_24H to be returned on success, while the rtc-generic driver uses
the normal kernel coding style of using 0 for success.
Previously, this function was used to convert from get_rtc_time()
calling conventions (without a device) to the normal rtc_class_ops:
static int generic_get_time(struct device *dev, struct rtc_time *tm)
{
unsigned int ret = get_rtc_time(tm);
if (ret & RTC_BATT_BAD)
return -EOPNOTSUPP;
return rtc_valid_tm(tm);
}
> > }
> > -EXPORT_SYMBOL(get_rtc_time);
> >
> > -int set_rtc_time(struct rtc_time *tm)
> > +static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
> > {
> > unsigned long secs;
> >
> > rtc_tm_to_time(tm, &secs);
> > - return rtc_sh_set_time(secs);
> > + if (!rtc_sh_set_time || rtc_sh_set_time(secs) < 0)
> > + return -EOPNOTSUPP;
> > +
> > + return 0;
> > }
> > -EXPORT_SYMBOL(set_rtc_time);
>
> Why checking rtc_sh_set_time for a null pointer? null_rtc_set_time is
> not a null pointer but a dummy function that's always safe to call, I
> think.
You are right, it should check for null_rtc_set_time instead, I probably
copied it from powerpc, which does this a bit differently.
Actually calling null_rtc_set_time however would be (slightly) wrong here,
because we want to return an error to user space if we try to set a
read-only rtc.
> > +static const struct rtc_class_ops rtc_generic_ops = {
> > + .read_time = rtc_generic_get_time,
> > + .set_time = rtc_generic_set_time,
> > +};
> >
> > static int __init rtc_generic_init(void)
> > {
> > @@ -79,7 +82,10 @@ static int __init rtc_generic_init(void)
> > if (rtc_sh_get_time == null_rtc_get_time)
> > return -ENODEV;
> >
> > - pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
> > + pdev = platform_device_register_data(NULL, "rtc-generic", -1,
> > + &rtc_generic_ops,
> > + sizeof(rtc_generic_ops));
> > +
>
> Not a complaint about your patch, but I'd like to get rid of this
> platform device and abstraction layer completely since it doesn't seem
> like something that can be modeled correctly in device tree. When
> you're done cleaning this up, will it be possible to just have rtc
> drivers that use whatever generic framework is left, where the right
> driver is automatically attached to compatible DT nodes? I'm trying to
> move all of arch/sh over to device tree and remove hard-coded platform
> devices.
Yes, I think that would be great. When an rtc driver is registered, you
don't actually need the read_persistent_clock/update_persistent_clock
functions (there are __weak versions of them that do nothing and cause
a fallback to calling into the rtc subsystem), so you can replace
the rtc_sh_get_time/rtc_sh_set_time with proper drivers one at a time.
I only see two of them anyway (dreamcast and sh03), so that should
be easy enough to do. For instance in arch/sh/boards/mach-sh03/rtc.c,
the sh03_time_init() function should register a platform driver,
whose probe function calls devm_rtc_device_register() to register
with the rtc subsystem. Then you move the entire file to drivers/rtc/
and change the callers of sh03_time_init() to create the device
manually (for the classic board file) or drop it (for DT).
After you have done that, all rtc related code can be removed from
arch/sh/kernel/time.c.
Arnd
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
@ 2016-04-28 9:08 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-28 9:08 UTC (permalink / raw)
To: Rich Felker
Cc: Alexandre Belloni, geert, deller, benh, mpe, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
On Wednesday 27 April 2016 19:21:22 Rich Felker wrote:
> On Thu, Apr 28, 2016 at 12:34:18AM +0200, Arnd Bergmann wrote:
> > The rtc-generic driver provides an architecture specific
> > wrapper on top of the generic rtc_class_ops abstraction,
> > and on sh, that goes through another indirection using
> > the rtc_sh_get_time/rtc_sh_set_time functions.
> >
> > This changes the sh rtc-generic device to provide its
> > rtc_class_ops directly, skipping one of the abstraction
> > levels.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Looks ok in principle. Have you tested that it builds?
I think I build tested version 1, but not the current version.
> > diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
> > index d6d0a986c6e9..92cd676970d9 100644
> > --- a/arch/sh/kernel/time.c
> > +++ b/arch/sh/kernel/time.c
> > @@ -50,27 +50,30 @@ int update_persistent_clock(struct timespec now)
> > }
> > #endif
> >
> > -unsigned int get_rtc_time(struct rtc_time *tm)
> > +static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
> > {
> > - if (rtc_sh_get_time != null_rtc_get_time) {
>
> This seems like a functional change -- whereas previously the
> null_rtc_get_time case left *tm unchanged, now the function gets
> called and junk gets filled in. Is that desired?
I dropped the check because it duplicates the check in rtc_generic_init()
below it: the old genrtc driver needed the check in get_rtc_time()
because it would call that function unconditionally, but with the
rtc-generic driver, we know that we only ever call this after
registering the device successfully.
> > - struct timespec tv;
> > + struct timespec tv;
> >
> > - rtc_sh_get_time(&tv);
> > - rtc_time_to_tm(tv.tv_sec, tm);
> > - }
> > -
> > - return RTC_24H;
> > + rtc_sh_get_time(&tv);
> > + rtc_time_to_tm(tv.tv_sec, tm);
> > + return 0;
>
> Also the return value is changed. Is this correct?
Yes: again, the genrtc driver had obscure calling conventions requiring
RTC_24H to be returned on success, while the rtc-generic driver uses
the normal kernel coding style of using 0 for success.
Previously, this function was used to convert from get_rtc_time()
calling conventions (without a device) to the normal rtc_class_ops:
static int generic_get_time(struct device *dev, struct rtc_time *tm)
{
unsigned int ret = get_rtc_time(tm);
if (ret & RTC_BATT_BAD)
return -EOPNOTSUPP;
return rtc_valid_tm(tm);
}
> > }
> > -EXPORT_SYMBOL(get_rtc_time);
> >
> > -int set_rtc_time(struct rtc_time *tm)
> > +static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
> > {
> > unsigned long secs;
> >
> > rtc_tm_to_time(tm, &secs);
> > - return rtc_sh_set_time(secs);
> > + if (!rtc_sh_set_time || rtc_sh_set_time(secs) < 0)
> > + return -EOPNOTSUPP;
> > +
> > + return 0;
> > }
> > -EXPORT_SYMBOL(set_rtc_time);
>
> Why checking rtc_sh_set_time for a null pointer? null_rtc_set_time is
> not a null pointer but a dummy function that's always safe to call, I
> think.
You are right, it should check for null_rtc_set_time instead, I probably
copied it from powerpc, which does this a bit differently.
Actually calling null_rtc_set_time however would be (slightly) wrong here,
because we want to return an error to user space if we try to set a
read-only rtc.
> > +static const struct rtc_class_ops rtc_generic_ops = {
> > + .read_time = rtc_generic_get_time,
> > + .set_time = rtc_generic_set_time,
> > +};
> >
> > static int __init rtc_generic_init(void)
> > {
> > @@ -79,7 +82,10 @@ static int __init rtc_generic_init(void)
> > if (rtc_sh_get_time == null_rtc_get_time)
> > return -ENODEV;
> >
> > - pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
> > + pdev = platform_device_register_data(NULL, "rtc-generic", -1,
> > + &rtc_generic_ops,
> > + sizeof(rtc_generic_ops));
> > +
>
> Not a complaint about your patch, but I'd like to get rid of this
> platform device and abstraction layer completely since it doesn't seem
> like something that can be modeled correctly in device tree. When
> you're done cleaning this up, will it be possible to just have rtc
> drivers that use whatever generic framework is left, where the right
> driver is automatically attached to compatible DT nodes? I'm trying to
> move all of arch/sh over to device tree and remove hard-coded platform
> devices.
Yes, I think that would be great. When an rtc driver is registered, you
don't actually need the read_persistent_clock/update_persistent_clock
functions (there are __weak versions of them that do nothing and cause
a fallback to calling into the rtc subsystem), so you can replace
the rtc_sh_get_time/rtc_sh_set_time with proper drivers one at a time.
I only see two of them anyway (dreamcast and sh03), so that should
be easy enough to do. For instance in arch/sh/boards/mach-sh03/rtc.c,
the sh03_time_init() function should register a platform driver,
whose probe function calls devm_rtc_device_register() to register
with the rtc subsystem. Then you move the entire file to drivers/rtc/
and change the callers of sh03_time_init() to create the device
manually (for the classic board file) or drop it (for DT).
After you have done that, all rtc related code can be removed from
arch/sh/kernel/time.c.
Arnd
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
2016-04-28 9:08 ` Arnd Bergmann
` (2 preceding siblings ...)
(?)
@ 2016-04-28 9:38 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-28 9:38 UTC (permalink / raw)
To: linuxppc-dev
Cc: Rich Felker, linux-arch, a.zummo, rtc-linux, linux-parisc,
linux-sh, deller, linux-alpha, linux-kernel, dhowells,
linux-m68k, geert, Alexandre Belloni
On Thursday 28 April 2016 11:08:41 Arnd Bergmann wrote:
> I only see two of them anyway (dreamcast and sh03), so that should
> be easy enough to do. For instance in arch/sh/boards/mach-sh03/rtc.c,
> the sh03_time_init() function should register a platform driver,
> whose probe function calls devm_rtc_device_register() to register
> with the rtc subsystem. Then you move the entire file to drivers/rtc/
> and change the callers of sh03_time_init() to create the device
> manually (for the classic board file) or drop it (for DT).
Just FYI:
Another look at the sh03_rtc_settimeofday function shows that it's
always been wrong: unlike the set_mmss() function it calls, it should
set all the time fields, not just minutes and seconds.
Arnd
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
2016-04-28 9:08 ` Arnd Bergmann
(?)
(?)
@ 2016-04-28 9:38 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-28 9:38 UTC (permalink / raw)
To: linuxppc-dev
Cc: Rich Felker, linux-arch, a.zummo, rtc-linux, linux-parisc,
linux-sh, deller, linux-alpha, linux-kernel, dhowells,
linux-m68k, geert, Alexandre Belloni
On Thursday 28 April 2016 11:08:41 Arnd Bergmann wrote:
> I only see two of them anyway (dreamcast and sh03), so that should
> be easy enough to do. For instance in arch/sh/boards/mach-sh03/rtc.c,
> the sh03_time_init() function should register a platform driver,
> whose probe function calls devm_rtc_device_register() to register
> with the rtc subsystem. Then you move the entire file to drivers/rtc/
> and change the callers of sh03_time_init() to create the device
> manually (for the classic board file) or drop it (for DT).
Just FYI:
Another look at the sh03_rtc_settimeofday function shows that it's
always been wrong: unlike the set_mmss() function it calls, it should
set all the time fields, not just minutes and seconds.
Arnd
^ permalink raw reply [flat|nested] 144+ messages in thread
* [rtc-linux] Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
@ 2016-04-28 9:38 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-28 9:38 UTC (permalink / raw)
To: linuxppc-dev
Cc: Rich Felker, linux-arch, a.zummo, rtc-linux, linux-parisc,
linux-sh, deller, linux-alpha, linux-kernel, dhowells,
linux-m68k, geert, Alexandre Belloni
On Thursday 28 April 2016 11:08:41 Arnd Bergmann wrote:
> I only see two of them anyway (dreamcast and sh03), so that should
> be easy enough to do. For instance in arch/sh/boards/mach-sh03/rtc.c,
> the sh03_time_init() function should register a platform driver,
> whose probe function calls devm_rtc_device_register() to register
> with the rtc subsystem. Then you move the entire file to drivers/rtc/
> and change the callers of sh03_time_init() to create the device
> manually (for the classic board file) or drop it (for DT).
Just FYI:
Another look at the sh03_rtc_settimeofday function shows that it's
always been wrong: unlike the set_mmss() function it calls, it should
set all the time fields, not just minutes and seconds.
Arnd
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
@ 2016-04-28 9:38 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-28 9:38 UTC (permalink / raw)
To: linuxppc-dev
Cc: Rich Felker, linux-arch, a.zummo, rtc-linux, linux-parisc,
linux-sh, deller, linux-alpha, linux-kernel, dhowells,
linux-m68k, geert, Alexandre Belloni
On Thursday 28 April 2016 11:08:41 Arnd Bergmann wrote:
> I only see two of them anyway (dreamcast and sh03), so that should
> be easy enough to do. For instance in arch/sh/boards/mach-sh03/rtc.c,
> the sh03_time_init() function should register a platform driver,
> whose probe function calls devm_rtc_device_register() to register
> with the rtc subsystem. Then you move the entire file to drivers/rtc/
> and change the callers of sh03_time_init() to create the device
> manually (for the classic board file) or drop it (for DT).
Just FYI:
Another look at the sh03_rtc_settimeofday function shows that it's
always been wrong: unlike the set_mmss() function it calls, it should
set all the time fields, not just minutes and seconds.
Arnd
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
@ 2016-04-28 9:38 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-28 9:38 UTC (permalink / raw)
To: linuxppc-dev
Cc: Rich Felker, linux-arch, a.zummo, rtc-linux, linux-parisc,
linux-sh, deller, linux-alpha, linux-kernel, dhowells,
linux-m68k, geert, Alexandre Belloni
On Thursday 28 April 2016 11:08:41 Arnd Bergmann wrote:
> I only see two of them anyway (dreamcast and sh03), so that should
> be easy enough to do. For instance in arch/sh/boards/mach-sh03/rtc.c,
> the sh03_time_init() function should register a platform driver,
> whose probe function calls devm_rtc_device_register() to register
> with the rtc subsystem. Then you move the entire file to drivers/rtc/
> and change the callers of sh03_time_init() to create the device
> manually (for the classic board file) or drop it (for DT).
Just FYI:
Another look at the sh03_rtc_settimeofday function shows that it's
always been wrong: unlike the set_mmss() function it calls, it should
set all the time fields, not just minutes and seconds.
Arnd
^ permalink raw reply [flat|nested] 144+ messages in thread
* [PATCH v3 05/16] char/genrtc: remove alpha support
2016-04-27 22:34 ` Arnd Bergmann
` (9 preceding siblings ...)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The genrtc driver serves no purpose on Alpha because it drives the
same hardware as the original rtc.c driver, and the newer rtc-generic.c
or rtc-cmos.c drivers on architectures that use the asm-generic/rtc.h
header.
The defconfig uses CONFIG_RTC=y, so this driver is not used by default.
At one point it was used to abstract a quirk for the "Marvel" platform,
but it does not do this any more after the code was moved into yet
another driver in arch/alpha/kernel/rtc.c.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/alpha/include/asm/rtc.h | 1 -
arch/alpha/kernel/core_marvel.c | 1 -
drivers/char/Kconfig | 2 +-
3 files changed, 1 insertion(+), 3 deletions(-)
delete mode 100644 arch/alpha/include/asm/rtc.h
diff --git a/arch/alpha/include/asm/rtc.h b/arch/alpha/include/asm/rtc.h
deleted file mode 100644
index f71c3b0ed360..000000000000
--- a/arch/alpha/include/asm/rtc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/rtc.h>
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c
index 53dd2f1a53aa..d5f0580746a5 100644
--- a/arch/alpha/kernel/core_marvel.c
+++ b/arch/alpha/kernel/core_marvel.c
@@ -24,7 +24,6 @@
#include <asm/gct.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-#include <asm/rtc.h>
#include <asm/vga.h>
#include "proto.h"
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 9bdb629fbaae..697510325b1d 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on ALPHA || M68K || MN10300 || PARISC || PPC
+ depends on M68K || MN10300 || PARISC || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 05/16] char/genrtc: remove alpha support
2016-04-27 22:34 ` Arnd Bergmann
(?)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The genrtc driver serves no purpose on Alpha because it drives the
same hardware as the original rtc.c driver, and the newer rtc-generic.c
or rtc-cmos.c drivers on architectures that use the asm-generic/rtc.h
header.
The defconfig uses CONFIG_RTC=y, so this driver is not used by default.
At one point it was used to abstract a quirk for the "Marvel" platform,
but it does not do this any more after the code was moved into yet
another driver in arch/alpha/kernel/rtc.c.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/alpha/include/asm/rtc.h | 1 -
arch/alpha/kernel/core_marvel.c | 1 -
drivers/char/Kconfig | 2 +-
3 files changed, 1 insertion(+), 3 deletions(-)
delete mode 100644 arch/alpha/include/asm/rtc.h
diff --git a/arch/alpha/include/asm/rtc.h b/arch/alpha/include/asm/rtc.h
deleted file mode 100644
index f71c3b0ed360..000000000000
--- a/arch/alpha/include/asm/rtc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/rtc.h>
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c
index 53dd2f1a53aa..d5f0580746a5 100644
--- a/arch/alpha/kernel/core_marvel.c
+++ b/arch/alpha/kernel/core_marvel.c
@@ -24,7 +24,6 @@
#include <asm/gct.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-#include <asm/rtc.h>
#include <asm/vga.h>
#include "proto.h"
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 9bdb629fbaae..697510325b1d 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on ALPHA || M68K || MN10300 || PARISC || PPC
+ depends on M68K || MN10300 || PARISC || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [rtc-linux] [PATCH v3 05/16] char/genrtc: remove alpha support
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The genrtc driver serves no purpose on Alpha because it drives the
same hardware as the original rtc.c driver, and the newer rtc-generic.c
or rtc-cmos.c drivers on architectures that use the asm-generic/rtc.h
header.
The defconfig uses CONFIG_RTC=y, so this driver is not used by default.
At one point it was used to abstract a quirk for the "Marvel" platform,
but it does not do this any more after the code was moved into yet
another driver in arch/alpha/kernel/rtc.c.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/alpha/include/asm/rtc.h | 1 -
arch/alpha/kernel/core_marvel.c | 1 -
drivers/char/Kconfig | 2 +-
3 files changed, 1 insertion(+), 3 deletions(-)
delete mode 100644 arch/alpha/include/asm/rtc.h
diff --git a/arch/alpha/include/asm/rtc.h b/arch/alpha/include/asm/rtc.h
deleted file mode 100644
index f71c3b0ed360..000000000000
--- a/arch/alpha/include/asm/rtc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/rtc.h>
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c
index 53dd2f1a53aa..d5f0580746a5 100644
--- a/arch/alpha/kernel/core_marvel.c
+++ b/arch/alpha/kernel/core_marvel.c
@@ -24,7 +24,6 @@
#include <asm/gct.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-#include <asm/rtc.h>
#include <asm/vga.h>
#include "proto.h"
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 9bdb629fbaae..697510325b1d 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on ALPHA || M68K || MN10300 || PARISC || PPC
+ depends on M68K || MN10300 || PARISC || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 05/16] char/genrtc: remove alpha support
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The genrtc driver serves no purpose on Alpha because it drives the
same hardware as the original rtc.c driver, and the newer rtc-generic.c
or rtc-cmos.c drivers on architectures that use the asm-generic/rtc.h
header.
The defconfig uses CONFIG_RTC=y, so this driver is not used by default.
At one point it was used to abstract a quirk for the "Marvel" platform,
but it does not do this any more after the code was moved into yet
another driver in arch/alpha/kernel/rtc.c.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/alpha/include/asm/rtc.h | 1 -
arch/alpha/kernel/core_marvel.c | 1 -
drivers/char/Kconfig | 2 +-
3 files changed, 1 insertion(+), 3 deletions(-)
delete mode 100644 arch/alpha/include/asm/rtc.h
diff --git a/arch/alpha/include/asm/rtc.h b/arch/alpha/include/asm/rtc.h
deleted file mode 100644
index f71c3b0ed360..000000000000
--- a/arch/alpha/include/asm/rtc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/rtc.h>
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c
index 53dd2f1a53aa..d5f0580746a5 100644
--- a/arch/alpha/kernel/core_marvel.c
+++ b/arch/alpha/kernel/core_marvel.c
@@ -24,7 +24,6 @@
#include <asm/gct.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-#include <asm/rtc.h>
#include <asm/vga.h>
#include "proto.h"
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 9bdb629fbaae..697510325b1d 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on ALPHA || M68K || MN10300 || PARISC || PPC
+ depends on M68K || MN10300 || PARISC || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 05/16] char/genrtc: remove alpha support
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The genrtc driver serves no purpose on Alpha because it drives the
same hardware as the original rtc.c driver, and the newer rtc-generic.c
or rtc-cmos.c drivers on architectures that use the asm-generic/rtc.h
header.
The defconfig uses CONFIG_RTC=y, so this driver is not used by default.
At one point it was used to abstract a quirk for the "Marvel" platform,
but it does not do this any more after the code was moved into yet
another driver in arch/alpha/kernel/rtc.c.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/alpha/include/asm/rtc.h | 1 -
arch/alpha/kernel/core_marvel.c | 1 -
drivers/char/Kconfig | 2 +-
3 files changed, 1 insertion(+), 3 deletions(-)
delete mode 100644 arch/alpha/include/asm/rtc.h
diff --git a/arch/alpha/include/asm/rtc.h b/arch/alpha/include/asm/rtc.h
deleted file mode 100644
index f71c3b0ed360..000000000000
--- a/arch/alpha/include/asm/rtc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/rtc.h>
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c
index 53dd2f1a53aa..d5f0580746a5 100644
--- a/arch/alpha/kernel/core_marvel.c
+++ b/arch/alpha/kernel/core_marvel.c
@@ -24,7 +24,6 @@
#include <asm/gct.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-#include <asm/rtc.h>
#include <asm/vga.h>
#include "proto.h"
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 9bdb629fbaae..697510325b1d 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on ALPHA || M68K || MN10300 || PARISC || PPC
+ depends on M68K || MN10300 || PARISC || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread
* [PATCH v3 06/16] char/genrtc: remove mn10300 support
2016-04-27 22:34 ` Arnd Bergmann
` (11 preceding siblings ...)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The genrtc driver serves no purpose on mn10300 because it drives the
same hardware as the original rtc.c driver, and the newer rtc-generic.c
or rtc-cmos.c drivers on architectures that use the asm-generic/rtc.h
header.
I assume it was initially only added for completeness when the
mn10300 port was done, but the older rtc.c driver was always used
instead.
We can also stop include asm-generic/rtc.h now, because we
just call mc146818_set_time() directly.
It would be nice to change the architecture to use the rtc-cmos driver
next, and remove support for the old rtc driver as well.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/mn10300/include/asm/rtc.h | 2 --
arch/mn10300/kernel/rtc.c | 2 +-
drivers/char/Kconfig | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/mn10300/include/asm/rtc.h b/arch/mn10300/include/asm/rtc.h
index 6c14bb1d0d9b..07dc87656197 100644
--- a/arch/mn10300/include/asm/rtc.h
+++ b/arch/mn10300/include/asm/rtc.h
@@ -25,6 +25,4 @@ static inline void calibrate_clock(void)
#endif /* !CONFIG_MN10300_RTC */
-#include <asm-generic/rtc.h>
-
#endif /* _ASM_RTC_H */
diff --git a/arch/mn10300/kernel/rtc.c b/arch/mn10300/kernel/rtc.c
index 48d7058b3295..77e0be4d92ea 100644
--- a/arch/mn10300/kernel/rtc.c
+++ b/arch/mn10300/kernel/rtc.c
@@ -27,7 +27,7 @@ void read_persistent_clock(struct timespec *ts)
{
struct rtc_time tm;
- get_rtc_time(&tm);
+ mc146818_set_time(&tm);
ts->tv_nsec = 0;
ts->tv_sec = mktime(tm.tm_year, tm.tm_mon, tm.tm_mday,
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 697510325b1d..d17ed90ebc82 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on M68K || MN10300 || PARISC || PPC
+ depends on M68K || PARISC || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 06/16] char/genrtc: remove mn10300 support
2016-04-27 22:34 ` Arnd Bergmann
(?)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The genrtc driver serves no purpose on mn10300 because it drives the
same hardware as the original rtc.c driver, and the newer rtc-generic.c
or rtc-cmos.c drivers on architectures that use the asm-generic/rtc.h
header.
I assume it was initially only added for completeness when the
mn10300 port was done, but the older rtc.c driver was always used
instead.
We can also stop include asm-generic/rtc.h now, because we
just call mc146818_set_time() directly.
It would be nice to change the architecture to use the rtc-cmos driver
next, and remove support for the old rtc driver as well.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/mn10300/include/asm/rtc.h | 2 --
arch/mn10300/kernel/rtc.c | 2 +-
drivers/char/Kconfig | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/mn10300/include/asm/rtc.h b/arch/mn10300/include/asm/rtc.h
index 6c14bb1d0d9b..07dc87656197 100644
--- a/arch/mn10300/include/asm/rtc.h
+++ b/arch/mn10300/include/asm/rtc.h
@@ -25,6 +25,4 @@ static inline void calibrate_clock(void)
#endif /* !CONFIG_MN10300_RTC */
-#include <asm-generic/rtc.h>
-
#endif /* _ASM_RTC_H */
diff --git a/arch/mn10300/kernel/rtc.c b/arch/mn10300/kernel/rtc.c
index 48d7058b3295..77e0be4d92ea 100644
--- a/arch/mn10300/kernel/rtc.c
+++ b/arch/mn10300/kernel/rtc.c
@@ -27,7 +27,7 @@ void read_persistent_clock(struct timespec *ts)
{
struct rtc_time tm;
- get_rtc_time(&tm);
+ mc146818_set_time(&tm);
ts->tv_nsec = 0;
ts->tv_sec = mktime(tm.tm_year, tm.tm_mon, tm.tm_mday,
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 697510325b1d..d17ed90ebc82 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on M68K || MN10300 || PARISC || PPC
+ depends on M68K || PARISC || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [rtc-linux] [PATCH v3 06/16] char/genrtc: remove mn10300 support
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The genrtc driver serves no purpose on mn10300 because it drives the
same hardware as the original rtc.c driver, and the newer rtc-generic.c
or rtc-cmos.c drivers on architectures that use the asm-generic/rtc.h
header.
I assume it was initially only added for completeness when the
mn10300 port was done, but the older rtc.c driver was always used
instead.
We can also stop include asm-generic/rtc.h now, because we
just call mc146818_set_time() directly.
It would be nice to change the architecture to use the rtc-cmos driver
next, and remove support for the old rtc driver as well.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/mn10300/include/asm/rtc.h | 2 --
arch/mn10300/kernel/rtc.c | 2 +-
drivers/char/Kconfig | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/mn10300/include/asm/rtc.h b/arch/mn10300/include/asm/rtc.h
index 6c14bb1d0d9b..07dc87656197 100644
--- a/arch/mn10300/include/asm/rtc.h
+++ b/arch/mn10300/include/asm/rtc.h
@@ -25,6 +25,4 @@ static inline void calibrate_clock(void)
#endif /* !CONFIG_MN10300_RTC */
-#include <asm-generic/rtc.h>
-
#endif /* _ASM_RTC_H */
diff --git a/arch/mn10300/kernel/rtc.c b/arch/mn10300/kernel/rtc.c
index 48d7058b3295..77e0be4d92ea 100644
--- a/arch/mn10300/kernel/rtc.c
+++ b/arch/mn10300/kernel/rtc.c
@@ -27,7 +27,7 @@ void read_persistent_clock(struct timespec *ts)
{
struct rtc_time tm;
- get_rtc_time(&tm);
+ mc146818_set_time(&tm);
ts->tv_nsec = 0;
ts->tv_sec = mktime(tm.tm_year, tm.tm_mon, tm.tm_mday,
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 697510325b1d..d17ed90ebc82 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on M68K || MN10300 || PARISC || PPC
+ depends on M68K || PARISC || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 06/16] char/genrtc: remove mn10300 support
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The genrtc driver serves no purpose on mn10300 because it drives the
same hardware as the original rtc.c driver, and the newer rtc-generic.c
or rtc-cmos.c drivers on architectures that use the asm-generic/rtc.h
header.
I assume it was initially only added for completeness when the
mn10300 port was done, but the older rtc.c driver was always used
instead.
We can also stop include asm-generic/rtc.h now, because we
just call mc146818_set_time() directly.
It would be nice to change the architecture to use the rtc-cmos driver
next, and remove support for the old rtc driver as well.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/mn10300/include/asm/rtc.h | 2 --
arch/mn10300/kernel/rtc.c | 2 +-
drivers/char/Kconfig | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/mn10300/include/asm/rtc.h b/arch/mn10300/include/asm/rtc.h
index 6c14bb1d0d9b..07dc87656197 100644
--- a/arch/mn10300/include/asm/rtc.h
+++ b/arch/mn10300/include/asm/rtc.h
@@ -25,6 +25,4 @@ static inline void calibrate_clock(void)
#endif /* !CONFIG_MN10300_RTC */
-#include <asm-generic/rtc.h>
-
#endif /* _ASM_RTC_H */
diff --git a/arch/mn10300/kernel/rtc.c b/arch/mn10300/kernel/rtc.c
index 48d7058b3295..77e0be4d92ea 100644
--- a/arch/mn10300/kernel/rtc.c
+++ b/arch/mn10300/kernel/rtc.c
@@ -27,7 +27,7 @@ void read_persistent_clock(struct timespec *ts)
{
struct rtc_time tm;
- get_rtc_time(&tm);
+ mc146818_set_time(&tm);
ts->tv_nsec = 0;
ts->tv_sec = mktime(tm.tm_year, tm.tm_mon, tm.tm_mday,
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 697510325b1d..d17ed90ebc82 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on M68K || MN10300 || PARISC || PPC
+ depends on M68K || PARISC || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 06/16] char/genrtc: remove mn10300 support
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The genrtc driver serves no purpose on mn10300 because it drives the
same hardware as the original rtc.c driver, and the newer rtc-generic.c
or rtc-cmos.c drivers on architectures that use the asm-generic/rtc.h
header.
I assume it was initially only added for completeness when the
mn10300 port was done, but the older rtc.c driver was always used
instead.
We can also stop include asm-generic/rtc.h now, because we
just call mc146818_set_time() directly.
It would be nice to change the architecture to use the rtc-cmos driver
next, and remove support for the old rtc driver as well.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/mn10300/include/asm/rtc.h | 2 --
arch/mn10300/kernel/rtc.c | 2 +-
drivers/char/Kconfig | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/mn10300/include/asm/rtc.h b/arch/mn10300/include/asm/rtc.h
index 6c14bb1d0d9b..07dc87656197 100644
--- a/arch/mn10300/include/asm/rtc.h
+++ b/arch/mn10300/include/asm/rtc.h
@@ -25,6 +25,4 @@ static inline void calibrate_clock(void)
#endif /* !CONFIG_MN10300_RTC */
-#include <asm-generic/rtc.h>
-
#endif /* _ASM_RTC_H */
diff --git a/arch/mn10300/kernel/rtc.c b/arch/mn10300/kernel/rtc.c
index 48d7058b3295..77e0be4d92ea 100644
--- a/arch/mn10300/kernel/rtc.c
+++ b/arch/mn10300/kernel/rtc.c
@@ -27,7 +27,7 @@ void read_persistent_clock(struct timespec *ts)
{
struct rtc_time tm;
- get_rtc_time(&tm);
+ mc146818_set_time(&tm);
ts->tv_nsec = 0;
ts->tv_sec = mktime(tm.tm_year, tm.tm_mon, tm.tm_mday,
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 697510325b1d..d17ed90ebc82 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on M68K || MN10300 || PARISC || PPC
+ depends on M68K || PARISC || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread
* [PATCH v3 07/16] rtc: parisc: provide rtc_class_ops directly
2016-04-27 22:34 ` Arnd Bergmann
` (13 preceding siblings ...)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and on pa-risc, that is implemented using an open-coded
version of rtc_time_to_tm/rtc_tm_to_time.
This changes the parisc rtc-generic device to provide its
rtc_class_ops directly, using the normal helper functions,
which makes this y2038 safe (on 32-bit) and simplifies
the implementation.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/parisc/kernel/time.c | 36 +++++++++++++++++++++++++++++++++++-
drivers/rtc/rtc-generic.c | 3 +--
2 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 58dd6801f5be..744878789752 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -12,6 +12,7 @@
*/
#include <linux/errno.h>
#include <linux/module.h>
+#include <linux/rtc.h>
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/param.h>
@@ -248,14 +249,47 @@ void __init start_cpu_itimer(void)
per_cpu(cpu_data, cpu).it_value = next_tick;
}
+#if IS_ENABLED(CONFIG_RTC_DRV_GENERIC)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
+{
+ struct pdc_tod tod_data;
+
+ memset(tm, 0, sizeof(*tm));
+ if (pdc_tod_read(&tod_data) < 0)
+ return -EOPNOTSUPP;
+
+ /* we treat tod_sec as unsigned, so this can work until year 2106 */
+ rtc_time64_to_tm(tod_data.tod_sec, tm);
+ return rtc_valid_tm(tm);
+}
+
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
+{
+ time64_t secs = rtc_tm_to_time64(tm);
+
+ if (pdc_tod_set(secs, 0) < 0)
+ return -EOPNOTSUPP;
+
+ return 0;
+}
+
+static const struct rtc_class_ops rtc_generic_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
+
static int __init rtc_init(void)
{
struct platform_device *pdev;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &rtc_generic_ops,
+ sizeof(rtc_generic_ops));
+
return PTR_ERR_OR_ZERO(pdev);
}
device_initcall(rtc_init);
+#endif
void read_persistent_clock(struct timespec *ts)
{
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index 3958e87a05fa..92b5e02a3750 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,8 +9,7 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if defined(CONFIG_M68K) || defined(CONFIG_PARISC) || \
- defined(CONFIG_PPC)
+#if defined(CONFIG_M68K) || defined(CONFIG_PPC)
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 07/16] rtc: parisc: provide rtc_class_ops directly
2016-04-27 22:34 ` Arnd Bergmann
(?)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and on pa-risc, that is implemented using an open-coded
version of rtc_time_to_tm/rtc_tm_to_time.
This changes the parisc rtc-generic device to provide its
rtc_class_ops directly, using the normal helper functions,
which makes this y2038 safe (on 32-bit) and simplifies
the implementation.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/parisc/kernel/time.c | 36 +++++++++++++++++++++++++++++++++++-
drivers/rtc/rtc-generic.c | 3 +--
2 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 58dd6801f5be..744878789752 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -12,6 +12,7 @@
*/
#include <linux/errno.h>
#include <linux/module.h>
+#include <linux/rtc.h>
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/param.h>
@@ -248,14 +249,47 @@ void __init start_cpu_itimer(void)
per_cpu(cpu_data, cpu).it_value = next_tick;
}
+#if IS_ENABLED(CONFIG_RTC_DRV_GENERIC)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
+{
+ struct pdc_tod tod_data;
+
+ memset(tm, 0, sizeof(*tm));
+ if (pdc_tod_read(&tod_data) < 0)
+ return -EOPNOTSUPP;
+
+ /* we treat tod_sec as unsigned, so this can work until year 2106 */
+ rtc_time64_to_tm(tod_data.tod_sec, tm);
+ return rtc_valid_tm(tm);
+}
+
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
+{
+ time64_t secs = rtc_tm_to_time64(tm);
+
+ if (pdc_tod_set(secs, 0) < 0)
+ return -EOPNOTSUPP;
+
+ return 0;
+}
+
+static const struct rtc_class_ops rtc_generic_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
+
static int __init rtc_init(void)
{
struct platform_device *pdev;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &rtc_generic_ops,
+ sizeof(rtc_generic_ops));
+
return PTR_ERR_OR_ZERO(pdev);
}
device_initcall(rtc_init);
+#endif
void read_persistent_clock(struct timespec *ts)
{
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index 3958e87a05fa..92b5e02a3750 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,8 +9,7 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if defined(CONFIG_M68K) || defined(CONFIG_PARISC) || \
- defined(CONFIG_PPC)
+#if defined(CONFIG_M68K) || defined(CONFIG_PPC)
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [rtc-linux] [PATCH v3 07/16] rtc: parisc: provide rtc_class_ops directly
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and on pa-risc, that is implemented using an open-coded
version of rtc_time_to_tm/rtc_tm_to_time.
This changes the parisc rtc-generic device to provide its
rtc_class_ops directly, using the normal helper functions,
which makes this y2038 safe (on 32-bit) and simplifies
the implementation.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/parisc/kernel/time.c | 36 +++++++++++++++++++++++++++++++++++-
drivers/rtc/rtc-generic.c | 3 +--
2 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 58dd6801f5be..744878789752 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -12,6 +12,7 @@
*/
#include <linux/errno.h>
#include <linux/module.h>
+#include <linux/rtc.h>
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/param.h>
@@ -248,14 +249,47 @@ void __init start_cpu_itimer(void)
per_cpu(cpu_data, cpu).it_value = next_tick;
}
+#if IS_ENABLED(CONFIG_RTC_DRV_GENERIC)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
+{
+ struct pdc_tod tod_data;
+
+ memset(tm, 0, sizeof(*tm));
+ if (pdc_tod_read(&tod_data) < 0)
+ return -EOPNOTSUPP;
+
+ /* we treat tod_sec as unsigned, so this can work until year 2106 */
+ rtc_time64_to_tm(tod_data.tod_sec, tm);
+ return rtc_valid_tm(tm);
+}
+
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
+{
+ time64_t secs = rtc_tm_to_time64(tm);
+
+ if (pdc_tod_set(secs, 0) < 0)
+ return -EOPNOTSUPP;
+
+ return 0;
+}
+
+static const struct rtc_class_ops rtc_generic_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
+
static int __init rtc_init(void)
{
struct platform_device *pdev;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &rtc_generic_ops,
+ sizeof(rtc_generic_ops));
+
return PTR_ERR_OR_ZERO(pdev);
}
device_initcall(rtc_init);
+#endif
void read_persistent_clock(struct timespec *ts)
{
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index 3958e87a05fa..92b5e02a3750 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,8 +9,7 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if defined(CONFIG_M68K) || defined(CONFIG_PARISC) || \
- defined(CONFIG_PPC)
+#if defined(CONFIG_M68K) || defined(CONFIG_PPC)
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 07/16] rtc: parisc: provide rtc_class_ops directly
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and on pa-risc, that is implemented using an open-coded
version of rtc_time_to_tm/rtc_tm_to_time.
This changes the parisc rtc-generic device to provide its
rtc_class_ops directly, using the normal helper functions,
which makes this y2038 safe (on 32-bit) and simplifies
the implementation.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/parisc/kernel/time.c | 36 +++++++++++++++++++++++++++++++++++-
drivers/rtc/rtc-generic.c | 3 +--
2 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 58dd6801f5be..744878789752 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -12,6 +12,7 @@
*/
#include <linux/errno.h>
#include <linux/module.h>
+#include <linux/rtc.h>
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/param.h>
@@ -248,14 +249,47 @@ void __init start_cpu_itimer(void)
per_cpu(cpu_data, cpu).it_value = next_tick;
}
+#if IS_ENABLED(CONFIG_RTC_DRV_GENERIC)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
+{
+ struct pdc_tod tod_data;
+
+ memset(tm, 0, sizeof(*tm));
+ if (pdc_tod_read(&tod_data) < 0)
+ return -EOPNOTSUPP;
+
+ /* we treat tod_sec as unsigned, so this can work until year 2106 */
+ rtc_time64_to_tm(tod_data.tod_sec, tm);
+ return rtc_valid_tm(tm);
+}
+
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
+{
+ time64_t secs = rtc_tm_to_time64(tm);
+
+ if (pdc_tod_set(secs, 0) < 0)
+ return -EOPNOTSUPP;
+
+ return 0;
+}
+
+static const struct rtc_class_ops rtc_generic_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
+
static int __init rtc_init(void)
{
struct platform_device *pdev;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &rtc_generic_ops,
+ sizeof(rtc_generic_ops));
+
return PTR_ERR_OR_ZERO(pdev);
}
device_initcall(rtc_init);
+#endif
void read_persistent_clock(struct timespec *ts)
{
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index 3958e87a05fa..92b5e02a3750 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,8 +9,7 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if defined(CONFIG_M68K) || defined(CONFIG_PARISC) || \
- defined(CONFIG_PPC)
+#if defined(CONFIG_M68K) || defined(CONFIG_PPC)
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 07/16] rtc: parisc: provide rtc_class_ops directly
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and on pa-risc, that is implemented using an open-coded
version of rtc_time_to_tm/rtc_tm_to_time.
This changes the parisc rtc-generic device to provide its
rtc_class_ops directly, using the normal helper functions,
which makes this y2038 safe (on 32-bit) and simplifies
the implementation.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/parisc/kernel/time.c | 36 +++++++++++++++++++++++++++++++++++-
drivers/rtc/rtc-generic.c | 3 +--
2 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 58dd6801f5be..744878789752 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -12,6 +12,7 @@
*/
#include <linux/errno.h>
#include <linux/module.h>
+#include <linux/rtc.h>
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/param.h>
@@ -248,14 +249,47 @@ void __init start_cpu_itimer(void)
per_cpu(cpu_data, cpu).it_value = next_tick;
}
+#if IS_ENABLED(CONFIG_RTC_DRV_GENERIC)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
+{
+ struct pdc_tod tod_data;
+
+ memset(tm, 0, sizeof(*tm));
+ if (pdc_tod_read(&tod_data) < 0)
+ return -EOPNOTSUPP;
+
+ /* we treat tod_sec as unsigned, so this can work until year 2106 */
+ rtc_time64_to_tm(tod_data.tod_sec, tm);
+ return rtc_valid_tm(tm);
+}
+
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
+{
+ time64_t secs = rtc_tm_to_time64(tm);
+
+ if (pdc_tod_set(secs, 0) < 0)
+ return -EOPNOTSUPP;
+
+ return 0;
+}
+
+static const struct rtc_class_ops rtc_generic_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
+
static int __init rtc_init(void)
{
struct platform_device *pdev;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &rtc_generic_ops,
+ sizeof(rtc_generic_ops));
+
return PTR_ERR_OR_ZERO(pdev);
}
device_initcall(rtc_init);
+#endif
void read_persistent_clock(struct timespec *ts)
{
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index 3958e87a05fa..92b5e02a3750 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,8 +9,7 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if defined(CONFIG_M68K) || defined(CONFIG_PARISC) || \
- defined(CONFIG_PPC)
+#if defined(CONFIG_M68K) || defined(CONFIG_PPC)
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread
* [PATCH v3 08/16] char/genrtc: remove parisc support
2016-04-27 22:34 ` Arnd Bergmann
` (15 preceding siblings ...)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
This architecture selects RTC_CLASS unconditionally, so the GEN_RTC
has not worked here for a long time.
Now we can remove both the asm/rtc.h header and the Kconfig dependency
for CONFIG_GEN_RTC.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/parisc/include/asm/rtc.h | 131 ------------------------------------------
drivers/char/Kconfig | 2 +-
2 files changed, 1 insertion(+), 132 deletions(-)
delete mode 100644 arch/parisc/include/asm/rtc.h
diff --git a/arch/parisc/include/asm/rtc.h b/arch/parisc/include/asm/rtc.h
deleted file mode 100644
index 099d641a42c2..000000000000
--- a/arch/parisc/include/asm/rtc.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * include/asm-parisc/rtc.h
- *
- * Copyright 2002 Randolph CHung <tausq@debian.org>
- *
- * Based on: include/asm-ppc/rtc.h and the genrtc driver in the
- * 2.4 parisc linux tree
- */
-
-#ifndef __ASM_RTC_H__
-#define __ASM_RTC_H__
-
-#ifdef __KERNEL__
-
-#include <linux/rtc.h>
-
-#include <asm/pdc.h>
-
-#define SECS_PER_HOUR (60 * 60)
-#define SECS_PER_DAY (SECS_PER_HOUR * 24)
-
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-#define RTC_BATT_BAD 0x100 /* battery bad */
-
-/* some dummy definitions */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-# define __isleap(year) \
- ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
-
-/* How many days come before each month (0-12). */
-static const unsigned short int __mon_yday[2][13] =
-{
- /* Normal years. */
- { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
- /* Leap years. */
- { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
-};
-
-static inline unsigned int get_rtc_time(struct rtc_time *wtime)
-{
- struct pdc_tod tod_data;
- long int days, rem, y;
- const unsigned short int *ip;
-
- memset(wtime, 0, sizeof(*wtime));
- if (pdc_tod_read(&tod_data) < 0)
- return RTC_24H | RTC_BATT_BAD;
-
- // most of the remainder of this function is:
-// Copyright (C) 1991, 1993, 1997, 1998 Free Software Foundation, Inc.
-// This was originally a part of the GNU C Library.
-// It is distributed under the GPL, and was swiped from offtime.c
-
-
- days = tod_data.tod_sec / SECS_PER_DAY;
- rem = tod_data.tod_sec % SECS_PER_DAY;
-
- wtime->tm_hour = rem / SECS_PER_HOUR;
- rem %= SECS_PER_HOUR;
- wtime->tm_min = rem / 60;
- wtime->tm_sec = rem % 60;
-
- y = 1970;
-
-#define DIV(a, b) ((a) / (b) - ((a) % (b) < 0))
-#define LEAPS_THRU_END_OF(y) (DIV (y, 4) - DIV (y, 100) + DIV (y, 400))
-
- while (days < 0 || days >= (__isleap (y) ? 366 : 365))
- {
- /* Guess a corrected year, assuming 365 days per year. */
- long int yg = y + days / 365 - (days % 365 < 0);
-
- /* Adjust DAYS and Y to match the guessed year. */
- days -= ((yg - y) * 365
- + LEAPS_THRU_END_OF (yg - 1)
- - LEAPS_THRU_END_OF (y - 1));
- y = yg;
- }
- wtime->tm_year = y - 1900;
-
- ip = __mon_yday[__isleap(y)];
- for (y = 11; days < (long int) ip[y]; --y)
- continue;
- days -= ip[y];
- wtime->tm_mon = y;
- wtime->tm_mday = days + 1;
-
- return RTC_24H;
-}
-
-static int set_rtc_time(struct rtc_time *wtime)
-{
- u_int32_t secs;
-
- secs = mktime(wtime->tm_year + 1900, wtime->tm_mon + 1, wtime->tm_mday,
- wtime->tm_hour, wtime->tm_min, wtime->tm_sec);
-
- if(pdc_tod_set(secs, 0) < 0)
- return -1;
- else
- return 0;
-
-}
-
-static inline unsigned int get_rtc_ss(void)
-{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_RTC_H__ */
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index d17ed90ebc82..abab6e565c60 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on M68K || PARISC || PPC
+ depends on M68K || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 08/16] char/genrtc: remove parisc support
2016-04-27 22:34 ` Arnd Bergmann
` (2 preceding siblings ...)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
This architecture selects RTC_CLASS unconditionally, so the GEN_RTC
has not worked here for a long time.
Now we can remove both the asm/rtc.h header and the Kconfig dependency
for CONFIG_GEN_RTC.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/parisc/include/asm/rtc.h | 131 ------------------------------------------
drivers/char/Kconfig | 2 +-
2 files changed, 1 insertion(+), 132 deletions(-)
delete mode 100644 arch/parisc/include/asm/rtc.h
diff --git a/arch/parisc/include/asm/rtc.h b/arch/parisc/include/asm/rtc.h
deleted file mode 100644
index 099d641a42c2..000000000000
--- a/arch/parisc/include/asm/rtc.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * include/asm-parisc/rtc.h
- *
- * Copyright 2002 Randolph CHung <tausq@debian.org>
- *
- * Based on: include/asm-ppc/rtc.h and the genrtc driver in the
- * 2.4 parisc linux tree
- */
-
-#ifndef __ASM_RTC_H__
-#define __ASM_RTC_H__
-
-#ifdef __KERNEL__
-
-#include <linux/rtc.h>
-
-#include <asm/pdc.h>
-
-#define SECS_PER_HOUR (60 * 60)
-#define SECS_PER_DAY (SECS_PER_HOUR * 24)
-
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-#define RTC_BATT_BAD 0x100 /* battery bad */
-
-/* some dummy definitions */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-# define __isleap(year) \
- ((year) % 4 = 0 && ((year) % 100 != 0 || (year) % 400 = 0))
-
-/* How many days come before each month (0-12). */
-static const unsigned short int __mon_yday[2][13] -{
- /* Normal years. */
- { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
- /* Leap years. */
- { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
-};
-
-static inline unsigned int get_rtc_time(struct rtc_time *wtime)
-{
- struct pdc_tod tod_data;
- long int days, rem, y;
- const unsigned short int *ip;
-
- memset(wtime, 0, sizeof(*wtime));
- if (pdc_tod_read(&tod_data) < 0)
- return RTC_24H | RTC_BATT_BAD;
-
- // most of the remainder of this function is:
-// Copyright (C) 1991, 1993, 1997, 1998 Free Software Foundation, Inc.
-// This was originally a part of the GNU C Library.
-// It is distributed under the GPL, and was swiped from offtime.c
-
-
- days = tod_data.tod_sec / SECS_PER_DAY;
- rem = tod_data.tod_sec % SECS_PER_DAY;
-
- wtime->tm_hour = rem / SECS_PER_HOUR;
- rem %= SECS_PER_HOUR;
- wtime->tm_min = rem / 60;
- wtime->tm_sec = rem % 60;
-
- y = 1970;
-
-#define DIV(a, b) ((a) / (b) - ((a) % (b) < 0))
-#define LEAPS_THRU_END_OF(y) (DIV (y, 4) - DIV (y, 100) + DIV (y, 400))
-
- while (days < 0 || days >= (__isleap (y) ? 366 : 365))
- {
- /* Guess a corrected year, assuming 365 days per year. */
- long int yg = y + days / 365 - (days % 365 < 0);
-
- /* Adjust DAYS and Y to match the guessed year. */
- days -= ((yg - y) * 365
- + LEAPS_THRU_END_OF (yg - 1)
- - LEAPS_THRU_END_OF (y - 1));
- y = yg;
- }
- wtime->tm_year = y - 1900;
-
- ip = __mon_yday[__isleap(y)];
- for (y = 11; days < (long int) ip[y]; --y)
- continue;
- days -= ip[y];
- wtime->tm_mon = y;
- wtime->tm_mday = days + 1;
-
- return RTC_24H;
-}
-
-static int set_rtc_time(struct rtc_time *wtime)
-{
- u_int32_t secs;
-
- secs = mktime(wtime->tm_year + 1900, wtime->tm_mon + 1, wtime->tm_mday,
- wtime->tm_hour, wtime->tm_min, wtime->tm_sec);
-
- if(pdc_tod_set(secs, 0) < 0)
- return -1;
- else
- return 0;
-
-}
-
-static inline unsigned int get_rtc_ss(void)
-{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_RTC_H__ */
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index d17ed90ebc82..abab6e565c60 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on M68K || PARISC || PPC
+ depends on M68K || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 08/16] char/genrtc: remove parisc support
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
This architecture selects RTC_CLASS unconditionally, so the GEN_RTC
has not worked here for a long time.
Now we can remove both the asm/rtc.h header and the Kconfig dependency
for CONFIG_GEN_RTC.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/parisc/include/asm/rtc.h | 131 ------------------------------------------
drivers/char/Kconfig | 2 +-
2 files changed, 1 insertion(+), 132 deletions(-)
delete mode 100644 arch/parisc/include/asm/rtc.h
diff --git a/arch/parisc/include/asm/rtc.h b/arch/parisc/include/asm/rtc.h
deleted file mode 100644
index 099d641a42c2..000000000000
--- a/arch/parisc/include/asm/rtc.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * include/asm-parisc/rtc.h
- *
- * Copyright 2002 Randolph CHung <tausq@debian.org>
- *
- * Based on: include/asm-ppc/rtc.h and the genrtc driver in the
- * 2.4 parisc linux tree
- */
-
-#ifndef __ASM_RTC_H__
-#define __ASM_RTC_H__
-
-#ifdef __KERNEL__
-
-#include <linux/rtc.h>
-
-#include <asm/pdc.h>
-
-#define SECS_PER_HOUR (60 * 60)
-#define SECS_PER_DAY (SECS_PER_HOUR * 24)
-
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-#define RTC_BATT_BAD 0x100 /* battery bad */
-
-/* some dummy definitions */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-# define __isleap(year) \
- ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
-
-/* How many days come before each month (0-12). */
-static const unsigned short int __mon_yday[2][13] =
-{
- /* Normal years. */
- { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
- /* Leap years. */
- { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
-};
-
-static inline unsigned int get_rtc_time(struct rtc_time *wtime)
-{
- struct pdc_tod tod_data;
- long int days, rem, y;
- const unsigned short int *ip;
-
- memset(wtime, 0, sizeof(*wtime));
- if (pdc_tod_read(&tod_data) < 0)
- return RTC_24H | RTC_BATT_BAD;
-
- // most of the remainder of this function is:
-// Copyright (C) 1991, 1993, 1997, 1998 Free Software Foundation, Inc.
-// This was originally a part of the GNU C Library.
-// It is distributed under the GPL, and was swiped from offtime.c
-
-
- days = tod_data.tod_sec / SECS_PER_DAY;
- rem = tod_data.tod_sec % SECS_PER_DAY;
-
- wtime->tm_hour = rem / SECS_PER_HOUR;
- rem %= SECS_PER_HOUR;
- wtime->tm_min = rem / 60;
- wtime->tm_sec = rem % 60;
-
- y = 1970;
-
-#define DIV(a, b) ((a) / (b) - ((a) % (b) < 0))
-#define LEAPS_THRU_END_OF(y) (DIV (y, 4) - DIV (y, 100) + DIV (y, 400))
-
- while (days < 0 || days >= (__isleap (y) ? 366 : 365))
- {
- /* Guess a corrected year, assuming 365 days per year. */
- long int yg = y + days / 365 - (days % 365 < 0);
-
- /* Adjust DAYS and Y to match the guessed year. */
- days -= ((yg - y) * 365
- + LEAPS_THRU_END_OF (yg - 1)
- - LEAPS_THRU_END_OF (y - 1));
- y = yg;
- }
- wtime->tm_year = y - 1900;
-
- ip = __mon_yday[__isleap(y)];
- for (y = 11; days < (long int) ip[y]; --y)
- continue;
- days -= ip[y];
- wtime->tm_mon = y;
- wtime->tm_mday = days + 1;
-
- return RTC_24H;
-}
-
-static int set_rtc_time(struct rtc_time *wtime)
-{
- u_int32_t secs;
-
- secs = mktime(wtime->tm_year + 1900, wtime->tm_mon + 1, wtime->tm_mday,
- wtime->tm_hour, wtime->tm_min, wtime->tm_sec);
-
- if(pdc_tod_set(secs, 0) < 0)
- return -1;
- else
- return 0;
-
-}
-
-static inline unsigned int get_rtc_ss(void)
-{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_RTC_H__ */
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index d17ed90ebc82..abab6e565c60 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on M68K || PARISC || PPC
+ depends on M68K || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [rtc-linux] [PATCH v3 08/16] char/genrtc: remove parisc support
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
This architecture selects RTC_CLASS unconditionally, so the GEN_RTC
has not worked here for a long time.
Now we can remove both the asm/rtc.h header and the Kconfig dependency
for CONFIG_GEN_RTC.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/parisc/include/asm/rtc.h | 131 ------------------------------------------
drivers/char/Kconfig | 2 +-
2 files changed, 1 insertion(+), 132 deletions(-)
delete mode 100644 arch/parisc/include/asm/rtc.h
diff --git a/arch/parisc/include/asm/rtc.h b/arch/parisc/include/asm/rtc.h
deleted file mode 100644
index 099d641a42c2..000000000000
--- a/arch/parisc/include/asm/rtc.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * include/asm-parisc/rtc.h
- *
- * Copyright 2002 Randolph CHung <tausq@debian.org>
- *
- * Based on: include/asm-ppc/rtc.h and the genrtc driver in the
- * 2.4 parisc linux tree
- */
-
-#ifndef __ASM_RTC_H__
-#define __ASM_RTC_H__
-
-#ifdef __KERNEL__
-
-#include <linux/rtc.h>
-
-#include <asm/pdc.h>
-
-#define SECS_PER_HOUR (60 * 60)
-#define SECS_PER_DAY (SECS_PER_HOUR * 24)
-
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-#define RTC_BATT_BAD 0x100 /* battery bad */
-
-/* some dummy definitions */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-# define __isleap(year) \
- ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
-
-/* How many days come before each month (0-12). */
-static const unsigned short int __mon_yday[2][13] =
-{
- /* Normal years. */
- { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
- /* Leap years. */
- { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
-};
-
-static inline unsigned int get_rtc_time(struct rtc_time *wtime)
-{
- struct pdc_tod tod_data;
- long int days, rem, y;
- const unsigned short int *ip;
-
- memset(wtime, 0, sizeof(*wtime));
- if (pdc_tod_read(&tod_data) < 0)
- return RTC_24H | RTC_BATT_BAD;
-
- // most of the remainder of this function is:
-// Copyright (C) 1991, 1993, 1997, 1998 Free Software Foundation, Inc.
-// This was originally a part of the GNU C Library.
-// It is distributed under the GPL, and was swiped from offtime.c
-
-
- days = tod_data.tod_sec / SECS_PER_DAY;
- rem = tod_data.tod_sec % SECS_PER_DAY;
-
- wtime->tm_hour = rem / SECS_PER_HOUR;
- rem %= SECS_PER_HOUR;
- wtime->tm_min = rem / 60;
- wtime->tm_sec = rem % 60;
-
- y = 1970;
-
-#define DIV(a, b) ((a) / (b) - ((a) % (b) < 0))
-#define LEAPS_THRU_END_OF(y) (DIV (y, 4) - DIV (y, 100) + DIV (y, 400))
-
- while (days < 0 || days >= (__isleap (y) ? 366 : 365))
- {
- /* Guess a corrected year, assuming 365 days per year. */
- long int yg = y + days / 365 - (days % 365 < 0);
-
- /* Adjust DAYS and Y to match the guessed year. */
- days -= ((yg - y) * 365
- + LEAPS_THRU_END_OF (yg - 1)
- - LEAPS_THRU_END_OF (y - 1));
- y = yg;
- }
- wtime->tm_year = y - 1900;
-
- ip = __mon_yday[__isleap(y)];
- for (y = 11; days < (long int) ip[y]; --y)
- continue;
- days -= ip[y];
- wtime->tm_mon = y;
- wtime->tm_mday = days + 1;
-
- return RTC_24H;
-}
-
-static int set_rtc_time(struct rtc_time *wtime)
-{
- u_int32_t secs;
-
- secs = mktime(wtime->tm_year + 1900, wtime->tm_mon + 1, wtime->tm_mday,
- wtime->tm_hour, wtime->tm_min, wtime->tm_sec);
-
- if(pdc_tod_set(secs, 0) < 0)
- return -1;
- else
- return 0;
-
-}
-
-static inline unsigned int get_rtc_ss(void)
-{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_RTC_H__ */
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index d17ed90ebc82..abab6e565c60 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on M68K || PARISC || PPC
+ depends on M68K || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 08/16] char/genrtc: remove parisc support
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
This architecture selects RTC_CLASS unconditionally, so the GEN_RTC
has not worked here for a long time.
Now we can remove both the asm/rtc.h header and the Kconfig dependency
for CONFIG_GEN_RTC.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/parisc/include/asm/rtc.h | 131 ------------------------------------------
drivers/char/Kconfig | 2 +-
2 files changed, 1 insertion(+), 132 deletions(-)
delete mode 100644 arch/parisc/include/asm/rtc.h
diff --git a/arch/parisc/include/asm/rtc.h b/arch/parisc/include/asm/rtc.h
deleted file mode 100644
index 099d641a42c2..000000000000
--- a/arch/parisc/include/asm/rtc.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * include/asm-parisc/rtc.h
- *
- * Copyright 2002 Randolph CHung <tausq@debian.org>
- *
- * Based on: include/asm-ppc/rtc.h and the genrtc driver in the
- * 2.4 parisc linux tree
- */
-
-#ifndef __ASM_RTC_H__
-#define __ASM_RTC_H__
-
-#ifdef __KERNEL__
-
-#include <linux/rtc.h>
-
-#include <asm/pdc.h>
-
-#define SECS_PER_HOUR (60 * 60)
-#define SECS_PER_DAY (SECS_PER_HOUR * 24)
-
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-#define RTC_BATT_BAD 0x100 /* battery bad */
-
-/* some dummy definitions */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-# define __isleap(year) \
- ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
-
-/* How many days come before each month (0-12). */
-static const unsigned short int __mon_yday[2][13] =
-{
- /* Normal years. */
- { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
- /* Leap years. */
- { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
-};
-
-static inline unsigned int get_rtc_time(struct rtc_time *wtime)
-{
- struct pdc_tod tod_data;
- long int days, rem, y;
- const unsigned short int *ip;
-
- memset(wtime, 0, sizeof(*wtime));
- if (pdc_tod_read(&tod_data) < 0)
- return RTC_24H | RTC_BATT_BAD;
-
- // most of the remainder of this function is:
-// Copyright (C) 1991, 1993, 1997, 1998 Free Software Foundation, Inc.
-// This was originally a part of the GNU C Library.
-// It is distributed under the GPL, and was swiped from offtime.c
-
-
- days = tod_data.tod_sec / SECS_PER_DAY;
- rem = tod_data.tod_sec % SECS_PER_DAY;
-
- wtime->tm_hour = rem / SECS_PER_HOUR;
- rem %= SECS_PER_HOUR;
- wtime->tm_min = rem / 60;
- wtime->tm_sec = rem % 60;
-
- y = 1970;
-
-#define DIV(a, b) ((a) / (b) - ((a) % (b) < 0))
-#define LEAPS_THRU_END_OF(y) (DIV (y, 4) - DIV (y, 100) + DIV (y, 400))
-
- while (days < 0 || days >= (__isleap (y) ? 366 : 365))
- {
- /* Guess a corrected year, assuming 365 days per year. */
- long int yg = y + days / 365 - (days % 365 < 0);
-
- /* Adjust DAYS and Y to match the guessed year. */
- days -= ((yg - y) * 365
- + LEAPS_THRU_END_OF (yg - 1)
- - LEAPS_THRU_END_OF (y - 1));
- y = yg;
- }
- wtime->tm_year = y - 1900;
-
- ip = __mon_yday[__isleap(y)];
- for (y = 11; days < (long int) ip[y]; --y)
- continue;
- days -= ip[y];
- wtime->tm_mon = y;
- wtime->tm_mday = days + 1;
-
- return RTC_24H;
-}
-
-static int set_rtc_time(struct rtc_time *wtime)
-{
- u_int32_t secs;
-
- secs = mktime(wtime->tm_year + 1900, wtime->tm_mon + 1, wtime->tm_mday,
- wtime->tm_hour, wtime->tm_min, wtime->tm_sec);
-
- if(pdc_tod_set(secs, 0) < 0)
- return -1;
- else
- return 0;
-
-}
-
-static inline unsigned int get_rtc_ss(void)
-{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_RTC_H__ */
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index d17ed90ebc82..abab6e565c60 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on M68K || PARISC || PPC
+ depends on M68K || PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 08/16] char/genrtc: remove parisc support
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
This architecture selects RTC_CLASS unconditionally, so the GEN_RTC
has not worked here for a long time.
Now we can remove both the asm/rtc.h header and the Kconfig dependency
for CONFIG_GEN_RTC.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/parisc/include/asm/rtc.h | 131 ------------------------------------------
drivers/char/Kconfig | 2 +-
2 files changed, 1 insertion(+), 132 deletions(-)
delete mode 100644 arch/parisc/include/asm/rtc.h
diff --git a/arch/parisc/include/asm/rtc.h b/arch/parisc/include/asm/rtc.h
deleted file mode 100644
index 099d641a42c2..000000000000
--- a/arch/parisc/include/asm/rtc.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * include/asm-parisc/rtc.h
- *
- * Copyright 2002 Randolph CHung <tausq@debian.org>
- *
- * Based on: include/asm-ppc/rtc.h and the genrtc driver in the
- * 2.4 parisc linux tree
- */
-
-#ifndef __ASM_RTC_H__
-#define __ASM_RTC_H__
-
-#ifdef __KERNEL__
-
-#include <linux/rtc.h>
-
-#include <asm/pdc.h>
-
-#define SECS_PER_HOUR (60 * 60)
-#define SECS_PER_DAY (SECS_PER_HOUR * 24)
-
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-#define RTC_BATT_BAD 0x100 /* battery bad */
-
-/* some dummy definitions */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-# define __isleap(year) \
- ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
-
-/* How many days come before each month (0-12). */
-static const unsigned short int __mon_yday[2][13] =
-{
- /* Normal years. */
- { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
- /* Leap years. */
- { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
-};
-
-static inline unsigned int get_rtc_time(struct rtc_time *wtime)
-{
- struct pdc_tod tod_data;
- long int days, rem, y;
- const unsigned short int *ip;
-
- memset(wtime, 0, sizeof(*wtime));
- if (pdc_tod_read(&tod_data) < 0)
- return RTC_24H | RTC_BATT_BAD;
-
- // most of the remainder of this function is:
-// Copyright (C) 1991, 1993, 1997, 1998 Free Software Foundation, Inc.
-// This was originally a part of the GNU C Library.
-// It is distributed under the GPL, and was swiped from offtime.c
-
-
- days = tod_data.tod_sec / SECS_PER_DAY;
- rem = tod_data.tod_sec % SECS_PER_DAY;
-
- wtime->tm_hour = rem / SECS_PER_HOUR;
- rem %= SECS_PER_HOUR;
- wtime->tm_min = rem / 60;
- wtime->tm_sec = rem % 60;
-
- y = 1970;
-
-#define DIV(a, b) ((a) / (b) - ((a) % (b) < 0))
-#define LEAPS_THRU_END_OF(y) (DIV (y, 4) - DIV (y, 100) + DIV (y, 400))
-
- while (days < 0 || days >= (__isleap (y) ? 366 : 365))
- {
- /* Guess a corrected year, assuming 365 days per year. */
- long int yg = y + days / 365 - (days % 365 < 0);
-
- /* Adjust DAYS and Y to match the guessed year. */
- days -= ((yg - y) * 365
- + LEAPS_THRU_END_OF (yg - 1)
- - LEAPS_THRU_END_OF (y - 1));
- y = yg;
- }
- wtime->tm_year = y - 1900;
-
- ip = __mon_yday[__isleap(y)];
- for (y = 11; days < (long int) ip[y]; --y)
- continue;
- days -= ip[y];
- wtime->tm_mon = y;
- wtime->tm_mday = days + 1;
-
- return RTC_24H;
-}
-
-static int set_rtc_time(struct rtc_time *wtime)
-{
- u_int32_t secs;
-
- secs = mktime(wtime->tm_year + 1900, wtime->tm_mon + 1, wtime->tm_mday,
- wtime->tm_hour, wtime->tm_min, wtime->tm_sec);
-
- if(pdc_tod_set(secs, 0) < 0)
- return -1;
- else
- return 0;
-
-}
-
-static inline unsigned int get_rtc_ss(void)
-{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
^ permalink raw reply related [flat|nested] 144+ messages in thread
* [PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
2016-04-27 22:34 ` Arnd Bergmann
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and m68k has another abstraction on top, which is a bit
silly.
This changes the m68k rtc-generic device to provide its
rtc_class_ops directly, to reduce the number of layers
by one.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/m68k/kernel/time.c | 24 ++++++++++++++++++++++--
drivers/rtc/rtc-generic.c | 2 +-
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index 3857737e3958..80e024a10115 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -86,7 +86,24 @@ void read_persistent_clock(struct timespec *ts)
}
}
-#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
+#if defined(CONFIG_ARCH_USES_GETTIMEOFFSET) && IS_ENABLED(CONFIG_RTC_DRV_GENERIC)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
+{
+ mach_hwclk(0, tm);
+ return rtc_valid_tm(tm);
+}
+
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
+{
+ if (mach_hwclk(1, tm) < 0)
+ return -EOPNOTSUPP;
+ return 0;
+}
+
+static const struct rtc_class_ops generic_rtc_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
static int __init rtc_init(void)
{
@@ -95,7 +112,10 @@ static int __init rtc_init(void)
if (!mach_hwclk)
return -ENODEV;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ /* or just call devm_rtc_device_register instead? */
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &generic_rtc_ops,
+ sizeof(generic_rtc_ops));
return PTR_ERR_OR_ZERO(pdev);
}
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index 92b5e02a3750..5c82bae73b9c 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,7 +9,7 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if defined(CONFIG_M68K) || defined(CONFIG_PPC)
+#if defined(CONFIG_PPC)
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [rtc-linux] [PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and m68k has another abstraction on top, which is a bit
silly.
This changes the m68k rtc-generic device to provide its
rtc_class_ops directly, to reduce the number of layers
by one.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/m68k/kernel/time.c | 24 ++++++++++++++++++++++--
drivers/rtc/rtc-generic.c | 2 +-
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index 3857737e3958..80e024a10115 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -86,7 +86,24 @@ void read_persistent_clock(struct timespec *ts)
}
}
-#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
+#if defined(CONFIG_ARCH_USES_GETTIMEOFFSET) && IS_ENABLED(CONFIG_RTC_DRV_GENERIC)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
+{
+ mach_hwclk(0, tm);
+ return rtc_valid_tm(tm);
+}
+
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
+{
+ if (mach_hwclk(1, tm) < 0)
+ return -EOPNOTSUPP;
+ return 0;
+}
+
+static const struct rtc_class_ops generic_rtc_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
static int __init rtc_init(void)
{
@@ -95,7 +112,10 @@ static int __init rtc_init(void)
if (!mach_hwclk)
return -ENODEV;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ /* or just call devm_rtc_device_register instead? */
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &generic_rtc_ops,
+ sizeof(generic_rtc_ops));
return PTR_ERR_OR_ZERO(pdev);
}
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index 92b5e02a3750..5c82bae73b9c 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,7 +9,7 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if defined(CONFIG_M68K) || defined(CONFIG_PPC)
+#if defined(CONFIG_PPC)
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and m68k has another abstraction on top, which is a bit
silly.
This changes the m68k rtc-generic device to provide its
rtc_class_ops directly, to reduce the number of layers
by one.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/m68k/kernel/time.c | 24 ++++++++++++++++++++++--
drivers/rtc/rtc-generic.c | 2 +-
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index 3857737e3958..80e024a10115 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -86,7 +86,24 @@ void read_persistent_clock(struct timespec *ts)
}
}
-#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
+#if defined(CONFIG_ARCH_USES_GETTIMEOFFSET) && IS_ENABLED(CONFIG_RTC_DRV_GENERIC)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
+{
+ mach_hwclk(0, tm);
+ return rtc_valid_tm(tm);
+}
+
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
+{
+ if (mach_hwclk(1, tm) < 0)
+ return -EOPNOTSUPP;
+ return 0;
+}
+
+static const struct rtc_class_ops generic_rtc_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
static int __init rtc_init(void)
{
@@ -95,7 +112,10 @@ static int __init rtc_init(void)
if (!mach_hwclk)
return -ENODEV;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ /* or just call devm_rtc_device_register instead? */
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &generic_rtc_ops,
+ sizeof(generic_rtc_ops));
return PTR_ERR_OR_ZERO(pdev);
}
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index 92b5e02a3750..5c82bae73b9c 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,7 +9,7 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if defined(CONFIG_M68K) || defined(CONFIG_PPC)
+#if defined(CONFIG_PPC)
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* Re: [PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
2016-04-27 22:34 ` Arnd Bergmann
(?)
@ 2016-04-27 23:04 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 23:04 UTC (permalink / raw)
To: linuxppc-dev
Cc: Alexandre Belloni, linux-arch, a.zummo, dalias, linux-parisc,
linux-sh, deller, linux-alpha, linux-kernel, dhowells,
linux-m68k, geert, rtc-linux
On Thursday 28 April 2016 00:34:23 Arnd Bergmann wrote:
> return -ENODEV;
>
> - pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
> + /* or just call devm_rtc_device_register instead? */
Oops, I was planning to remove the comment here.
I probably have to do a v4 anyway, fixed it up locally now.
Arnd
^ permalink raw reply [flat|nested] 144+ messages in thread* [rtc-linux] Re: [PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
@ 2016-04-27 23:04 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 23:04 UTC (permalink / raw)
To: linuxppc-dev
Cc: Alexandre Belloni, linux-arch, a.zummo, dalias, linux-parisc,
linux-sh, deller, linux-alpha, linux-kernel, dhowells,
linux-m68k, geert, rtc-linux
On Thursday 28 April 2016 00:34:23 Arnd Bergmann wrote:
> return -ENODEV;
>
> - pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
> + /* or just call devm_rtc_device_register instead? */
Oops, I was planning to remove the comment here.
I probably have to do a v4 anyway, fixed it up locally now.
Arnd
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
@ 2016-04-27 23:04 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 23:04 UTC (permalink / raw)
To: linuxppc-dev
Cc: Alexandre Belloni, linux-arch, a.zummo, dalias, linux-parisc,
linux-sh, deller, linux-alpha, linux-kernel, dhowells,
linux-m68k, geert, rtc-linux
On Thursday 28 April 2016 00:34:23 Arnd Bergmann wrote:
> return -ENODEV;
>
> - pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
> + /* or just call devm_rtc_device_register instead? */
Oops, I was planning to remove the comment here.
I probably have to do a v4 anyway, fixed it up locally now.
Arnd
^ permalink raw reply [flat|nested] 144+ messages in thread
* [PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
2016-04-27 22:34 ` Arnd Bergmann
` (18 preceding siblings ...)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and m68k has another abstraction on top, which is a bit
silly.
This changes the m68k rtc-generic device to provide its
rtc_class_ops directly, to reduce the number of layers
by one.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/m68k/kernel/time.c | 24 ++++++++++++++++++++++--
drivers/rtc/rtc-generic.c | 2 +-
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index 3857737e3958..80e024a10115 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -86,7 +86,24 @@ void read_persistent_clock(struct timespec *ts)
}
}
-#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
+#if defined(CONFIG_ARCH_USES_GETTIMEOFFSET) && IS_ENABLED(CONFIG_RTC_DRV_GENERIC)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
+{
+ mach_hwclk(0, tm);
+ return rtc_valid_tm(tm);
+}
+
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
+{
+ if (mach_hwclk(1, tm) < 0)
+ return -EOPNOTSUPP;
+ return 0;
+}
+
+static const struct rtc_class_ops generic_rtc_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
static int __init rtc_init(void)
{
@@ -95,7 +112,10 @@ static int __init rtc_init(void)
if (!mach_hwclk)
return -ENODEV;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ /* or just call devm_rtc_device_register instead? */
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &generic_rtc_ops,
+ sizeof(generic_rtc_ops));
return PTR_ERR_OR_ZERO(pdev);
}
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index 92b5e02a3750..5c82bae73b9c 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,7 +9,7 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if defined(CONFIG_M68K) || defined(CONFIG_PPC)
+#if defined(CONFIG_PPC)
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 10/16] rtc: m68k: provide ioctl for q40
2016-04-27 22:34 ` Arnd Bergmann
(?)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The q40 platform is the only machine in the kernel that provides
RTC_PLL_GET/RTC_PLL_SET ioctl commands in its rtc through the
mach_get_rtc_pll/mach_set_rtc_pll callbacks.
However, this currenctly works only in the old-style genrtc
driver, not the (somewhat) modern rtc-generic driver replacing
it. This adds an ioctl implementation to the m68k generic_rtc_ops
in order to let both drivers provide the same API.
After this, we should be able to remove support for genrtc
from the m68k architecture.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/m68k/kernel/time.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index 80e024a10115..465423c07a92 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -100,7 +100,32 @@ static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
return 0;
}
+static int rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
+{
+ struct rtc_pll_info pll;
+ struct rtc_pll_info __user *argp = (void __user *)arg;
+
+ switch (cmd) {
+ case RTC_PLL_GET:
+ if (!mach_get_rtc_pll || mach_get_rtc_pll(&pll))
+ return -EINVAL;
+ return copy_to_user(argp, &pll, sizeof pll) ? -EFAULT : 0;
+
+ case RTC_PLL_SET:
+ if (!mach_set_rtc_pll)
+ return -EINVAL;
+ if (!capable(CAP_SYS_TIME))
+ return -EACCES;
+ if (copy_from_user(&pll, argp, sizeof(pll)))
+ return -EFAULT;
+ return mach_set_rtc_pll(&pll);
+ }
+
+ return -ENOIOCTLCMD;
+}
+
static const struct rtc_class_ops generic_rtc_ops = {
+ .ioctl = rtc_ioctl,
.read_time = rtc_generic_get_time,
.set_time = rtc_generic_set_time,
};
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [rtc-linux] [PATCH v3 10/16] rtc: m68k: provide ioctl for q40
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The q40 platform is the only machine in the kernel that provides
RTC_PLL_GET/RTC_PLL_SET ioctl commands in its rtc through the
mach_get_rtc_pll/mach_set_rtc_pll callbacks.
However, this currenctly works only in the old-style genrtc
driver, not the (somewhat) modern rtc-generic driver replacing
it. This adds an ioctl implementation to the m68k generic_rtc_ops
in order to let both drivers provide the same API.
After this, we should be able to remove support for genrtc
from the m68k architecture.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/m68k/kernel/time.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index 80e024a10115..465423c07a92 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -100,7 +100,32 @@ static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
return 0;
}
+static int rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
+{
+ struct rtc_pll_info pll;
+ struct rtc_pll_info __user *argp = (void __user *)arg;
+
+ switch (cmd) {
+ case RTC_PLL_GET:
+ if (!mach_get_rtc_pll || mach_get_rtc_pll(&pll))
+ return -EINVAL;
+ return copy_to_user(argp, &pll, sizeof pll) ? -EFAULT : 0;
+
+ case RTC_PLL_SET:
+ if (!mach_set_rtc_pll)
+ return -EINVAL;
+ if (!capable(CAP_SYS_TIME))
+ return -EACCES;
+ if (copy_from_user(&pll, argp, sizeof(pll)))
+ return -EFAULT;
+ return mach_set_rtc_pll(&pll);
+ }
+
+ return -ENOIOCTLCMD;
+}
+
static const struct rtc_class_ops generic_rtc_ops = {
+ .ioctl = rtc_ioctl,
.read_time = rtc_generic_get_time,
.set_time = rtc_generic_set_time,
};
--
2.7.0
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 10/16] rtc: m68k: provide ioctl for q40
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The q40 platform is the only machine in the kernel that provides
RTC_PLL_GET/RTC_PLL_SET ioctl commands in its rtc through the
mach_get_rtc_pll/mach_set_rtc_pll callbacks.
However, this currenctly works only in the old-style genrtc
driver, not the (somewhat) modern rtc-generic driver replacing
it. This adds an ioctl implementation to the m68k generic_rtc_ops
in order to let both drivers provide the same API.
After this, we should be able to remove support for genrtc
from the m68k architecture.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/m68k/kernel/time.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index 80e024a10115..465423c07a92 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -100,7 +100,32 @@ static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
return 0;
}
+static int rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
+{
+ struct rtc_pll_info pll;
+ struct rtc_pll_info __user *argp = (void __user *)arg;
+
+ switch (cmd) {
+ case RTC_PLL_GET:
+ if (!mach_get_rtc_pll || mach_get_rtc_pll(&pll))
+ return -EINVAL;
+ return copy_to_user(argp, &pll, sizeof pll) ? -EFAULT : 0;
+
+ case RTC_PLL_SET:
+ if (!mach_set_rtc_pll)
+ return -EINVAL;
+ if (!capable(CAP_SYS_TIME))
+ return -EACCES;
+ if (copy_from_user(&pll, argp, sizeof(pll)))
+ return -EFAULT;
+ return mach_set_rtc_pll(&pll);
+ }
+
+ return -ENOIOCTLCMD;
+}
+
static const struct rtc_class_ops generic_rtc_ops = {
+ .ioctl = rtc_ioctl,
.read_time = rtc_generic_get_time,
.set_time = rtc_generic_set_time,
};
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 10/16] rtc: m68k: provide ioctl for q40
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The q40 platform is the only machine in the kernel that provides
RTC_PLL_GET/RTC_PLL_SET ioctl commands in its rtc through the
mach_get_rtc_pll/mach_set_rtc_pll callbacks.
However, this currenctly works only in the old-style genrtc
driver, not the (somewhat) modern rtc-generic driver replacing
it. This adds an ioctl implementation to the m68k generic_rtc_ops
in order to let both drivers provide the same API.
After this, we should be able to remove support for genrtc
from the m68k architecture.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/m68k/kernel/time.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index 80e024a10115..465423c07a92 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -100,7 +100,32 @@ static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
return 0;
}
+static int rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
+{
+ struct rtc_pll_info pll;
+ struct rtc_pll_info __user *argp = (void __user *)arg;
+
+ switch (cmd) {
+ case RTC_PLL_GET:
+ if (!mach_get_rtc_pll || mach_get_rtc_pll(&pll))
+ return -EINVAL;
+ return copy_to_user(argp, &pll, sizeof pll) ? -EFAULT : 0;
+
+ case RTC_PLL_SET:
+ if (!mach_set_rtc_pll)
+ return -EINVAL;
+ if (!capable(CAP_SYS_TIME))
+ return -EACCES;
+ if (copy_from_user(&pll, argp, sizeof(pll)))
+ return -EFAULT;
+ return mach_set_rtc_pll(&pll);
+ }
+
+ return -ENOIOCTLCMD;
+}
+
static const struct rtc_class_ops generic_rtc_ops = {
+ .ioctl = rtc_ioctl,
.read_time = rtc_generic_get_time,
.set_time = rtc_generic_set_time,
};
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread
* [PATCH v3 10/16] rtc: m68k: provide ioctl for q40
2016-04-27 22:34 ` Arnd Bergmann
` (20 preceding siblings ...)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The q40 platform is the only machine in the kernel that provides
RTC_PLL_GET/RTC_PLL_SET ioctl commands in its rtc through the
mach_get_rtc_pll/mach_set_rtc_pll callbacks.
However, this currenctly works only in the old-style genrtc
driver, not the (somewhat) modern rtc-generic driver replacing
it. This adds an ioctl implementation to the m68k generic_rtc_ops
in order to let both drivers provide the same API.
After this, we should be able to remove support for genrtc
from the m68k architecture.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/m68k/kernel/time.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index 80e024a10115..465423c07a92 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -100,7 +100,32 @@ static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
return 0;
}
+static int rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
+{
+ struct rtc_pll_info pll;
+ struct rtc_pll_info __user *argp = (void __user *)arg;
+
+ switch (cmd) {
+ case RTC_PLL_GET:
+ if (!mach_get_rtc_pll || mach_get_rtc_pll(&pll))
+ return -EINVAL;
+ return copy_to_user(argp, &pll, sizeof pll) ? -EFAULT : 0;
+
+ case RTC_PLL_SET:
+ if (!mach_set_rtc_pll)
+ return -EINVAL;
+ if (!capable(CAP_SYS_TIME))
+ return -EACCES;
+ if (copy_from_user(&pll, argp, sizeof(pll)))
+ return -EFAULT;
+ return mach_set_rtc_pll(&pll);
+ }
+
+ return -ENOIOCTLCMD;
+}
+
static const struct rtc_class_ops generic_rtc_ops = {
+ .ioctl = rtc_ioctl,
.read_time = rtc_generic_get_time,
.set_time = rtc_generic_set_time,
};
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 11/16] char/genrtc: remove m68k support
2016-04-27 22:34 ` Arnd Bergmann
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The asm/rtc.h header is only used for the old gen_rtc driver
that has been replaced by rtc-generic. According to Geert
Uytterhoeven, nobody has used the old driver on m68k for
a long time, so we can now just remove the header file
and disallow the driver in Kconfig.
All files that used to include asm/rtc.h are now changed so
they include the headers that were used implicitly through
asm/rtc.h.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/m68k/amiga/config.c | 1 -
arch/m68k/apollo/config.c | 1 -
arch/m68k/bvme6000/config.c | 1 -
arch/m68k/hp300/config.c | 2 +-
arch/m68k/include/asm/rtc.h | 79 ---------------------------------------------
arch/m68k/mac/config.c | 3 +-
arch/m68k/mac/misc.c | 1 -
arch/m68k/mvme147/config.c | 1 -
arch/m68k/mvme16x/config.c | 1 -
arch/m68k/q40/config.c | 2 +-
arch/m68k/sun3/config.c | 1 -
arch/m68k/sun3/intersil.c | 2 +-
arch/m68k/sun3x/time.c | 2 +-
drivers/char/Kconfig | 2 +-
14 files changed, 7 insertions(+), 92 deletions(-)
delete mode 100644 arch/m68k/include/asm/rtc.h
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index 01693df7f2f6..ec9cc1fdd237 100644
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -35,7 +35,6 @@
#include <asm/amigahw.h>
#include <asm/amigaints.h>
#include <asm/irq.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/io.h>
diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c
index 6e62d66c396e..432bc8bacfc2 100644
--- a/arch/m68k/apollo/config.c
+++ b/arch/m68k/apollo/config.c
@@ -15,7 +15,6 @@
#include <asm/pgtable.h>
#include <asm/apollohw.h>
#include <asm/irq.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
u_long sio01_physaddr;
diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c
index 478623dbb209..611d4d9ea2bd 100644
--- a/arch/m68k/bvme6000/config.c
+++ b/arch/m68k/bvme6000/config.c
@@ -34,7 +34,6 @@
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/traps.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/bvme6000hw.h>
diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c
index a9befe65adc4..7cfab158fb61 100644
--- a/arch/m68k/hp300/config.c
+++ b/arch/m68k/hp300/config.c
@@ -12,6 +12,7 @@
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/console.h>
+#include <linux/rtc.h>
#include <asm/bootinfo.h>
#include <asm/bootinfo-hp300.h>
@@ -20,7 +21,6 @@
#include <asm/blinken.h>
#include <asm/io.h> /* readb() and writeb() */
#include <asm/hp300hw.h>
-#include <asm/rtc.h>
#include "time.h"
diff --git a/arch/m68k/include/asm/rtc.h b/arch/m68k/include/asm/rtc.h
deleted file mode 100644
index a4d08ea122ee..000000000000
--- a/arch/m68k/include/asm/rtc.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* include/asm-m68k/rtc.h
- *
- * Copyright Richard Zidlicky
- * implementation details for genrtc/q40rtc driver
- */
-/* permission is hereby granted to copy, modify and redistribute this code
- * in terms of the GNU Library General Public License, Version 2 or later,
- * at your option.
- */
-
-#ifndef _ASM_RTC_H
-#define _ASM_RTC_H
-
-#ifdef __KERNEL__
-
-#include <linux/rtc.h>
-#include <asm/errno.h>
-#include <asm/machdep.h>
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-/* some dummy definitions */
-#define RTC_BATT_BAD 0x100 /* battery bad */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-static inline unsigned int get_rtc_time(struct rtc_time *time)
-{
- /*
- * Only the values that we read from the RTC are set. We leave
- * tm_wday, tm_yday and tm_isdst untouched. Even though the
- * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
- * by the RTC when initially set to a non-zero value.
- */
- if (mach_hwclk)
- mach_hwclk(0, time);
- return RTC_24H;
-}
-
-static inline int set_rtc_time(struct rtc_time *time)
-{
- if (mach_hwclk)
- return mach_hwclk(1, time);
- return -EINVAL;
-}
-
-static inline unsigned int get_rtc_ss(void)
-{
- if (mach_get_ss)
- return mach_get_ss();
- else{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
- }
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- if (mach_get_rtc_pll)
- return mach_get_rtc_pll(pll);
- else
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- if (mach_set_rtc_pll)
- return mach_set_rtc_pll(pll);
- else
- return -EINVAL;
-}
-#endif /* __KERNEL__ */
-
-#endif /* _ASM__RTC_H */
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 689b47d292ac..2f33a33001e5 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -10,6 +10,7 @@
* Miscellaneous linux stuff
*/
+#include <linux/errno.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/mm.h>
@@ -25,6 +26,7 @@
#include <linux/platform_device.h>
#include <linux/adb.h>
#include <linux/cuda.h>
+#include <linux/rtc.h>
#include <asm/setup.h>
#include <asm/bootinfo.h>
@@ -34,7 +36,6 @@
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/pgtable.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/macintosh.h>
diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c
index 707b61aea203..0fb54a90eac2 100644
--- a/arch/m68k/mac/misc.c
+++ b/arch/m68k/mac/misc.c
@@ -18,7 +18,6 @@
#include <asm/uaccess.h>
#include <asm/io.h>
-#include <asm/rtc.h>
#include <asm/segment.h>
#include <asm/setup.h>
#include <asm/macintosh.h>
diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c
index e6a3b56c6481..c11d38dfad08 100644
--- a/arch/m68k/mvme147/config.c
+++ b/arch/m68k/mvme147/config.c
@@ -32,7 +32,6 @@
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/traps.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/mvme147hw.h>
diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c
index a53803cc66cd..58e240939d26 100644
--- a/arch/m68k/mvme16x/config.c
+++ b/arch/m68k/mvme16x/config.c
@@ -35,7 +35,6 @@
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/traps.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/mvme16xhw.h>
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index e90fe903613e..fcb7f05b60b6 100644
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -12,6 +12,7 @@
* for more details.
*/
+#include <linux/errno.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/mm.h>
@@ -27,7 +28,6 @@
#include <linux/platform_device.h>
#include <asm/io.h>
-#include <asm/rtc.h>
#include <asm/bootinfo.h>
#include <asm/pgtable.h>
#include <asm/setup.h>
diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c
index 71884bf01d72..3af34fa3a344 100644
--- a/arch/m68k/sun3/config.c
+++ b/arch/m68k/sun3/config.c
@@ -26,7 +26,6 @@
#include <asm/pgalloc.h>
#include <asm/sun3-head.h>
#include <asm/sun3mmu.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/machines.h>
#include <asm/idprom.h>
diff --git a/arch/m68k/sun3/intersil.c b/arch/m68k/sun3/intersil.c
index 889829e11f1d..2cd0bcbe6f30 100644
--- a/arch/m68k/sun3/intersil.c
+++ b/arch/m68k/sun3/intersil.c
@@ -14,8 +14,8 @@
#include <linux/rtc.h>
#include <asm/errno.h>
-#include <asm/rtc.h>
#include <asm/intersil.h>
+#include <asm/machdep.h>
/* bits to set for start/run of the intersil */
diff --git a/arch/m68k/sun3x/time.c b/arch/m68k/sun3x/time.c
index c8eb08add6b0..431d3c4306dd 100644
--- a/arch/m68k/sun3x/time.c
+++ b/arch/m68k/sun3x/time.c
@@ -15,10 +15,10 @@
#include <asm/irq.h>
#include <asm/io.h>
+#include <asm/machdep.h>
#include <asm/traps.h>
#include <asm/sun3x.h>
#include <asm/sun3ints.h>
-#include <asm/rtc.h>
#include "time.h"
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index abab6e565c60..26089feae9b0 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on M68K || PPC
+ depends on PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [rtc-linux] [PATCH v3 11/16] char/genrtc: remove m68k support
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The asm/rtc.h header is only used for the old gen_rtc driver
that has been replaced by rtc-generic. According to Geert
Uytterhoeven, nobody has used the old driver on m68k for
a long time, so we can now just remove the header file
and disallow the driver in Kconfig.
All files that used to include asm/rtc.h are now changed so
they include the headers that were used implicitly through
asm/rtc.h.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/m68k/amiga/config.c | 1 -
arch/m68k/apollo/config.c | 1 -
arch/m68k/bvme6000/config.c | 1 -
arch/m68k/hp300/config.c | 2 +-
arch/m68k/include/asm/rtc.h | 79 ---------------------------------------------
arch/m68k/mac/config.c | 3 +-
arch/m68k/mac/misc.c | 1 -
arch/m68k/mvme147/config.c | 1 -
arch/m68k/mvme16x/config.c | 1 -
arch/m68k/q40/config.c | 2 +-
arch/m68k/sun3/config.c | 1 -
arch/m68k/sun3/intersil.c | 2 +-
arch/m68k/sun3x/time.c | 2 +-
drivers/char/Kconfig | 2 +-
14 files changed, 7 insertions(+), 92 deletions(-)
delete mode 100644 arch/m68k/include/asm/rtc.h
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index 01693df7f2f6..ec9cc1fdd237 100644
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -35,7 +35,6 @@
#include <asm/amigahw.h>
#include <asm/amigaints.h>
#include <asm/irq.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/io.h>
diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c
index 6e62d66c396e..432bc8bacfc2 100644
--- a/arch/m68k/apollo/config.c
+++ b/arch/m68k/apollo/config.c
@@ -15,7 +15,6 @@
#include <asm/pgtable.h>
#include <asm/apollohw.h>
#include <asm/irq.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
u_long sio01_physaddr;
diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c
index 478623dbb209..611d4d9ea2bd 100644
--- a/arch/m68k/bvme6000/config.c
+++ b/arch/m68k/bvme6000/config.c
@@ -34,7 +34,6 @@
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/traps.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/bvme6000hw.h>
diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c
index a9befe65adc4..7cfab158fb61 100644
--- a/arch/m68k/hp300/config.c
+++ b/arch/m68k/hp300/config.c
@@ -12,6 +12,7 @@
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/console.h>
+#include <linux/rtc.h>
#include <asm/bootinfo.h>
#include <asm/bootinfo-hp300.h>
@@ -20,7 +21,6 @@
#include <asm/blinken.h>
#include <asm/io.h> /* readb() and writeb() */
#include <asm/hp300hw.h>
-#include <asm/rtc.h>
#include "time.h"
diff --git a/arch/m68k/include/asm/rtc.h b/arch/m68k/include/asm/rtc.h
deleted file mode 100644
index a4d08ea122ee..000000000000
--- a/arch/m68k/include/asm/rtc.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* include/asm-m68k/rtc.h
- *
- * Copyright Richard Zidlicky
- * implementation details for genrtc/q40rtc driver
- */
-/* permission is hereby granted to copy, modify and redistribute this code
- * in terms of the GNU Library General Public License, Version 2 or later,
- * at your option.
- */
-
-#ifndef _ASM_RTC_H
-#define _ASM_RTC_H
-
-#ifdef __KERNEL__
-
-#include <linux/rtc.h>
-#include <asm/errno.h>
-#include <asm/machdep.h>
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-/* some dummy definitions */
-#define RTC_BATT_BAD 0x100 /* battery bad */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-static inline unsigned int get_rtc_time(struct rtc_time *time)
-{
- /*
- * Only the values that we read from the RTC are set. We leave
- * tm_wday, tm_yday and tm_isdst untouched. Even though the
- * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
- * by the RTC when initially set to a non-zero value.
- */
- if (mach_hwclk)
- mach_hwclk(0, time);
- return RTC_24H;
-}
-
-static inline int set_rtc_time(struct rtc_time *time)
-{
- if (mach_hwclk)
- return mach_hwclk(1, time);
- return -EINVAL;
-}
-
-static inline unsigned int get_rtc_ss(void)
-{
- if (mach_get_ss)
- return mach_get_ss();
- else{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
- }
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- if (mach_get_rtc_pll)
- return mach_get_rtc_pll(pll);
- else
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- if (mach_set_rtc_pll)
- return mach_set_rtc_pll(pll);
- else
- return -EINVAL;
-}
-#endif /* __KERNEL__ */
-
-#endif /* _ASM__RTC_H */
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 689b47d292ac..2f33a33001e5 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -10,6 +10,7 @@
* Miscellaneous linux stuff
*/
+#include <linux/errno.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/mm.h>
@@ -25,6 +26,7 @@
#include <linux/platform_device.h>
#include <linux/adb.h>
#include <linux/cuda.h>
+#include <linux/rtc.h>
#include <asm/setup.h>
#include <asm/bootinfo.h>
@@ -34,7 +36,6 @@
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/pgtable.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/macintosh.h>
diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c
index 707b61aea203..0fb54a90eac2 100644
--- a/arch/m68k/mac/misc.c
+++ b/arch/m68k/mac/misc.c
@@ -18,7 +18,6 @@
#include <asm/uaccess.h>
#include <asm/io.h>
-#include <asm/rtc.h>
#include <asm/segment.h>
#include <asm/setup.h>
#include <asm/macintosh.h>
diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c
index e6a3b56c6481..c11d38dfad08 100644
--- a/arch/m68k/mvme147/config.c
+++ b/arch/m68k/mvme147/config.c
@@ -32,7 +32,6 @@
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/traps.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/mvme147hw.h>
diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c
index a53803cc66cd..58e240939d26 100644
--- a/arch/m68k/mvme16x/config.c
+++ b/arch/m68k/mvme16x/config.c
@@ -35,7 +35,6 @@
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/traps.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/mvme16xhw.h>
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index e90fe903613e..fcb7f05b60b6 100644
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -12,6 +12,7 @@
* for more details.
*/
+#include <linux/errno.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/mm.h>
@@ -27,7 +28,6 @@
#include <linux/platform_device.h>
#include <asm/io.h>
-#include <asm/rtc.h>
#include <asm/bootinfo.h>
#include <asm/pgtable.h>
#include <asm/setup.h>
diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c
index 71884bf01d72..3af34fa3a344 100644
--- a/arch/m68k/sun3/config.c
+++ b/arch/m68k/sun3/config.c
@@ -26,7 +26,6 @@
#include <asm/pgalloc.h>
#include <asm/sun3-head.h>
#include <asm/sun3mmu.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/machines.h>
#include <asm/idprom.h>
diff --git a/arch/m68k/sun3/intersil.c b/arch/m68k/sun3/intersil.c
index 889829e11f1d..2cd0bcbe6f30 100644
--- a/arch/m68k/sun3/intersil.c
+++ b/arch/m68k/sun3/intersil.c
@@ -14,8 +14,8 @@
#include <linux/rtc.h>
#include <asm/errno.h>
-#include <asm/rtc.h>
#include <asm/intersil.h>
+#include <asm/machdep.h>
/* bits to set for start/run of the intersil */
diff --git a/arch/m68k/sun3x/time.c b/arch/m68k/sun3x/time.c
index c8eb08add6b0..431d3c4306dd 100644
--- a/arch/m68k/sun3x/time.c
+++ b/arch/m68k/sun3x/time.c
@@ -15,10 +15,10 @@
#include <asm/irq.h>
#include <asm/io.h>
+#include <asm/machdep.h>
#include <asm/traps.h>
#include <asm/sun3x.h>
#include <asm/sun3ints.h>
-#include <asm/rtc.h>
#include "time.h"
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index abab6e565c60..26089feae9b0 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on M68K || PPC
+ depends on PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 11/16] char/genrtc: remove m68k support
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The asm/rtc.h header is only used for the old gen_rtc driver
that has been replaced by rtc-generic. According to Geert
Uytterhoeven, nobody has used the old driver on m68k for
a long time, so we can now just remove the header file
and disallow the driver in Kconfig.
All files that used to include asm/rtc.h are now changed so
they include the headers that were used implicitly through
asm/rtc.h.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/m68k/amiga/config.c | 1 -
arch/m68k/apollo/config.c | 1 -
arch/m68k/bvme6000/config.c | 1 -
arch/m68k/hp300/config.c | 2 +-
arch/m68k/include/asm/rtc.h | 79 ---------------------------------------------
arch/m68k/mac/config.c | 3 +-
arch/m68k/mac/misc.c | 1 -
arch/m68k/mvme147/config.c | 1 -
arch/m68k/mvme16x/config.c | 1 -
arch/m68k/q40/config.c | 2 +-
arch/m68k/sun3/config.c | 1 -
arch/m68k/sun3/intersil.c | 2 +-
arch/m68k/sun3x/time.c | 2 +-
drivers/char/Kconfig | 2 +-
14 files changed, 7 insertions(+), 92 deletions(-)
delete mode 100644 arch/m68k/include/asm/rtc.h
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index 01693df7f2f6..ec9cc1fdd237 100644
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -35,7 +35,6 @@
#include <asm/amigahw.h>
#include <asm/amigaints.h>
#include <asm/irq.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/io.h>
diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c
index 6e62d66c396e..432bc8bacfc2 100644
--- a/arch/m68k/apollo/config.c
+++ b/arch/m68k/apollo/config.c
@@ -15,7 +15,6 @@
#include <asm/pgtable.h>
#include <asm/apollohw.h>
#include <asm/irq.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
u_long sio01_physaddr;
diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c
index 478623dbb209..611d4d9ea2bd 100644
--- a/arch/m68k/bvme6000/config.c
+++ b/arch/m68k/bvme6000/config.c
@@ -34,7 +34,6 @@
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/traps.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/bvme6000hw.h>
diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c
index a9befe65adc4..7cfab158fb61 100644
--- a/arch/m68k/hp300/config.c
+++ b/arch/m68k/hp300/config.c
@@ -12,6 +12,7 @@
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/console.h>
+#include <linux/rtc.h>
#include <asm/bootinfo.h>
#include <asm/bootinfo-hp300.h>
@@ -20,7 +21,6 @@
#include <asm/blinken.h>
#include <asm/io.h> /* readb() and writeb() */
#include <asm/hp300hw.h>
-#include <asm/rtc.h>
#include "time.h"
diff --git a/arch/m68k/include/asm/rtc.h b/arch/m68k/include/asm/rtc.h
deleted file mode 100644
index a4d08ea122ee..000000000000
--- a/arch/m68k/include/asm/rtc.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* include/asm-m68k/rtc.h
- *
- * Copyright Richard Zidlicky
- * implementation details for genrtc/q40rtc driver
- */
-/* permission is hereby granted to copy, modify and redistribute this code
- * in terms of the GNU Library General Public License, Version 2 or later,
- * at your option.
- */
-
-#ifndef _ASM_RTC_H
-#define _ASM_RTC_H
-
-#ifdef __KERNEL__
-
-#include <linux/rtc.h>
-#include <asm/errno.h>
-#include <asm/machdep.h>
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-/* some dummy definitions */
-#define RTC_BATT_BAD 0x100 /* battery bad */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-static inline unsigned int get_rtc_time(struct rtc_time *time)
-{
- /*
- * Only the values that we read from the RTC are set. We leave
- * tm_wday, tm_yday and tm_isdst untouched. Even though the
- * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
- * by the RTC when initially set to a non-zero value.
- */
- if (mach_hwclk)
- mach_hwclk(0, time);
- return RTC_24H;
-}
-
-static inline int set_rtc_time(struct rtc_time *time)
-{
- if (mach_hwclk)
- return mach_hwclk(1, time);
- return -EINVAL;
-}
-
-static inline unsigned int get_rtc_ss(void)
-{
- if (mach_get_ss)
- return mach_get_ss();
- else{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
- }
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- if (mach_get_rtc_pll)
- return mach_get_rtc_pll(pll);
- else
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- if (mach_set_rtc_pll)
- return mach_set_rtc_pll(pll);
- else
- return -EINVAL;
-}
-#endif /* __KERNEL__ */
-
-#endif /* _ASM__RTC_H */
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 689b47d292ac..2f33a33001e5 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -10,6 +10,7 @@
* Miscellaneous linux stuff
*/
+#include <linux/errno.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/mm.h>
@@ -25,6 +26,7 @@
#include <linux/platform_device.h>
#include <linux/adb.h>
#include <linux/cuda.h>
+#include <linux/rtc.h>
#include <asm/setup.h>
#include <asm/bootinfo.h>
@@ -34,7 +36,6 @@
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/pgtable.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/macintosh.h>
diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c
index 707b61aea203..0fb54a90eac2 100644
--- a/arch/m68k/mac/misc.c
+++ b/arch/m68k/mac/misc.c
@@ -18,7 +18,6 @@
#include <asm/uaccess.h>
#include <asm/io.h>
-#include <asm/rtc.h>
#include <asm/segment.h>
#include <asm/setup.h>
#include <asm/macintosh.h>
diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c
index e6a3b56c6481..c11d38dfad08 100644
--- a/arch/m68k/mvme147/config.c
+++ b/arch/m68k/mvme147/config.c
@@ -32,7 +32,6 @@
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/traps.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/mvme147hw.h>
diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c
index a53803cc66cd..58e240939d26 100644
--- a/arch/m68k/mvme16x/config.c
+++ b/arch/m68k/mvme16x/config.c
@@ -35,7 +35,6 @@
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/traps.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/mvme16xhw.h>
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index e90fe903613e..fcb7f05b60b6 100644
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -12,6 +12,7 @@
* for more details.
*/
+#include <linux/errno.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/mm.h>
@@ -27,7 +28,6 @@
#include <linux/platform_device.h>
#include <asm/io.h>
-#include <asm/rtc.h>
#include <asm/bootinfo.h>
#include <asm/pgtable.h>
#include <asm/setup.h>
diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c
index 71884bf01d72..3af34fa3a344 100644
--- a/arch/m68k/sun3/config.c
+++ b/arch/m68k/sun3/config.c
@@ -26,7 +26,6 @@
#include <asm/pgalloc.h>
#include <asm/sun3-head.h>
#include <asm/sun3mmu.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/machines.h>
#include <asm/idprom.h>
diff --git a/arch/m68k/sun3/intersil.c b/arch/m68k/sun3/intersil.c
index 889829e11f1d..2cd0bcbe6f30 100644
--- a/arch/m68k/sun3/intersil.c
+++ b/arch/m68k/sun3/intersil.c
@@ -14,8 +14,8 @@
#include <linux/rtc.h>
#include <asm/errno.h>
-#include <asm/rtc.h>
#include <asm/intersil.h>
+#include <asm/machdep.h>
/* bits to set for start/run of the intersil */
diff --git a/arch/m68k/sun3x/time.c b/arch/m68k/sun3x/time.c
index c8eb08add6b0..431d3c4306dd 100644
--- a/arch/m68k/sun3x/time.c
+++ b/arch/m68k/sun3x/time.c
@@ -15,10 +15,10 @@
#include <asm/irq.h>
#include <asm/io.h>
+#include <asm/machdep.h>
#include <asm/traps.h>
#include <asm/sun3x.h>
#include <asm/sun3ints.h>
-#include <asm/rtc.h>
#include "time.h"
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index abab6e565c60..26089feae9b0 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on M68K || PPC
+ depends on PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread
* [PATCH v3 11/16] char/genrtc: remove m68k support
2016-04-27 22:34 ` Arnd Bergmann
` (22 preceding siblings ...)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The asm/rtc.h header is only used for the old gen_rtc driver
that has been replaced by rtc-generic. According to Geert
Uytterhoeven, nobody has used the old driver on m68k for
a long time, so we can now just remove the header file
and disallow the driver in Kconfig.
All files that used to include asm/rtc.h are now changed so
they include the headers that were used implicitly through
asm/rtc.h.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/m68k/amiga/config.c | 1 -
arch/m68k/apollo/config.c | 1 -
arch/m68k/bvme6000/config.c | 1 -
arch/m68k/hp300/config.c | 2 +-
arch/m68k/include/asm/rtc.h | 79 ---------------------------------------------
arch/m68k/mac/config.c | 3 +-
arch/m68k/mac/misc.c | 1 -
arch/m68k/mvme147/config.c | 1 -
arch/m68k/mvme16x/config.c | 1 -
arch/m68k/q40/config.c | 2 +-
arch/m68k/sun3/config.c | 1 -
arch/m68k/sun3/intersil.c | 2 +-
arch/m68k/sun3x/time.c | 2 +-
drivers/char/Kconfig | 2 +-
14 files changed, 7 insertions(+), 92 deletions(-)
delete mode 100644 arch/m68k/include/asm/rtc.h
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index 01693df7f2f6..ec9cc1fdd237 100644
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -35,7 +35,6 @@
#include <asm/amigahw.h>
#include <asm/amigaints.h>
#include <asm/irq.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/io.h>
diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c
index 6e62d66c396e..432bc8bacfc2 100644
--- a/arch/m68k/apollo/config.c
+++ b/arch/m68k/apollo/config.c
@@ -15,7 +15,6 @@
#include <asm/pgtable.h>
#include <asm/apollohw.h>
#include <asm/irq.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
u_long sio01_physaddr;
diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c
index 478623dbb209..611d4d9ea2bd 100644
--- a/arch/m68k/bvme6000/config.c
+++ b/arch/m68k/bvme6000/config.c
@@ -34,7 +34,6 @@
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/traps.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/bvme6000hw.h>
diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c
index a9befe65adc4..7cfab158fb61 100644
--- a/arch/m68k/hp300/config.c
+++ b/arch/m68k/hp300/config.c
@@ -12,6 +12,7 @@
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/console.h>
+#include <linux/rtc.h>
#include <asm/bootinfo.h>
#include <asm/bootinfo-hp300.h>
@@ -20,7 +21,6 @@
#include <asm/blinken.h>
#include <asm/io.h> /* readb() and writeb() */
#include <asm/hp300hw.h>
-#include <asm/rtc.h>
#include "time.h"
diff --git a/arch/m68k/include/asm/rtc.h b/arch/m68k/include/asm/rtc.h
deleted file mode 100644
index a4d08ea122ee..000000000000
--- a/arch/m68k/include/asm/rtc.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* include/asm-m68k/rtc.h
- *
- * Copyright Richard Zidlicky
- * implementation details for genrtc/q40rtc driver
- */
-/* permission is hereby granted to copy, modify and redistribute this code
- * in terms of the GNU Library General Public License, Version 2 or later,
- * at your option.
- */
-
-#ifndef _ASM_RTC_H
-#define _ASM_RTC_H
-
-#ifdef __KERNEL__
-
-#include <linux/rtc.h>
-#include <asm/errno.h>
-#include <asm/machdep.h>
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-/* some dummy definitions */
-#define RTC_BATT_BAD 0x100 /* battery bad */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-static inline unsigned int get_rtc_time(struct rtc_time *time)
-{
- /*
- * Only the values that we read from the RTC are set. We leave
- * tm_wday, tm_yday and tm_isdst untouched. Even though the
- * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
- * by the RTC when initially set to a non-zero value.
- */
- if (mach_hwclk)
- mach_hwclk(0, time);
- return RTC_24H;
-}
-
-static inline int set_rtc_time(struct rtc_time *time)
-{
- if (mach_hwclk)
- return mach_hwclk(1, time);
- return -EINVAL;
-}
-
-static inline unsigned int get_rtc_ss(void)
-{
- if (mach_get_ss)
- return mach_get_ss();
- else{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
- }
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- if (mach_get_rtc_pll)
- return mach_get_rtc_pll(pll);
- else
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- if (mach_set_rtc_pll)
- return mach_set_rtc_pll(pll);
- else
- return -EINVAL;
-}
-#endif /* __KERNEL__ */
-
-#endif /* _ASM__RTC_H */
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 689b47d292ac..2f33a33001e5 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -10,6 +10,7 @@
* Miscellaneous linux stuff
*/
+#include <linux/errno.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/mm.h>
@@ -25,6 +26,7 @@
#include <linux/platform_device.h>
#include <linux/adb.h>
#include <linux/cuda.h>
+#include <linux/rtc.h>
#include <asm/setup.h>
#include <asm/bootinfo.h>
@@ -34,7 +36,6 @@
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/pgtable.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/macintosh.h>
diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c
index 707b61aea203..0fb54a90eac2 100644
--- a/arch/m68k/mac/misc.c
+++ b/arch/m68k/mac/misc.c
@@ -18,7 +18,6 @@
#include <asm/uaccess.h>
#include <asm/io.h>
-#include <asm/rtc.h>
#include <asm/segment.h>
#include <asm/setup.h>
#include <asm/macintosh.h>
diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c
index e6a3b56c6481..c11d38dfad08 100644
--- a/arch/m68k/mvme147/config.c
+++ b/arch/m68k/mvme147/config.c
@@ -32,7 +32,6 @@
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/traps.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/mvme147hw.h>
diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c
index a53803cc66cd..58e240939d26 100644
--- a/arch/m68k/mvme16x/config.c
+++ b/arch/m68k/mvme16x/config.c
@@ -35,7 +35,6 @@
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/traps.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/mvme16xhw.h>
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index e90fe903613e..fcb7f05b60b6 100644
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -12,6 +12,7 @@
* for more details.
*/
+#include <linux/errno.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/mm.h>
@@ -27,7 +28,6 @@
#include <linux/platform_device.h>
#include <asm/io.h>
-#include <asm/rtc.h>
#include <asm/bootinfo.h>
#include <asm/pgtable.h>
#include <asm/setup.h>
diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c
index 71884bf01d72..3af34fa3a344 100644
--- a/arch/m68k/sun3/config.c
+++ b/arch/m68k/sun3/config.c
@@ -26,7 +26,6 @@
#include <asm/pgalloc.h>
#include <asm/sun3-head.h>
#include <asm/sun3mmu.h>
-#include <asm/rtc.h>
#include <asm/machdep.h>
#include <asm/machines.h>
#include <asm/idprom.h>
diff --git a/arch/m68k/sun3/intersil.c b/arch/m68k/sun3/intersil.c
index 889829e11f1d..2cd0bcbe6f30 100644
--- a/arch/m68k/sun3/intersil.c
+++ b/arch/m68k/sun3/intersil.c
@@ -14,8 +14,8 @@
#include <linux/rtc.h>
#include <asm/errno.h>
-#include <asm/rtc.h>
#include <asm/intersil.h>
+#include <asm/machdep.h>
/* bits to set for start/run of the intersil */
diff --git a/arch/m68k/sun3x/time.c b/arch/m68k/sun3x/time.c
index c8eb08add6b0..431d3c4306dd 100644
--- a/arch/m68k/sun3x/time.c
+++ b/arch/m68k/sun3x/time.c
@@ -15,10 +15,10 @@
#include <asm/irq.h>
#include <asm/io.h>
+#include <asm/machdep.h>
#include <asm/traps.h>
#include <asm/sun3x.h>
#include <asm/sun3ints.h>
-#include <asm/rtc.h>
#include "time.h"
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index abab6e565c60..26089feae9b0 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -328,7 +328,7 @@ config JS_RTC
config GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on M68K || PPC
+ depends on PPC
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
2016-04-27 22:34 ` Arnd Bergmann
` (23 preceding siblings ...)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and powerpc has another abstraction on top, which is a bit
silly.
This changes the powerpc rtc-generic device to provide its
rtc_class_ops directly, to reduce the number of layers
by one.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/powerpc/kernel/time.c | 29 ++++++++++++++++++++++++++++-
drivers/rtc/rtc-generic.c | 2 +-
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 3ed9a5a21d77..7a482a7f4d8d 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -56,6 +56,7 @@
#include <linux/irq_work.h>
#include <linux/clk-provider.h>
#include <linux/suspend.h>
+#include <linux/rtc.h>
#include <asm/trace.h>
#include <asm/io.h>
@@ -1081,6 +1082,29 @@ void calibrate_delay(void)
loops_per_jiffy = tb_ticks_per_jiffy;
}
+#if IS_ENABLED(CONFIG_RTC_DRV_GENERIC)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
+{
+ ppc_md.get_rtc_time(tm);
+ return rtc_valid_tm(tm);
+}
+
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
+{
+ if (!ppc_md.set_rtc_time)
+ return -EOPNOTSUPP;
+
+ if (ppc_md.set_rtc_time(tm) < 0)
+ return -EOPNOTSUPP;
+
+ return 0;
+}
+
+static const struct rtc_class_ops rtc_generic_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
+
static int __init rtc_init(void)
{
struct platform_device *pdev;
@@ -1088,9 +1112,12 @@ static int __init rtc_init(void)
if (!ppc_md.get_rtc_time)
return -ENODEV;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &rtc_generic_ops,
+ sizeof(rtc_generic_ops));
return PTR_ERR_OR_ZERO(pdev);
}
device_initcall(rtc_init);
+#endif
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index 5c82bae73b9c..efcb9833cac8 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,7 +9,7 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if defined(CONFIG_PPC)
+#if 0
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
2016-04-27 22:34 ` Arnd Bergmann
(?)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and powerpc has another abstraction on top, which is a bit
silly.
This changes the powerpc rtc-generic device to provide its
rtc_class_ops directly, to reduce the number of layers
by one.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/powerpc/kernel/time.c | 29 ++++++++++++++++++++++++++++-
drivers/rtc/rtc-generic.c | 2 +-
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 3ed9a5a21d77..7a482a7f4d8d 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -56,6 +56,7 @@
#include <linux/irq_work.h>
#include <linux/clk-provider.h>
#include <linux/suspend.h>
+#include <linux/rtc.h>
#include <asm/trace.h>
#include <asm/io.h>
@@ -1081,6 +1082,29 @@ void calibrate_delay(void)
loops_per_jiffy = tb_ticks_per_jiffy;
}
+#if IS_ENABLED(CONFIG_RTC_DRV_GENERIC)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
+{
+ ppc_md.get_rtc_time(tm);
+ return rtc_valid_tm(tm);
+}
+
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
+{
+ if (!ppc_md.set_rtc_time)
+ return -EOPNOTSUPP;
+
+ if (ppc_md.set_rtc_time(tm) < 0)
+ return -EOPNOTSUPP;
+
+ return 0;
+}
+
+static const struct rtc_class_ops rtc_generic_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
+
static int __init rtc_init(void)
{
struct platform_device *pdev;
@@ -1088,9 +1112,12 @@ static int __init rtc_init(void)
if (!ppc_md.get_rtc_time)
return -ENODEV;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &rtc_generic_ops,
+ sizeof(rtc_generic_ops));
return PTR_ERR_OR_ZERO(pdev);
}
device_initcall(rtc_init);
+#endif
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index 5c82bae73b9c..efcb9833cac8 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,7 +9,7 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if defined(CONFIG_PPC)
+#if 0
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [rtc-linux] [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and powerpc has another abstraction on top, which is a bit
silly.
This changes the powerpc rtc-generic device to provide its
rtc_class_ops directly, to reduce the number of layers
by one.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/powerpc/kernel/time.c | 29 ++++++++++++++++++++++++++++-
drivers/rtc/rtc-generic.c | 2 +-
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 3ed9a5a21d77..7a482a7f4d8d 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -56,6 +56,7 @@
#include <linux/irq_work.h>
#include <linux/clk-provider.h>
#include <linux/suspend.h>
+#include <linux/rtc.h>
#include <asm/trace.h>
#include <asm/io.h>
@@ -1081,6 +1082,29 @@ void calibrate_delay(void)
loops_per_jiffy = tb_ticks_per_jiffy;
}
+#if IS_ENABLED(CONFIG_RTC_DRV_GENERIC)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
+{
+ ppc_md.get_rtc_time(tm);
+ return rtc_valid_tm(tm);
+}
+
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
+{
+ if (!ppc_md.set_rtc_time)
+ return -EOPNOTSUPP;
+
+ if (ppc_md.set_rtc_time(tm) < 0)
+ return -EOPNOTSUPP;
+
+ return 0;
+}
+
+static const struct rtc_class_ops rtc_generic_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
+
static int __init rtc_init(void)
{
struct platform_device *pdev;
@@ -1088,9 +1112,12 @@ static int __init rtc_init(void)
if (!ppc_md.get_rtc_time)
return -ENODEV;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &rtc_generic_ops,
+ sizeof(rtc_generic_ops));
return PTR_ERR_OR_ZERO(pdev);
}
device_initcall(rtc_init);
+#endif
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index 5c82bae73b9c..efcb9833cac8 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,7 +9,7 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if defined(CONFIG_PPC)
+#if 0
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and powerpc has another abstraction on top, which is a bit
silly.
This changes the powerpc rtc-generic device to provide its
rtc_class_ops directly, to reduce the number of layers
by one.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/powerpc/kernel/time.c | 29 ++++++++++++++++++++++++++++-
drivers/rtc/rtc-generic.c | 2 +-
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 3ed9a5a21d77..7a482a7f4d8d 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -56,6 +56,7 @@
#include <linux/irq_work.h>
#include <linux/clk-provider.h>
#include <linux/suspend.h>
+#include <linux/rtc.h>
#include <asm/trace.h>
#include <asm/io.h>
@@ -1081,6 +1082,29 @@ void calibrate_delay(void)
loops_per_jiffy = tb_ticks_per_jiffy;
}
+#if IS_ENABLED(CONFIG_RTC_DRV_GENERIC)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
+{
+ ppc_md.get_rtc_time(tm);
+ return rtc_valid_tm(tm);
+}
+
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
+{
+ if (!ppc_md.set_rtc_time)
+ return -EOPNOTSUPP;
+
+ if (ppc_md.set_rtc_time(tm) < 0)
+ return -EOPNOTSUPP;
+
+ return 0;
+}
+
+static const struct rtc_class_ops rtc_generic_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
+
static int __init rtc_init(void)
{
struct platform_device *pdev;
@@ -1088,9 +1112,12 @@ static int __init rtc_init(void)
if (!ppc_md.get_rtc_time)
return -ENODEV;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &rtc_generic_ops,
+ sizeof(rtc_generic_ops));
return PTR_ERR_OR_ZERO(pdev);
}
device_initcall(rtc_init);
+#endif
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index 5c82bae73b9c..efcb9833cac8 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,7 +9,7 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if defined(CONFIG_PPC)
+#if 0
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
The rtc-generic driver provides an architecture specific
wrapper on top of the generic rtc_class_ops abstraction,
and powerpc has another abstraction on top, which is a bit
silly.
This changes the powerpc rtc-generic device to provide its
rtc_class_ops directly, to reduce the number of layers
by one.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/powerpc/kernel/time.c | 29 ++++++++++++++++++++++++++++-
drivers/rtc/rtc-generic.c | 2 +-
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 3ed9a5a21d77..7a482a7f4d8d 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -56,6 +56,7 @@
#include <linux/irq_work.h>
#include <linux/clk-provider.h>
#include <linux/suspend.h>
+#include <linux/rtc.h>
#include <asm/trace.h>
#include <asm/io.h>
@@ -1081,6 +1082,29 @@ void calibrate_delay(void)
loops_per_jiffy = tb_ticks_per_jiffy;
}
+#if IS_ENABLED(CONFIG_RTC_DRV_GENERIC)
+static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
+{
+ ppc_md.get_rtc_time(tm);
+ return rtc_valid_tm(tm);
+}
+
+static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
+{
+ if (!ppc_md.set_rtc_time)
+ return -EOPNOTSUPP;
+
+ if (ppc_md.set_rtc_time(tm) < 0)
+ return -EOPNOTSUPP;
+
+ return 0;
+}
+
+static const struct rtc_class_ops rtc_generic_ops = {
+ .read_time = rtc_generic_get_time,
+ .set_time = rtc_generic_set_time,
+};
+
static int __init rtc_init(void)
{
struct platform_device *pdev;
@@ -1088,9 +1112,12 @@ static int __init rtc_init(void)
if (!ppc_md.get_rtc_time)
return -ENODEV;
- pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+ pdev = platform_device_register_data(NULL, "rtc-generic", -1,
+ &rtc_generic_ops,
+ sizeof(rtc_generic_ops));
return PTR_ERR_OR_ZERO(pdev);
}
device_initcall(rtc_init);
+#endif
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index 5c82bae73b9c..efcb9833cac8 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,7 +9,7 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if defined(CONFIG_PPC)
+#if 0
#include <asm/rtc.h>
static int generic_get_time(struct device *dev, struct rtc_time *tm)
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* Re: [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
2016-04-27 22:34 ` Arnd Bergmann
` (2 preceding siblings ...)
(?)
@ 2016-05-03 4:05 ` Michael Ellerman
-1 siblings, 0 replies; 144+ messages in thread
From: Michael Ellerman @ 2016-05-03 4:05 UTC (permalink / raw)
To: Arnd Bergmann, Alexandre Belloni
Cc: geert, deller, benh, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch
On Thu, 2016-04-28 at 00:34 +0200, Arnd Bergmann wrote:
> The rtc-generic driver provides an architecture specific
> wrapper on top of the generic rtc_class_ops abstraction,
> and powerpc has another abstraction on top, which is a bit
> silly.
>
> This changes the powerpc rtc-generic device to provide its
> rtc_class_ops directly, to reduce the number of layers
> by one.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/powerpc/kernel/time.c | 29 ++++++++++++++++++++++++++++-
> drivers/rtc/rtc-generic.c | 2 +-
> 2 files changed, 29 insertions(+), 2 deletions(-)
If this hits linux-next it will go through my automated boot testing, which
hopefully would be sufficient to catch any bugs in this patch, cross fingers.
I don't know jack about all the layers of RTC mess, so my ack is basically
worthless here. But if you like you can have one anyway :)
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
cheers
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
@ 2016-05-03 4:05 ` Michael Ellerman
0 siblings, 0 replies; 144+ messages in thread
From: Michael Ellerman @ 2016-05-03 4:05 UTC (permalink / raw)
To: Arnd Bergmann, Alexandre Belloni
Cc: geert, deller, benh, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch
On Thu, 2016-04-28 at 00:34 +0200, Arnd Bergmann wrote:
> The rtc-generic driver provides an architecture specific
> wrapper on top of the generic rtc_class_ops abstraction,
> and powerpc has another abstraction on top, which is a bit
> silly.
>
> This changes the powerpc rtc-generic device to provide its
> rtc_class_ops directly, to reduce the number of layers
> by one.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/powerpc/kernel/time.c | 29 ++++++++++++++++++++++++++++-
> drivers/rtc/rtc-generic.c | 2 +-
> 2 files changed, 29 insertions(+), 2 deletions(-)
If this hits linux-next it will go through my automated boot testing, which
hopefully would be sufficient to catch any bugs in this patch, cross fingers.
I don't know jack about all the layers of RTC mess, so my ack is basically
worthless here. But if you like you can have one anyway :)
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
cheers
^ permalink raw reply [flat|nested] 144+ messages in thread
* [rtc-linux] Re: [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
@ 2016-05-03 4:05 ` Michael Ellerman
0 siblings, 0 replies; 144+ messages in thread
From: Michael Ellerman @ 2016-05-03 4:05 UTC (permalink / raw)
To: Arnd Bergmann, Alexandre Belloni
Cc: geert, deller, benh, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch
On Thu, 2016-04-28 at 00:34 +0200, Arnd Bergmann wrote:
> The rtc-generic driver provides an architecture specific
> wrapper on top of the generic rtc_class_ops abstraction,
> and powerpc has another abstraction on top, which is a bit
> silly.
>
> This changes the powerpc rtc-generic device to provide its
> rtc_class_ops directly, to reduce the number of layers
> by one.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/powerpc/kernel/time.c | 29 ++++++++++++++++++++++++++++-
> drivers/rtc/rtc-generic.c | 2 +-
> 2 files changed, 29 insertions(+), 2 deletions(-)
If this hits linux-next it will go through my automated boot testing, which
hopefully would be sufficient to catch any bugs in this patch, cross fingers.
I don't know jack about all the layers of RTC mess, so my ack is basically
worthless here. But if you like you can have one anyway :)
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
cheers
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
@ 2016-05-03 4:05 ` Michael Ellerman
0 siblings, 0 replies; 144+ messages in thread
From: Michael Ellerman @ 2016-05-03 4:05 UTC (permalink / raw)
To: Arnd Bergmann, Alexandre Belloni
Cc: geert, deller, benh, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch
On Thu, 2016-04-28 at 00:34 +0200, Arnd Bergmann wrote:
> The rtc-generic driver provides an architecture specific
> wrapper on top of the generic rtc_class_ops abstraction,
> and powerpc has another abstraction on top, which is a bit
> silly.
>
> This changes the powerpc rtc-generic device to provide its
> rtc_class_ops directly, to reduce the number of layers
> by one.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/powerpc/kernel/time.c | 29 ++++++++++++++++++++++++++++-
> drivers/rtc/rtc-generic.c | 2 +-
> 2 files changed, 29 insertions(+), 2 deletions(-)
If this hits linux-next it will go through my automated boot testing, which
hopefully would be sufficient to catch any bugs in this patch, cross fingers.
I don't know jack about all the layers of RTC mess, so my ack is basically
worthless here. But if you like you can have one anyway :)
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
cheers
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
@ 2016-05-03 4:05 ` Michael Ellerman
0 siblings, 0 replies; 144+ messages in thread
From: Michael Ellerman @ 2016-05-03 4:05 UTC (permalink / raw)
To: Arnd Bergmann, Alexandre Belloni
Cc: geert, deller, benh, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch
On Thu, 2016-04-28 at 00:34 +0200, Arnd Bergmann wrote:
> The rtc-generic driver provides an architecture specific
> wrapper on top of the generic rtc_class_ops abstraction,
> and powerpc has another abstraction on top, which is a bit
> silly.
>
> This changes the powerpc rtc-generic device to provide its
> rtc_class_ops directly, to reduce the number of layers
> by one.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/powerpc/kernel/time.c | 29 ++++++++++++++++++++++++++++-
> drivers/rtc/rtc-generic.c | 2 +-
> 2 files changed, 29 insertions(+), 2 deletions(-)
If this hits linux-next it will go through my automated boot testing, which
hopefully would be sufficient to catch any bugs in this patch, cross fingers.
I don't know jack about all the layers of RTC mess, so my ack is basically
worthless here. But if you like you can have one anyway :)
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
cheers
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
2016-05-03 4:05 ` Michael Ellerman
(?)
(?)
@ 2016-05-03 10:29 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-05-03 10:29 UTC (permalink / raw)
To: Michael Ellerman
Cc: Alexandre Belloni, geert, deller, benh, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
On Tuesday 03 May 2016 14:05:09 Michael Ellerman wrote:
> On Thu, 2016-04-28 at 00:34 +0200, Arnd Bergmann wrote:
>
> > The rtc-generic driver provides an architecture specific
> > wrapper on top of the generic rtc_class_ops abstraction,
> > and powerpc has another abstraction on top, which is a bit
> > silly.
> >
> > This changes the powerpc rtc-generic device to provide its
> > rtc_class_ops directly, to reduce the number of layers
> > by one.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> > arch/powerpc/kernel/time.c | 29 ++++++++++++++++++++++++++++-
> > drivers/rtc/rtc-generic.c | 2 +-
> > 2 files changed, 29 insertions(+), 2 deletions(-)
>
> If this hits linux-next it will go through my automated boot testing, which
> hopefully would be sufficient to catch any bugs in this patch, cross fingers.
>
> I don't know jack about all the layers of RTC mess, so my ack is basically
> worthless here. But if you like you can have one anyway
>
> Acked-by: Michael Ellerman <mpe@ellerman.id.au>
Thanks!
The main thing that could use testing here is for patch 12/16 to see if
/sbin/hwclock can still read and write the time on a machine that
uses one of the genrtc backends on powerpc, this includes
rtas_get_rtc_time, mpc8xx_get_rtc_time, maple_get_rtc_time,
ps3_get_rtc_time and pmac_get_rtc_time. Testing on a pSeries with rtas
should be sufficient, and if I made a mistake, it probably fails
spectacularly.
Just for reference, if anyone ever wants to clean this up further on
powerpc to remove all of the rtc handling from architecture code,
it has gotten easier after my series:
- The update_persistent_clock() and read_persistent_clock() callbacks
are now unnecessary: as long as the RTC driver is built into the
kernel, drivers/rtc/hctosys.c takes care of setting the initial
time (otherwise user space has to do it), and the other users
(ntp and suspend/resume) will work fine whenever an rtc driver
is loaded. Obviously you will want to test the kernel better after
removing the two functions.
- Once they are gone, the only users of the ppc_md.{get,set}_rtc_time
callbacks are in the "const struct rtc_class_ops rtc_generic_ops".
You can move them into the five files implementing those callbacks
and call the functions directly to get rid of the function pointers.
- Lastly, after that is done, you basically have five independent
rtc device drivers that can get moved to drivers/rtc and converted
into regular platform drivers. Instead of registering the fake
"rtc-generic" device, you then register the one that is actually
there like arch/powerpc/sysdev/rtc_cmos_setup.c already does, or
use the one that gets created from DT.
Arnd
^ permalink raw reply [flat|nested] 144+ messages in thread* [rtc-linux] Re: [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
@ 2016-05-03 10:29 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-05-03 10:29 UTC (permalink / raw)
To: Michael Ellerman
Cc: Alexandre Belloni, geert, deller, benh, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
On Tuesday 03 May 2016 14:05:09 Michael Ellerman wrote:
> On Thu, 2016-04-28 at 00:34 +0200, Arnd Bergmann wrote:
>
> > The rtc-generic driver provides an architecture specific
> > wrapper on top of the generic rtc_class_ops abstraction,
> > and powerpc has another abstraction on top, which is a bit
> > silly.
> >
> > This changes the powerpc rtc-generic device to provide its
> > rtc_class_ops directly, to reduce the number of layers
> > by one.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> > arch/powerpc/kernel/time.c | 29 ++++++++++++++++++++++++++++-
> > drivers/rtc/rtc-generic.c | 2 +-
> > 2 files changed, 29 insertions(+), 2 deletions(-)
>
> If this hits linux-next it will go through my automated boot testing, which
> hopefully would be sufficient to catch any bugs in this patch, cross fingers.
>
> I don't know jack about all the layers of RTC mess, so my ack is basically
> worthless here. But if you like you can have one anyway
>
> Acked-by: Michael Ellerman <mpe@ellerman.id.au>
Thanks!
The main thing that could use testing here is for patch 12/16 to see if
/sbin/hwclock can still read and write the time on a machine that
uses one of the genrtc backends on powerpc, this includes
rtas_get_rtc_time, mpc8xx_get_rtc_time, maple_get_rtc_time,
ps3_get_rtc_time and pmac_get_rtc_time. Testing on a pSeries with rtas
should be sufficient, and if I made a mistake, it probably fails
spectacularly.
Just for reference, if anyone ever wants to clean this up further on
powerpc to remove all of the rtc handling from architecture code,
it has gotten easier after my series:
- The update_persistent_clock() and read_persistent_clock() callbacks
are now unnecessary: as long as the RTC driver is built into the
kernel, drivers/rtc/hctosys.c takes care of setting the initial
time (otherwise user space has to do it), and the other users
(ntp and suspend/resume) will work fine whenever an rtc driver
is loaded. Obviously you will want to test the kernel better after
removing the two functions.
- Once they are gone, the only users of the ppc_md.{get,set}_rtc_time
callbacks are in the "const struct rtc_class_ops rtc_generic_ops".
You can move them into the five files implementing those callbacks
and call the functions directly to get rid of the function pointers.
- Lastly, after that is done, you basically have five independent
rtc device drivers that can get moved to drivers/rtc and converted
into regular platform drivers. Instead of registering the fake
"rtc-generic" device, you then register the one that is actually
there like arch/powerpc/sysdev/rtc_cmos_setup.c already does, or
use the one that gets created from DT.
Arnd
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
@ 2016-05-03 10:29 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-05-03 10:29 UTC (permalink / raw)
To: Michael Ellerman
Cc: Alexandre Belloni, geert, deller, benh, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
On Tuesday 03 May 2016 14:05:09 Michael Ellerman wrote:
> On Thu, 2016-04-28 at 00:34 +0200, Arnd Bergmann wrote:
>
> > The rtc-generic driver provides an architecture specific
> > wrapper on top of the generic rtc_class_ops abstraction,
> > and powerpc has another abstraction on top, which is a bit
> > silly.
> >
> > This changes the powerpc rtc-generic device to provide its
> > rtc_class_ops directly, to reduce the number of layers
> > by one.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> > arch/powerpc/kernel/time.c | 29 ++++++++++++++++++++++++++++-
> > drivers/rtc/rtc-generic.c | 2 +-
> > 2 files changed, 29 insertions(+), 2 deletions(-)
>
> If this hits linux-next it will go through my automated boot testing, which
> hopefully would be sufficient to catch any bugs in this patch, cross fingers.
>
> I don't know jack about all the layers of RTC mess, so my ack is basically
> worthless here. But if you like you can have one anyway
>
> Acked-by: Michael Ellerman <mpe@ellerman.id.au>
Thanks!
The main thing that could use testing here is for patch 12/16 to see if
/sbin/hwclock can still read and write the time on a machine that
uses one of the genrtc backends on powerpc, this includes
rtas_get_rtc_time, mpc8xx_get_rtc_time, maple_get_rtc_time,
ps3_get_rtc_time and pmac_get_rtc_time. Testing on a pSeries with rtas
should be sufficient, and if I made a mistake, it probably fails
spectacularly.
Just for reference, if anyone ever wants to clean this up further on
powerpc to remove all of the rtc handling from architecture code,
it has gotten easier after my series:
- The update_persistent_clock() and read_persistent_clock() callbacks
are now unnecessary: as long as the RTC driver is built into the
kernel, drivers/rtc/hctosys.c takes care of setting the initial
time (otherwise user space has to do it), and the other users
(ntp and suspend/resume) will work fine whenever an rtc driver
is loaded. Obviously you will want to test the kernel better after
removing the two functions.
- Once they are gone, the only users of the ppc_md.{get,set}_rtc_time
callbacks are in the "const struct rtc_class_ops rtc_generic_ops".
You can move them into the five files implementing those callbacks
and call the functions directly to get rid of the function pointers.
- Lastly, after that is done, you basically have five independent
rtc device drivers that can get moved to drivers/rtc and converted
into regular platform drivers. Instead of registering the fake
"rtc-generic" device, you then register the one that is actually
there like arch/powerpc/sysdev/rtc_cmos_setup.c already does, or
use the one that gets created from DT.
Arnd
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
@ 2016-05-03 10:29 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-05-03 10:29 UTC (permalink / raw)
To: Michael Ellerman
Cc: Alexandre Belloni, geert, deller, benh, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
On Tuesday 03 May 2016 14:05:09 Michael Ellerman wrote:
> On Thu, 2016-04-28 at 00:34 +0200, Arnd Bergmann wrote:
>
> > The rtc-generic driver provides an architecture specific
> > wrapper on top of the generic rtc_class_ops abstraction,
> > and powerpc has another abstraction on top, which is a bit
> > silly.
> >
> > This changes the powerpc rtc-generic device to provide its
> > rtc_class_ops directly, to reduce the number of layers
> > by one.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> > arch/powerpc/kernel/time.c | 29 ++++++++++++++++++++++++++++-
> > drivers/rtc/rtc-generic.c | 2 +-
> > 2 files changed, 29 insertions(+), 2 deletions(-)
>
> If this hits linux-next it will go through my automated boot testing, which
> hopefully would be sufficient to catch any bugs in this patch, cross fingers.
>
> I don't know jack about all the layers of RTC mess, so my ack is basically
> worthless here. But if you like you can have one anyway
>
> Acked-by: Michael Ellerman <mpe@ellerman.id.au>
Thanks!
The main thing that could use testing here is for patch 12/16 to see if
/sbin/hwclock can still read and write the time on a machine that
uses one of the genrtc backends on powerpc, this includes
rtas_get_rtc_time, mpc8xx_get_rtc_time, maple_get_rtc_time,
ps3_get_rtc_time and pmac_get_rtc_time. Testing on a pSeries with rtas
should be sufficient, and if I made a mistake, it probably fails
spectacularly.
Just for reference, if anyone ever wants to clean this up further on
powerpc to remove all of the rtc handling from architecture code,
it has gotten easier after my series:
- The update_persistent_clock() and read_persistent_clock() callbacks
are now unnecessary: as long as the RTC driver is built into the
kernel, drivers/rtc/hctosys.c takes care of setting the initial
time (otherwise user space has to do it), and the other users
(ntp and suspend/resume) will work fine whenever an rtc driver
is loaded. Obviously you will want to test the kernel better after
removing the two functions.
- Once they are gone, the only users of the ppc_md.{get,set}_rtc_time
callbacks are in the "const struct rtc_class_ops rtc_generic_ops".
You can move them into the five files implementing those callbacks
and call the functions directly to get rid of the function pointers.
- Lastly, after that is done, you basically have five independent
rtc device drivers that can get moved to drivers/rtc and converted
into regular platform drivers. Instead of registering the fake
"rtc-generic" device, you then register the one that is actually
there like arch/powerpc/sysdev/rtc_cmos_setup.c already does, or
use the one that gets created from DT.
Arnd
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
2016-05-03 4:05 ` Michael Ellerman
` (4 preceding siblings ...)
(?)
@ 2016-05-03 10:29 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-05-03 10:29 UTC (permalink / raw)
To: Michael Ellerman
Cc: Alexandre Belloni, geert, deller, benh, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
On Tuesday 03 May 2016 14:05:09 Michael Ellerman wrote:
> On Thu, 2016-04-28 at 00:34 +0200, Arnd Bergmann wrote:
>
> > The rtc-generic driver provides an architecture specific
> > wrapper on top of the generic rtc_class_ops abstraction,
> > and powerpc has another abstraction on top, which is a bit
> > silly.
> >
> > This changes the powerpc rtc-generic device to provide its
> > rtc_class_ops directly, to reduce the number of layers
> > by one.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> > arch/powerpc/kernel/time.c | 29 ++++++++++++++++++++++++++++-
> > drivers/rtc/rtc-generic.c | 2 +-
> > 2 files changed, 29 insertions(+), 2 deletions(-)
>
> If this hits linux-next it will go through my automated boot testing, which
> hopefully would be sufficient to catch any bugs in this patch, cross fingers.
>
> I don't know jack about all the layers of RTC mess, so my ack is basically
> worthless here. But if you like you can have one anyway
>
> Acked-by: Michael Ellerman <mpe@ellerman.id.au>
Thanks!
The main thing that could use testing here is for patch 12/16 to see if
/sbin/hwclock can still read and write the time on a machine that
uses one of the genrtc backends on powerpc, this includes
rtas_get_rtc_time, mpc8xx_get_rtc_time, maple_get_rtc_time,
ps3_get_rtc_time and pmac_get_rtc_time. Testing on a pSeries with rtas
should be sufficient, and if I made a mistake, it probably fails
spectacularly.
Just for reference, if anyone ever wants to clean this up further on
powerpc to remove all of the rtc handling from architecture code,
it has gotten easier after my series:
- The update_persistent_clock() and read_persistent_clock() callbacks
are now unnecessary: as long as the RTC driver is built into the
kernel, drivers/rtc/hctosys.c takes care of setting the initial
time (otherwise user space has to do it), and the other users
(ntp and suspend/resume) will work fine whenever an rtc driver
is loaded. Obviously you will want to test the kernel better after
removing the two functions.
- Once they are gone, the only users of the ppc_md.{get,set}_rtc_time
callbacks are in the "const struct rtc_class_ops rtc_generic_ops".
You can move them into the five files implementing those callbacks
and call the functions directly to get rid of the function pointers.
- Lastly, after that is done, you basically have five independent
rtc device drivers that can get moved to drivers/rtc and converted
into regular platform drivers. Instead of registering the fake
"rtc-generic" device, you then register the one that is actually
there like arch/powerpc/sysdev/rtc_cmos_setup.c already does, or
use the one that gets created from DT.
Arnd
^ permalink raw reply [flat|nested] 144+ messages in thread
* [PATCH v3 13/16] char/genrtc: remove powerpc support
2016-04-27 22:34 ` Arnd Bergmann
(?)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
PowerPC is the last architecture using the GEN_RTC driver on some
machines, but we can migrate them all to using the RTC_DRV_GENERIC
driver instead now.
This moves over the CONFIG_GEN_RTC option from drivers/char into
arch/powerpc/platforms/Kconfig and makes it just select the
replacement driver instead, for the only reason of not breaking
existing defconfig and .config files that users may have.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/powerpc/include/asm/rtc.h | 78 ---------------------------------------
arch/powerpc/platforms/Kconfig | 11 ++++++
arch/powerpc/platforms/ps3/time.c | 2 +-
drivers/char/Kconfig | 4 +-
drivers/char/Makefile | 2 +-
5 files changed, 15 insertions(+), 82 deletions(-)
delete mode 100644 arch/powerpc/include/asm/rtc.h
diff --git a/arch/powerpc/include/asm/rtc.h b/arch/powerpc/include/asm/rtc.h
deleted file mode 100644
index f5802926b6c0..000000000000
--- a/arch/powerpc/include/asm/rtc.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Real-time clock definitions and interfaces
- *
- * Author: Tom Rini <trini@mvista.com>
- *
- * 2002 (c) MontaVista, Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * Based on:
- * include/asm-m68k/rtc.h
- *
- * Copyright Richard Zidlicky
- * implementation details for genrtc/q40rtc driver
- *
- * And the old drivers/macintosh/rtc.c which was heavily based on:
- * Linux/SPARC Real Time Clock Driver
- * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu)
- *
- * With additional work by Paul Mackerras and Franz Sirl.
- */
-
-#ifndef __ASM_POWERPC_RTC_H__
-#define __ASM_POWERPC_RTC_H__
-
-#ifdef __KERNEL__
-
-#include <linux/rtc.h>
-
-#include <asm/machdep.h>
-#include <asm/time.h>
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-/* some dummy definitions */
-#define RTC_BATT_BAD 0x100 /* battery bad */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-static inline unsigned int get_rtc_time(struct rtc_time *time)
-{
- if (ppc_md.get_rtc_time)
- ppc_md.get_rtc_time(time);
- return RTC_24H;
-}
-
-/* Set the current date and time in the real time clock. */
-static inline int set_rtc_time(struct rtc_time *time)
-{
- if (ppc_md.set_rtc_time)
- return ppc_md.set_rtc_time(time);
- return -EINVAL;
-}
-
-static inline unsigned int get_rtc_ss(void)
-{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_POWERPC_RTC_H__ */
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 46a3533d3acb..657243ffb525 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -321,6 +321,17 @@ config OF_RTC
Uses information from the OF or flattened device tree to instantiate
platform devices for direct mapped RTC chips like the DS1742 or DS1743.
+config GEN_RTC
+ bool "Use the platform RTC operations from user space"
+ select RTC_CLASS
+ select RTC_DRV_GENERIC
+ help
+ This option provides backwards compatibility with the old gen_rtc.ko
+ module that was traditionally used for old PowerPC machines.
+ Platforms should migrate to enabling the RTC_DRV_GENERIC by hand
+ replacing changing their get_rtc_time/set_rtc_time callbacks with
+ a proper RTC device driver.
+
config SIMPLE_GPIO
bool "Support for simple, memory-mapped GPIO controllers"
depends on PPC
diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c
index 791c6142c4a7..11b45b58c81b 100644
--- a/arch/powerpc/platforms/ps3/time.c
+++ b/arch/powerpc/platforms/ps3/time.c
@@ -20,9 +20,9 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
+#include <linux/rtc.h>
#include <asm/firmware.h>
-#include <asm/rtc.h>
#include <asm/lv1call.h>
#include <asm/ps3.h>
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 26089feae9b0..a81f0eb9f71e 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -325,10 +325,10 @@ config JS_RTC
To compile this driver as a module, choose M here: the
module will be called js-rtc.
-config GEN_RTC
+config OLD_GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on PPC
+ depends on BROKEN
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index d8a7579300d2..fc0905aa7373 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_APPLICOM) += applicom.o
obj-$(CONFIG_SONYPI) += sonypi.o
obj-$(CONFIG_RTC) += rtc.o
obj-$(CONFIG_HPET) += hpet.o
-obj-$(CONFIG_GEN_RTC) += genrtc.o
+obj-$(CONFIG_OLD_GEN_RTC) += genrtc.o
obj-$(CONFIG_EFI_RTC) += efirtc.o
obj-$(CONFIG_DS1302) += ds1302.o
obj-$(CONFIG_XILINX_HWICAP) += xilinx_hwicap/
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [rtc-linux] [PATCH v3 13/16] char/genrtc: remove powerpc support
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
PowerPC is the last architecture using the GEN_RTC driver on some
machines, but we can migrate them all to using the RTC_DRV_GENERIC
driver instead now.
This moves over the CONFIG_GEN_RTC option from drivers/char into
arch/powerpc/platforms/Kconfig and makes it just select the
replacement driver instead, for the only reason of not breaking
existing defconfig and .config files that users may have.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/powerpc/include/asm/rtc.h | 78 ---------------------------------------
arch/powerpc/platforms/Kconfig | 11 ++++++
arch/powerpc/platforms/ps3/time.c | 2 +-
drivers/char/Kconfig | 4 +-
drivers/char/Makefile | 2 +-
5 files changed, 15 insertions(+), 82 deletions(-)
delete mode 100644 arch/powerpc/include/asm/rtc.h
diff --git a/arch/powerpc/include/asm/rtc.h b/arch/powerpc/include/asm/rtc.h
deleted file mode 100644
index f5802926b6c0..000000000000
--- a/arch/powerpc/include/asm/rtc.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Real-time clock definitions and interfaces
- *
- * Author: Tom Rini <trini@mvista.com>
- *
- * 2002 (c) MontaVista, Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * Based on:
- * include/asm-m68k/rtc.h
- *
- * Copyright Richard Zidlicky
- * implementation details for genrtc/q40rtc driver
- *
- * And the old drivers/macintosh/rtc.c which was heavily based on:
- * Linux/SPARC Real Time Clock Driver
- * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu)
- *
- * With additional work by Paul Mackerras and Franz Sirl.
- */
-
-#ifndef __ASM_POWERPC_RTC_H__
-#define __ASM_POWERPC_RTC_H__
-
-#ifdef __KERNEL__
-
-#include <linux/rtc.h>
-
-#include <asm/machdep.h>
-#include <asm/time.h>
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-/* some dummy definitions */
-#define RTC_BATT_BAD 0x100 /* battery bad */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-static inline unsigned int get_rtc_time(struct rtc_time *time)
-{
- if (ppc_md.get_rtc_time)
- ppc_md.get_rtc_time(time);
- return RTC_24H;
-}
-
-/* Set the current date and time in the real time clock. */
-static inline int set_rtc_time(struct rtc_time *time)
-{
- if (ppc_md.set_rtc_time)
- return ppc_md.set_rtc_time(time);
- return -EINVAL;
-}
-
-static inline unsigned int get_rtc_ss(void)
-{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_POWERPC_RTC_H__ */
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 46a3533d3acb..657243ffb525 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -321,6 +321,17 @@ config OF_RTC
Uses information from the OF or flattened device tree to instantiate
platform devices for direct mapped RTC chips like the DS1742 or DS1743.
+config GEN_RTC
+ bool "Use the platform RTC operations from user space"
+ select RTC_CLASS
+ select RTC_DRV_GENERIC
+ help
+ This option provides backwards compatibility with the old gen_rtc.ko
+ module that was traditionally used for old PowerPC machines.
+ Platforms should migrate to enabling the RTC_DRV_GENERIC by hand
+ replacing changing their get_rtc_time/set_rtc_time callbacks with
+ a proper RTC device driver.
+
config SIMPLE_GPIO
bool "Support for simple, memory-mapped GPIO controllers"
depends on PPC
diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c
index 791c6142c4a7..11b45b58c81b 100644
--- a/arch/powerpc/platforms/ps3/time.c
+++ b/arch/powerpc/platforms/ps3/time.c
@@ -20,9 +20,9 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
+#include <linux/rtc.h>
#include <asm/firmware.h>
-#include <asm/rtc.h>
#include <asm/lv1call.h>
#include <asm/ps3.h>
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 26089feae9b0..a81f0eb9f71e 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -325,10 +325,10 @@ config JS_RTC
To compile this driver as a module, choose M here: the
module will be called js-rtc.
-config GEN_RTC
+config OLD_GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on PPC
+ depends on BROKEN
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index d8a7579300d2..fc0905aa7373 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_APPLICOM) += applicom.o
obj-$(CONFIG_SONYPI) += sonypi.o
obj-$(CONFIG_RTC) += rtc.o
obj-$(CONFIG_HPET) += hpet.o
-obj-$(CONFIG_GEN_RTC) += genrtc.o
+obj-$(CONFIG_OLD_GEN_RTC) += genrtc.o
obj-$(CONFIG_EFI_RTC) += efirtc.o
obj-$(CONFIG_DS1302) += ds1302.o
obj-$(CONFIG_XILINX_HWICAP) += xilinx_hwicap/
--
2.7.0
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 13/16] char/genrtc: remove powerpc support
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
PowerPC is the last architecture using the GEN_RTC driver on some
machines, but we can migrate them all to using the RTC_DRV_GENERIC
driver instead now.
This moves over the CONFIG_GEN_RTC option from drivers/char into
arch/powerpc/platforms/Kconfig and makes it just select the
replacement driver instead, for the only reason of not breaking
existing defconfig and .config files that users may have.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/powerpc/include/asm/rtc.h | 78 ---------------------------------------
arch/powerpc/platforms/Kconfig | 11 ++++++
arch/powerpc/platforms/ps3/time.c | 2 +-
drivers/char/Kconfig | 4 +-
drivers/char/Makefile | 2 +-
5 files changed, 15 insertions(+), 82 deletions(-)
delete mode 100644 arch/powerpc/include/asm/rtc.h
diff --git a/arch/powerpc/include/asm/rtc.h b/arch/powerpc/include/asm/rtc.h
deleted file mode 100644
index f5802926b6c0..000000000000
--- a/arch/powerpc/include/asm/rtc.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Real-time clock definitions and interfaces
- *
- * Author: Tom Rini <trini@mvista.com>
- *
- * 2002 (c) MontaVista, Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * Based on:
- * include/asm-m68k/rtc.h
- *
- * Copyright Richard Zidlicky
- * implementation details for genrtc/q40rtc driver
- *
- * And the old drivers/macintosh/rtc.c which was heavily based on:
- * Linux/SPARC Real Time Clock Driver
- * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu)
- *
- * With additional work by Paul Mackerras and Franz Sirl.
- */
-
-#ifndef __ASM_POWERPC_RTC_H__
-#define __ASM_POWERPC_RTC_H__
-
-#ifdef __KERNEL__
-
-#include <linux/rtc.h>
-
-#include <asm/machdep.h>
-#include <asm/time.h>
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-/* some dummy definitions */
-#define RTC_BATT_BAD 0x100 /* battery bad */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-static inline unsigned int get_rtc_time(struct rtc_time *time)
-{
- if (ppc_md.get_rtc_time)
- ppc_md.get_rtc_time(time);
- return RTC_24H;
-}
-
-/* Set the current date and time in the real time clock. */
-static inline int set_rtc_time(struct rtc_time *time)
-{
- if (ppc_md.set_rtc_time)
- return ppc_md.set_rtc_time(time);
- return -EINVAL;
-}
-
-static inline unsigned int get_rtc_ss(void)
-{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_POWERPC_RTC_H__ */
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 46a3533d3acb..657243ffb525 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -321,6 +321,17 @@ config OF_RTC
Uses information from the OF or flattened device tree to instantiate
platform devices for direct mapped RTC chips like the DS1742 or DS1743.
+config GEN_RTC
+ bool "Use the platform RTC operations from user space"
+ select RTC_CLASS
+ select RTC_DRV_GENERIC
+ help
+ This option provides backwards compatibility with the old gen_rtc.ko
+ module that was traditionally used for old PowerPC machines.
+ Platforms should migrate to enabling the RTC_DRV_GENERIC by hand
+ replacing changing their get_rtc_time/set_rtc_time callbacks with
+ a proper RTC device driver.
+
config SIMPLE_GPIO
bool "Support for simple, memory-mapped GPIO controllers"
depends on PPC
diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c
index 791c6142c4a7..11b45b58c81b 100644
--- a/arch/powerpc/platforms/ps3/time.c
+++ b/arch/powerpc/platforms/ps3/time.c
@@ -20,9 +20,9 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
+#include <linux/rtc.h>
#include <asm/firmware.h>
-#include <asm/rtc.h>
#include <asm/lv1call.h>
#include <asm/ps3.h>
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 26089feae9b0..a81f0eb9f71e 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -325,10 +325,10 @@ config JS_RTC
To compile this driver as a module, choose M here: the
module will be called js-rtc.
-config GEN_RTC
+config OLD_GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on PPC
+ depends on BROKEN
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index d8a7579300d2..fc0905aa7373 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_APPLICOM) += applicom.o
obj-$(CONFIG_SONYPI) += sonypi.o
obj-$(CONFIG_RTC) += rtc.o
obj-$(CONFIG_HPET) += hpet.o
-obj-$(CONFIG_GEN_RTC) += genrtc.o
+obj-$(CONFIG_OLD_GEN_RTC) += genrtc.o
obj-$(CONFIG_EFI_RTC) += efirtc.o
obj-$(CONFIG_DS1302) += ds1302.o
obj-$(CONFIG_XILINX_HWICAP) += xilinx_hwicap/
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 13/16] char/genrtc: remove powerpc support
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
PowerPC is the last architecture using the GEN_RTC driver on some
machines, but we can migrate them all to using the RTC_DRV_GENERIC
driver instead now.
This moves over the CONFIG_GEN_RTC option from drivers/char into
arch/powerpc/platforms/Kconfig and makes it just select the
replacement driver instead, for the only reason of not breaking
existing defconfig and .config files that users may have.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/powerpc/include/asm/rtc.h | 78 ---------------------------------------
arch/powerpc/platforms/Kconfig | 11 ++++++
arch/powerpc/platforms/ps3/time.c | 2 +-
drivers/char/Kconfig | 4 +-
drivers/char/Makefile | 2 +-
5 files changed, 15 insertions(+), 82 deletions(-)
delete mode 100644 arch/powerpc/include/asm/rtc.h
diff --git a/arch/powerpc/include/asm/rtc.h b/arch/powerpc/include/asm/rtc.h
deleted file mode 100644
index f5802926b6c0..000000000000
--- a/arch/powerpc/include/asm/rtc.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Real-time clock definitions and interfaces
- *
- * Author: Tom Rini <trini@mvista.com>
- *
- * 2002 (c) MontaVista, Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- *
- * Based on:
- * include/asm-m68k/rtc.h
- *
- * Copyright Richard Zidlicky
- * implementation details for genrtc/q40rtc driver
- *
- * And the old drivers/macintosh/rtc.c which was heavily based on:
- * Linux/SPARC Real Time Clock Driver
- * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu)
- *
- * With additional work by Paul Mackerras and Franz Sirl.
- */
-
-#ifndef __ASM_POWERPC_RTC_H__
-#define __ASM_POWERPC_RTC_H__
-
-#ifdef __KERNEL__
-
-#include <linux/rtc.h>
-
-#include <asm/machdep.h>
-#include <asm/time.h>
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-/* some dummy definitions */
-#define RTC_BATT_BAD 0x100 /* battery bad */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-static inline unsigned int get_rtc_time(struct rtc_time *time)
-{
- if (ppc_md.get_rtc_time)
- ppc_md.get_rtc_time(time);
- return RTC_24H;
-}
-
-/* Set the current date and time in the real time clock. */
-static inline int set_rtc_time(struct rtc_time *time)
-{
- if (ppc_md.set_rtc_time)
- return ppc_md.set_rtc_time(time);
- return -EINVAL;
-}
-
-static inline unsigned int get_rtc_ss(void)
-{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-
-#endif /* __KERNEL__ */
-#endif /* __ASM_POWERPC_RTC_H__ */
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 46a3533d3acb..657243ffb525 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -321,6 +321,17 @@ config OF_RTC
Uses information from the OF or flattened device tree to instantiate
platform devices for direct mapped RTC chips like the DS1742 or DS1743.
+config GEN_RTC
+ bool "Use the platform RTC operations from user space"
+ select RTC_CLASS
+ select RTC_DRV_GENERIC
+ help
+ This option provides backwards compatibility with the old gen_rtc.ko
+ module that was traditionally used for old PowerPC machines.
+ Platforms should migrate to enabling the RTC_DRV_GENERIC by hand
+ replacing changing their get_rtc_time/set_rtc_time callbacks with
+ a proper RTC device driver.
+
config SIMPLE_GPIO
bool "Support for simple, memory-mapped GPIO controllers"
depends on PPC
diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c
index 791c6142c4a7..11b45b58c81b 100644
--- a/arch/powerpc/platforms/ps3/time.c
+++ b/arch/powerpc/platforms/ps3/time.c
@@ -20,9 +20,9 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
+#include <linux/rtc.h>
#include <asm/firmware.h>
-#include <asm/rtc.h>
#include <asm/lv1call.h>
#include <asm/ps3.h>
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 26089feae9b0..a81f0eb9f71e 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -325,10 +325,10 @@ config JS_RTC
To compile this driver as a module, choose M here: the
module will be called js-rtc.
-config GEN_RTC
+config OLD_GEN_RTC
tristate "Generic /dev/rtc emulation"
depends on RTC!=y
- depends on PPC
+ depends on BROKEN
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index d8a7579300d2..fc0905aa7373 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_APPLICOM) += applicom.o
obj-$(CONFIG_SONYPI) += sonypi.o
obj-$(CONFIG_RTC) += rtc.o
obj-$(CONFIG_HPET) += hpet.o
-obj-$(CONFIG_GEN_RTC) += genrtc.o
+obj-$(CONFIG_OLD_GEN_RTC) += genrtc.o
obj-$(CONFIG_EFI_RTC) += efirtc.o
obj-$(CONFIG_DS1302) += ds1302.o
obj-$(CONFIG_XILINX_HWICAP) += xilinx_hwicap/
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* Re: [PATCH v3 13/16] char/genrtc: remove powerpc support
2016-04-27 22:34 ` Arnd Bergmann
(?)
(?)
@ 2016-04-28 7:25 ` Geert Uytterhoeven
-1 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-04-28 7:25 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> --- a/arch/powerpc/platforms/Kconfig
> +++ b/arch/powerpc/platforms/Kconfig
> @@ -321,6 +321,17 @@ config OF_RTC
> Uses information from the OF or flattened device tree to instantiate
> platform devices for direct mapped RTC chips like the DS1742 or DS1743.
>
> +config GEN_RTC
> + bool "Use the platform RTC operations from user space"
> + select RTC_CLASS
> + select RTC_DRV_GENERIC
> + help
> + This option provides backwards compatibility with the old gen_rtc.ko
> + module that was traditionally used for old PowerPC machines.
> + Platforms should migrate to enabling the RTC_DRV_GENERIC by hand
> + replacing changing their get_rtc_time/set_rtc_time callbacks with
Drop "changing".
> + a proper RTC device driver.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 144+ messages in thread* [rtc-linux] Re: [PATCH v3 13/16] char/genrtc: remove powerpc support
@ 2016-04-28 7:25 ` Geert Uytterhoeven
0 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-04-28 7:25 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> --- a/arch/powerpc/platforms/Kconfig
> +++ b/arch/powerpc/platforms/Kconfig
> @@ -321,6 +321,17 @@ config OF_RTC
> Uses information from the OF or flattened device tree to instantiate
> platform devices for direct mapped RTC chips like the DS1742 or DS1743.
>
> +config GEN_RTC
> + bool "Use the platform RTC operations from user space"
> + select RTC_CLASS
> + select RTC_DRV_GENERIC
> + help
> + This option provides backwards compatibility with the old gen_rtc.ko
> + module that was traditionally used for old PowerPC machines.
> + Platforms should migrate to enabling the RTC_DRV_GENERIC by hand
> + replacing changing their get_rtc_time/set_rtc_time callbacks with
Drop "changing".
> + a proper RTC device driver.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 13/16] char/genrtc: remove powerpc support
@ 2016-04-28 7:25 ` Geert Uytterhoeven
0 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-04-28 7:25 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> --- a/arch/powerpc/platforms/Kconfig
> +++ b/arch/powerpc/platforms/Kconfig
> @@ -321,6 +321,17 @@ config OF_RTC
> Uses information from the OF or flattened device tree to instantiate
> platform devices for direct mapped RTC chips like the DS1742 or DS1743.
>
> +config GEN_RTC
> + bool "Use the platform RTC operations from user space"
> + select RTC_CLASS
> + select RTC_DRV_GENERIC
> + help
> + This option provides backwards compatibility with the old gen_rtc.ko
> + module that was traditionally used for old PowerPC machines.
> + Platforms should migrate to enabling the RTC_DRV_GENERIC by hand
> + replacing changing their get_rtc_time/set_rtc_time callbacks with
Drop "changing".
> + a proper RTC device driver.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 13/16] char/genrtc: remove powerpc support
@ 2016-04-28 7:25 ` Geert Uytterhoeven
0 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-04-28 7:25 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> --- a/arch/powerpc/platforms/Kconfig
> +++ b/arch/powerpc/platforms/Kconfig
> @@ -321,6 +321,17 @@ config OF_RTC
> Uses information from the OF or flattened device tree to instantiate
> platform devices for direct mapped RTC chips like the DS1742 or DS1743.
>
> +config GEN_RTC
> + bool "Use the platform RTC operations from user space"
> + select RTC_CLASS
> + select RTC_DRV_GENERIC
> + help
> + This option provides backwards compatibility with the old gen_rtc.ko
> + module that was traditionally used for old PowerPC machines.
> + Platforms should migrate to enabling the RTC_DRV_GENERIC by hand
> + replacing changing their get_rtc_time/set_rtc_time callbacks with
Drop "changing".
> + a proper RTC device driver.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 13/16] char/genrtc: remove powerpc support
2016-04-28 7:25 ` Geert Uytterhoeven
(?)
(?)
@ 2016-04-28 9:39 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-28 9:39 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
On Thursday 28 April 2016 09:25:25 Geert Uytterhoeven wrote:
> On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> > --- a/arch/powerpc/platforms/Kconfig
> > +++ b/arch/powerpc/platforms/Kconfig
> > @@ -321,6 +321,17 @@ config OF_RTC
> > Uses information from the OF or flattened device tree to instantiate
> > platform devices for direct mapped RTC chips like the DS1742 or DS1743.
> >
> > +config GEN_RTC
> > + bool "Use the platform RTC operations from user space"
> > + select RTC_CLASS
> > + select RTC_DRV_GENERIC
> > + help
> > + This option provides backwards compatibility with the old gen_rtc.ko
> > + module that was traditionally used for old PowerPC machines.
> > + Platforms should migrate to enabling the RTC_DRV_GENERIC by hand
> > + replacing changing their get_rtc_time/set_rtc_time callbacks with
>
> Drop "changing".
>
>
done, thanks!
Arnd
^ permalink raw reply [flat|nested] 144+ messages in thread
* [rtc-linux] Re: [PATCH v3 13/16] char/genrtc: remove powerpc support
@ 2016-04-28 9:39 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-28 9:39 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
On Thursday 28 April 2016 09:25:25 Geert Uytterhoeven wrote:
> On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> > --- a/arch/powerpc/platforms/Kconfig
> > +++ b/arch/powerpc/platforms/Kconfig
> > @@ -321,6 +321,17 @@ config OF_RTC
> > Uses information from the OF or flattened device tree to instantiate
> > platform devices for direct mapped RTC chips like the DS1742 or DS1743.
> >
> > +config GEN_RTC
> > + bool "Use the platform RTC operations from user space"
> > + select RTC_CLASS
> > + select RTC_DRV_GENERIC
> > + help
> > + This option provides backwards compatibility with the old gen_rtc.ko
> > + module that was traditionally used for old PowerPC machines.
> > + Platforms should migrate to enabling the RTC_DRV_GENERIC by hand
> > + replacing changing their get_rtc_time/set_rtc_time callbacks with
>
> Drop "changing".
>
>
done, thanks!
Arnd
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 13/16] char/genrtc: remove powerpc support
@ 2016-04-28 9:39 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-28 9:39 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
On Thursday 28 April 2016 09:25:25 Geert Uytterhoeven wrote:
> On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> > --- a/arch/powerpc/platforms/Kconfig
> > +++ b/arch/powerpc/platforms/Kconfig
> > @@ -321,6 +321,17 @@ config OF_RTC
> > Uses information from the OF or flattened device tree to instantiate
> > platform devices for direct mapped RTC chips like the DS1742 or DS1743.
> >
> > +config GEN_RTC
> > + bool "Use the platform RTC operations from user space"
> > + select RTC_CLASS
> > + select RTC_DRV_GENERIC
> > + help
> > + This option provides backwards compatibility with the old gen_rtc.ko
> > + module that was traditionally used for old PowerPC machines.
> > + Platforms should migrate to enabling the RTC_DRV_GENERIC by hand
> > + replacing changing their get_rtc_time/set_rtc_time callbacks with
>
> Drop "changing".
>
>
done, thanks!
Arnd
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 13/16] char/genrtc: remove powerpc support
@ 2016-04-28 9:39 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-28 9:39 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
On Thursday 28 April 2016 09:25:25 Geert Uytterhoeven wrote:
> On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> > --- a/arch/powerpc/platforms/Kconfig
> > +++ b/arch/powerpc/platforms/Kconfig
> > @@ -321,6 +321,17 @@ config OF_RTC
> > Uses information from the OF or flattened device tree to instantiate
> > platform devices for direct mapped RTC chips like the DS1742 or DS1743.
> >
> > +config GEN_RTC
> > + bool "Use the platform RTC operations from user space"
> > + select RTC_CLASS
> > + select RTC_DRV_GENERIC
> > + help
> > + This option provides backwards compatibility with the old gen_rtc.ko
> > + module that was traditionally used for old PowerPC machines.
> > + Platforms should migrate to enabling the RTC_DRV_GENERIC by hand
> > + replacing changing their get_rtc_time/set_rtc_time callbacks with
>
> Drop "changing".
>
>
done, thanks!
Arnd
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 13/16] char/genrtc: remove powerpc support
2016-04-28 7:25 ` Geert Uytterhoeven
` (3 preceding siblings ...)
(?)
@ 2016-04-28 9:39 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-28 9:39 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
On Thursday 28 April 2016 09:25:25 Geert Uytterhoeven wrote:
> On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> > --- a/arch/powerpc/platforms/Kconfig
> > +++ b/arch/powerpc/platforms/Kconfig
> > @@ -321,6 +321,17 @@ config OF_RTC
> > Uses information from the OF or flattened device tree to instantiate
> > platform devices for direct mapped RTC chips like the DS1742 or DS1743.
> >
> > +config GEN_RTC
> > + bool "Use the platform RTC operations from user space"
> > + select RTC_CLASS
> > + select RTC_DRV_GENERIC
> > + help
> > + This option provides backwards compatibility with the old gen_rtc.ko
> > + module that was traditionally used for old PowerPC machines.
> > + Platforms should migrate to enabling the RTC_DRV_GENERIC by hand
> > + replacing changing their get_rtc_time/set_rtc_time callbacks with
>
> Drop "changing".
>
>
done, thanks!
Arnd
^ permalink raw reply [flat|nested] 144+ messages in thread
* [PATCH v3 14/16] rtc: generic: remove get_rtc_time/set_rtc_time wrappers
2016-04-27 22:34 ` Arnd Bergmann
` (26 preceding siblings ...)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
All architectures using this driver are now converted to
provide their own operations, so this one can be turned
into a trivial stub driver relying on its platform data.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/rtc/rtc-generic.c | 35 +----------------------------------
1 file changed, 1 insertion(+), 34 deletions(-)
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index efcb9833cac8..1bf5d2347928 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,43 +9,10 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if 0
-#include <asm/rtc.h>
-
-static int generic_get_time(struct device *dev, struct rtc_time *tm)
-{
- unsigned int ret = get_rtc_time(tm);
-
- if (ret & RTC_BATT_BAD)
- return -EOPNOTSUPP;
-
- return rtc_valid_tm(tm);
-}
-
-static int generic_set_time(struct device *dev, struct rtc_time *tm)
-{
- if (set_rtc_time(tm) < 0)
- return -EOPNOTSUPP;
-
- return 0;
-}
-
-static const struct rtc_class_ops generic_rtc_ops = {
- .read_time = generic_get_time,
- .set_time = generic_set_time,
-};
-#else
-#define generic_rtc_ops *(struct rtc_class_ops*)NULL
-#endif
-
static int __init generic_rtc_probe(struct platform_device *dev)
{
struct rtc_device *rtc;
- const struct rtc_class_ops *ops;
-
- ops = dev_get_platdata(&dev->dev);
- if (!ops)
- ops = &generic_rtc_ops;
+ const struct rtc_class_ops *ops = dev_get_platdata(&dev->dev);
rtc = devm_rtc_device_register(&dev->dev, "rtc-generic",
ops, THIS_MODULE);
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 14/16] rtc: generic: remove get_rtc_time/set_rtc_time wrappers
2016-04-27 22:34 ` Arnd Bergmann
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
All architectures using this driver are now converted to
provide their own operations, so this one can be turned
into a trivial stub driver relying on its platform data.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/rtc/rtc-generic.c | 35 +----------------------------------
1 file changed, 1 insertion(+), 34 deletions(-)
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index efcb9833cac8..1bf5d2347928 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,43 +9,10 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if 0
-#include <asm/rtc.h>
-
-static int generic_get_time(struct device *dev, struct rtc_time *tm)
-{
- unsigned int ret = get_rtc_time(tm);
-
- if (ret & RTC_BATT_BAD)
- return -EOPNOTSUPP;
-
- return rtc_valid_tm(tm);
-}
-
-static int generic_set_time(struct device *dev, struct rtc_time *tm)
-{
- if (set_rtc_time(tm) < 0)
- return -EOPNOTSUPP;
-
- return 0;
-}
-
-static const struct rtc_class_ops generic_rtc_ops = {
- .read_time = generic_get_time,
- .set_time = generic_set_time,
-};
-#else
-#define generic_rtc_ops *(struct rtc_class_ops*)NULL
-#endif
-
static int __init generic_rtc_probe(struct platform_device *dev)
{
struct rtc_device *rtc;
- const struct rtc_class_ops *ops;
-
- ops = dev_get_platdata(&dev->dev);
- if (!ops)
- ops = &generic_rtc_ops;
+ const struct rtc_class_ops *ops = dev_get_platdata(&dev->dev);
rtc = devm_rtc_device_register(&dev->dev, "rtc-generic",
ops, THIS_MODULE);
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [rtc-linux] [PATCH v3 14/16] rtc: generic: remove get_rtc_time/set_rtc_time wrappers
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
All architectures using this driver are now converted to
provide their own operations, so this one can be turned
into a trivial stub driver relying on its platform data.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/rtc/rtc-generic.c | 35 +----------------------------------
1 file changed, 1 insertion(+), 34 deletions(-)
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index efcb9833cac8..1bf5d2347928 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,43 +9,10 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if 0
-#include <asm/rtc.h>
-
-static int generic_get_time(struct device *dev, struct rtc_time *tm)
-{
- unsigned int ret = get_rtc_time(tm);
-
- if (ret & RTC_BATT_BAD)
- return -EOPNOTSUPP;
-
- return rtc_valid_tm(tm);
-}
-
-static int generic_set_time(struct device *dev, struct rtc_time *tm)
-{
- if (set_rtc_time(tm) < 0)
- return -EOPNOTSUPP;
-
- return 0;
-}
-
-static const struct rtc_class_ops generic_rtc_ops = {
- .read_time = generic_get_time,
- .set_time = generic_set_time,
-};
-#else
-#define generic_rtc_ops *(struct rtc_class_ops*)NULL
-#endif
-
static int __init generic_rtc_probe(struct platform_device *dev)
{
struct rtc_device *rtc;
- const struct rtc_class_ops *ops;
-
- ops = dev_get_platdata(&dev->dev);
- if (!ops)
- ops = &generic_rtc_ops;
+ const struct rtc_class_ops *ops = dev_get_platdata(&dev->dev);
rtc = devm_rtc_device_register(&dev->dev, "rtc-generic",
ops, THIS_MODULE);
--
2.7.0
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 14/16] rtc: generic: remove get_rtc_time/set_rtc_time wrappers
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
All architectures using this driver are now converted to
provide their own operations, so this one can be turned
into a trivial stub driver relying on its platform data.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/rtc/rtc-generic.c | 35 +----------------------------------
1 file changed, 1 insertion(+), 34 deletions(-)
diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index efcb9833cac8..1bf5d2347928 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -9,43 +9,10 @@
#include <linux/platform_device.h>
#include <linux/rtc.h>
-#if 0
-#include <asm/rtc.h>
-
-static int generic_get_time(struct device *dev, struct rtc_time *tm)
-{
- unsigned int ret = get_rtc_time(tm);
-
- if (ret & RTC_BATT_BAD)
- return -EOPNOTSUPP;
-
- return rtc_valid_tm(tm);
-}
-
-static int generic_set_time(struct device *dev, struct rtc_time *tm)
-{
- if (set_rtc_time(tm) < 0)
- return -EOPNOTSUPP;
-
- return 0;
-}
-
-static const struct rtc_class_ops generic_rtc_ops = {
- .read_time = generic_get_time,
- .set_time = generic_set_time,
-};
-#else
-#define generic_rtc_ops *(struct rtc_class_ops*)NULL
-#endif
-
static int __init generic_rtc_probe(struct platform_device *dev)
{
struct rtc_device *rtc;
- const struct rtc_class_ops *ops;
-
- ops = dev_get_platdata(&dev->dev);
- if (!ops)
- ops = &generic_rtc_ops;
+ const struct rtc_class_ops *ops = dev_get_platdata(&dev->dev);
rtc = devm_rtc_device_register(&dev->dev, "rtc-generic",
ops, THIS_MODULE);
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread
* [PATCH v3 15/16] char/genrtc: remove asm-generic/rtc.h from mips
2016-04-27 22:34 ` Arnd Bergmann
` (28 preceding siblings ...)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
arch/mips/sni/time.c includes asm-generic/rtc.h for no apparent reason,
and it works fine without that header, so lets remove the inclusion
in preparation of deleting the file.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/mips/sni/time.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/mips/sni/time.c b/arch/mips/sni/time.c
index fb4b3520cdc6..7ee14f41fc25 100644
--- a/arch/mips/sni/time.c
+++ b/arch/mips/sni/time.c
@@ -8,7 +8,6 @@
#include <asm/sni.h>
#include <asm/time.h>
-#include <asm-generic/rtc.h>
#define SNI_CLOCK_TICK_RATE 3686400
#define SNI_COUNTER2_DIV 64
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 15/16] char/genrtc: remove asm-generic/rtc.h from mips
2016-04-27 22:34 ` Arnd Bergmann
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
arch/mips/sni/time.c includes asm-generic/rtc.h for no apparent reason,
and it works fine without that header, so lets remove the inclusion
in preparation of deleting the file.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/mips/sni/time.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/mips/sni/time.c b/arch/mips/sni/time.c
index fb4b3520cdc6..7ee14f41fc25 100644
--- a/arch/mips/sni/time.c
+++ b/arch/mips/sni/time.c
@@ -8,7 +8,6 @@
#include <asm/sni.h>
#include <asm/time.h>
-#include <asm-generic/rtc.h>
#define SNI_CLOCK_TICK_RATE 3686400
#define SNI_COUNTER2_DIV 64
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread
* [rtc-linux] [PATCH v3 15/16] char/genrtc: remove asm-generic/rtc.h from mips
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
arch/mips/sni/time.c includes asm-generic/rtc.h for no apparent reason,
and it works fine without that header, so lets remove the inclusion
in preparation of deleting the file.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/mips/sni/time.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/mips/sni/time.c b/arch/mips/sni/time.c
index fb4b3520cdc6..7ee14f41fc25 100644
--- a/arch/mips/sni/time.c
+++ b/arch/mips/sni/time.c
@@ -8,7 +8,6 @@
#include <asm/sni.h>
#include <asm/time.h>
-#include <asm-generic/rtc.h>
#define SNI_CLOCK_TICK_RATE 3686400
#define SNI_COUNTER2_DIV 64
--
2.7.0
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply related [flat|nested] 144+ messages in thread
* [PATCH v3 15/16] char/genrtc: remove asm-generic/rtc.h from mips
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
arch/mips/sni/time.c includes asm-generic/rtc.h for no apparent reason,
and it works fine without that header, so lets remove the inclusion
in preparation of deleting the file.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/mips/sni/time.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/mips/sni/time.c b/arch/mips/sni/time.c
index fb4b3520cdc6..7ee14f41fc25 100644
--- a/arch/mips/sni/time.c
+++ b/arch/mips/sni/time.c
@@ -8,7 +8,6 @@
#include <asm/sni.h>
#include <asm/time.h>
-#include <asm-generic/rtc.h>
#define SNI_CLOCK_TICK_RATE 3686400
#define SNI_COUNTER2_DIV 64
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread
* [PATCH v3 16/16] char/genrtc: remove the rest of the driver
2016-04-27 22:34 ` Arnd Bergmann
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
No architecture uses the genrtc driver any more, so let's kill it off
for good. This now also includes asm-generic/rtc.h, which is otherwise
completely unused.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/char/Kconfig | 26 ---
drivers/char/Makefile | 1 -
drivers/char/genrtc.c | 539 ----------------------------------------------
include/asm-generic/rtc.h | 51 -----
4 files changed, 617 deletions(-)
delete mode 100644 drivers/char/genrtc.c
delete mode 100644 include/asm-generic/rtc.h
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index a81f0eb9f71e..0d40fbd21c26 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -325,32 +325,6 @@ config JS_RTC
To compile this driver as a module, choose M here: the
module will be called js-rtc.
-config OLD_GEN_RTC
- tristate "Generic /dev/rtc emulation"
- depends on RTC!=y
- depends on BROKEN
- ---help---
- If you say Y here and create a character special file /dev/rtc with
- major number 10 and minor number 135 using mknod ("man mknod"), you
- will get access to the real time clock (or hardware clock) built
- into your computer.
-
- It reports status information via the file /proc/driver/rtc and its
- behaviour is set by various ioctls on /dev/rtc. If you enable the
- "extended RTC operation" below it will also provide an emulation
- for RTC_UIE which is required by some programs and may improve
- precision in some cases.
-
- To compile this driver as a module, choose M here: the
- module will be called genrtc.
-
-config GEN_RTC_X
- bool "Extended RTC operation"
- depends on GEN_RTC
- help
- Provides an emulation for RTC_UIE which is required by some programs
- and may improve precision of the generic RTC support in some cases.
-
config EFI_RTC
bool "EFI Real Time Clock Services"
depends on IA64
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index fc0905aa7373..f33f5e35df9c 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -25,7 +25,6 @@ obj-$(CONFIG_APPLICOM) += applicom.o
obj-$(CONFIG_SONYPI) += sonypi.o
obj-$(CONFIG_RTC) += rtc.o
obj-$(CONFIG_HPET) += hpet.o
-obj-$(CONFIG_OLD_GEN_RTC) += genrtc.o
obj-$(CONFIG_EFI_RTC) += efirtc.o
obj-$(CONFIG_DS1302) += ds1302.o
obj-$(CONFIG_XILINX_HWICAP) += xilinx_hwicap/
diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
deleted file mode 100644
index 4f943759d376..000000000000
--- a/drivers/char/genrtc.c
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- * Real Time Clock interface for
- * - q40 and other m68k machines,
- * - HP PARISC machines
- * - PowerPC machines
- * emulate some RTC irq capabilities in software
- *
- * Copyright (C) 1999 Richard Zidlicky
- *
- * based on Paul Gortmaker's rtc.c device and
- * Sam Creasey Generic rtc driver
- *
- * This driver allows use of the real time clock (built into
- * nearly all computers) from user space. It exports the /dev/rtc
- * interface supporting various ioctl() and also the /proc/driver/rtc
- * pseudo-file for status information.
- *
- * The ioctls can be used to set the interrupt behaviour where
- * supported.
- *
- * The /dev/rtc interface will block on reads until an interrupt
- * has been received. If a RTC interrupt has already happened,
- * it will output an unsigned long and then block. The output value
- * contains the interrupt status in the low byte and the number of
- * interrupts since the last read in the remaining high bytes. The
- * /dev/rtc interface can also be used with the select(2) call.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
-
- * 1.01 fix for 2.3.X rz@linux-m68k.org
- * 1.02 merged with code from genrtc.c rz@linux-m68k.org
- * 1.03 make it more portable zippel@linux-m68k.org
- * 1.04 removed useless timer code rz@linux-m68k.org
- * 1.05 portable RTC_UIE emulation rz@linux-m68k.org
- * 1.06 set_rtc_time can return an error trini@kernel.crashing.org
- * 1.07 ported to HP PARISC (hppa) Helge Deller <deller@gmx.de>
- */
-
-#define RTC_VERSION "1.07"
-
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/errno.h>
-#include <linux/miscdevice.h>
-#include <linux/fcntl.h>
-
-#include <linux/rtc.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/mutex.h>
-#include <linux/workqueue.h>
-
-#include <asm/uaccess.h>
-#include <asm/rtc.h>
-
-/*
- * We sponge a minor off of the misc major. No need slurping
- * up another valuable major dev number for this. If you add
- * an ioctl, make sure you don't conflict with SPARC's RTC
- * ioctls.
- */
-
-static DEFINE_MUTEX(gen_rtc_mutex);
-static DECLARE_WAIT_QUEUE_HEAD(gen_rtc_wait);
-
-/*
- * Bits in gen_rtc_status.
- */
-
-#define RTC_IS_OPEN 0x01 /* means /dev/rtc is in use */
-
-static unsigned char gen_rtc_status; /* bitmapped status byte. */
-static unsigned long gen_rtc_irq_data; /* our output to the world */
-
-/* months start at 0 now */
-static unsigned char days_in_mo[] =
-{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-
-static int irq_active;
-
-#ifdef CONFIG_GEN_RTC_X
-static struct work_struct genrtc_task;
-static struct timer_list timer_task;
-
-static unsigned int oldsecs;
-static int lostint;
-static unsigned long tt_exp;
-
-static void gen_rtc_timer(unsigned long data);
-
-static volatile int stask_active; /* schedule_work */
-static volatile int ttask_active; /* timer_task */
-static int stop_rtc_timers; /* don't requeue tasks */
-static DEFINE_SPINLOCK(gen_rtc_lock);
-
-static void gen_rtc_interrupt(unsigned long arg);
-
-/*
- * Routine to poll RTC seconds field for change as often as possible,
- * after first RTC_UIE use timer to reduce polling
- */
-static void genrtc_troutine(struct work_struct *work)
-{
- unsigned int tmp = get_rtc_ss();
-
- if (stop_rtc_timers) {
- stask_active = 0;
- return;
- }
-
- if (oldsecs != tmp){
- oldsecs = tmp;
-
- timer_task.function = gen_rtc_timer;
- timer_task.expires = jiffies + HZ - (HZ/10);
- tt_exp=timer_task.expires;
- ttask_active=1;
- stask_active=0;
- add_timer(&timer_task);
-
- gen_rtc_interrupt(0);
- } else if (schedule_work(&genrtc_task) == 0)
- stask_active = 0;
-}
-
-static void gen_rtc_timer(unsigned long data)
-{
- lostint = get_rtc_ss() - oldsecs ;
- if (lostint<0)
- lostint = 60 - lostint;
- if (time_after(jiffies, tt_exp))
- printk(KERN_INFO "genrtc: timer task delayed by %ld jiffies\n",
- jiffies-tt_exp);
- ttask_active=0;
- stask_active=1;
- if ((schedule_work(&genrtc_task) == 0))
- stask_active = 0;
-}
-
-/*
- * call gen_rtc_interrupt function to signal an RTC_UIE,
- * arg is unused.
- * Could be invoked either from a real interrupt handler or
- * from some routine that periodically (eg 100HZ) monitors
- * whether RTC_SECS changed
- */
-static void gen_rtc_interrupt(unsigned long arg)
-{
- /* We store the status in the low byte and the number of
- * interrupts received since the last read in the remainder
- * of rtc_irq_data. */
-
- gen_rtc_irq_data += 0x100;
- gen_rtc_irq_data &= ~0xff;
- gen_rtc_irq_data |= RTC_UIE;
-
- if (lostint){
- printk("genrtc: system delaying clock ticks?\n");
- /* increment count so that userspace knows something is wrong */
- gen_rtc_irq_data += ((lostint-1)<<8);
- lostint = 0;
- }
-
- wake_up_interruptible(&gen_rtc_wait);
-}
-
-/*
- * Now all the various file operations that we export.
- */
-static ssize_t gen_rtc_read(struct file *file, char __user *buf,
- size_t count, loff_t *ppos)
-{
- unsigned long data;
- ssize_t retval;
-
- if (count != sizeof (unsigned int) && count != sizeof (unsigned long))
- return -EINVAL;
-
- if (file->f_flags & O_NONBLOCK && !gen_rtc_irq_data)
- return -EAGAIN;
-
- retval = wait_event_interruptible(gen_rtc_wait,
- (data = xchg(&gen_rtc_irq_data, 0)));
- if (retval)
- goto out;
-
- /* first test allows optimizer to nuke this case for 32-bit machines */
- if (sizeof (int) != sizeof (long) && count == sizeof (unsigned int)) {
- unsigned int uidata = data;
- retval = put_user(uidata, (unsigned int __user *)buf) ?:
- sizeof(unsigned int);
- }
- else {
- retval = put_user(data, (unsigned long __user *)buf) ?:
- sizeof(unsigned long);
- }
-out:
- return retval;
-}
-
-static unsigned int gen_rtc_poll(struct file *file,
- struct poll_table_struct *wait)
-{
- poll_wait(file, &gen_rtc_wait, wait);
- if (gen_rtc_irq_data != 0)
- return POLLIN | POLLRDNORM;
- return 0;
-}
-
-#endif
-
-/*
- * Used to disable/enable interrupts, only RTC_UIE supported
- * We also clear out any old irq data after an ioctl() that
- * meddles with the interrupt enable/disable bits.
- */
-
-static inline void gen_clear_rtc_irq_bit(unsigned char bit)
-{
-#ifdef CONFIG_GEN_RTC_X
- stop_rtc_timers = 1;
- if (ttask_active){
- del_timer_sync(&timer_task);
- ttask_active = 0;
- }
- while (stask_active)
- schedule();
-
- spin_lock(&gen_rtc_lock);
- irq_active = 0;
- spin_unlock(&gen_rtc_lock);
-#endif
-}
-
-static inline int gen_set_rtc_irq_bit(unsigned char bit)
-{
-#ifdef CONFIG_GEN_RTC_X
- spin_lock(&gen_rtc_lock);
- if ( !irq_active ) {
- irq_active = 1;
- stop_rtc_timers = 0;
- lostint = 0;
- INIT_WORK(&genrtc_task, genrtc_troutine);
- oldsecs = get_rtc_ss();
- init_timer(&timer_task);
-
- stask_active = 1;
- if (schedule_work(&genrtc_task) == 0){
- stask_active = 0;
- }
- }
- spin_unlock(&gen_rtc_lock);
- gen_rtc_irq_data = 0;
- return 0;
-#else
- return -EINVAL;
-#endif
-}
-
-static int gen_rtc_ioctl(struct file *file,
- unsigned int cmd, unsigned long arg)
-{
- struct rtc_time wtime;
- struct rtc_pll_info pll;
- void __user *argp = (void __user *)arg;
-
- switch (cmd) {
-
- case RTC_PLL_GET:
- if (get_rtc_pll(&pll))
- return -EINVAL;
- else
- return copy_to_user(argp, &pll, sizeof pll) ? -EFAULT : 0;
-
- case RTC_PLL_SET:
- if (!capable(CAP_SYS_TIME))
- return -EACCES;
- if (copy_from_user(&pll, argp, sizeof(pll)))
- return -EFAULT;
- return set_rtc_pll(&pll);
-
- case RTC_UIE_OFF: /* disable ints from RTC updates. */
- gen_clear_rtc_irq_bit(RTC_UIE);
- return 0;
-
- case RTC_UIE_ON: /* enable ints for RTC updates. */
- return gen_set_rtc_irq_bit(RTC_UIE);
-
- case RTC_RD_TIME: /* Read the time/date from RTC */
- /* this doesn't get week-day, who cares */
- memset(&wtime, 0, sizeof(wtime));
- get_rtc_time(&wtime);
-
- return copy_to_user(argp, &wtime, sizeof(wtime)) ? -EFAULT : 0;
-
- case RTC_SET_TIME: /* Set the RTC */
- {
- int year;
- unsigned char leap_yr;
-
- if (!capable(CAP_SYS_TIME))
- return -EACCES;
-
- if (copy_from_user(&wtime, argp, sizeof(wtime)))
- return -EFAULT;
-
- year = wtime.tm_year + 1900;
- leap_yr = ((!(year % 4) && (year % 100)) ||
- !(year % 400));
-
- if ((wtime.tm_mon < 0 || wtime.tm_mon > 11) || (wtime.tm_mday < 1))
- return -EINVAL;
-
- if (wtime.tm_mday < 0 || wtime.tm_mday >
- (days_in_mo[wtime.tm_mon] + ((wtime.tm_mon == 1) && leap_yr)))
- return -EINVAL;
-
- if (wtime.tm_hour < 0 || wtime.tm_hour >= 24 ||
- wtime.tm_min < 0 || wtime.tm_min >= 60 ||
- wtime.tm_sec < 0 || wtime.tm_sec >= 60)
- return -EINVAL;
-
- return set_rtc_time(&wtime);
- }
- }
-
- return -EINVAL;
-}
-
-static long gen_rtc_unlocked_ioctl(struct file *file, unsigned int cmd,
- unsigned long arg)
-{
- int ret;
-
- mutex_lock(&gen_rtc_mutex);
- ret = gen_rtc_ioctl(file, cmd, arg);
- mutex_unlock(&gen_rtc_mutex);
-
- return ret;
-}
-
-/*
- * We enforce only one user at a time here with the open/close.
- * Also clear the previous interrupt data on an open, and clean
- * up things on a close.
- */
-
-static int gen_rtc_open(struct inode *inode, struct file *file)
-{
- mutex_lock(&gen_rtc_mutex);
- if (gen_rtc_status & RTC_IS_OPEN) {
- mutex_unlock(&gen_rtc_mutex);
- return -EBUSY;
- }
-
- gen_rtc_status |= RTC_IS_OPEN;
- gen_rtc_irq_data = 0;
- irq_active = 0;
- mutex_unlock(&gen_rtc_mutex);
-
- return 0;
-}
-
-static int gen_rtc_release(struct inode *inode, struct file *file)
-{
- /*
- * Turn off all interrupts once the device is no longer
- * in use and clear the data.
- */
-
- gen_clear_rtc_irq_bit(RTC_PIE|RTC_AIE|RTC_UIE);
-
- gen_rtc_status &= ~RTC_IS_OPEN;
- return 0;
-}
-
-
-#ifdef CONFIG_PROC_FS
-
-/*
- * Info exported via "/proc/driver/rtc".
- */
-
-static int gen_rtc_proc_show(struct seq_file *m, void *v)
-{
- struct rtc_time tm;
- unsigned int flags;
- struct rtc_pll_info pll;
-
- flags = get_rtc_time(&tm);
-
- seq_printf(m,
- "rtc_time\t: %02d:%02d:%02d\n"
- "rtc_date\t: %04d-%02d-%02d\n"
- "rtc_epoch\t: %04u\n",
- tm.tm_hour, tm.tm_min, tm.tm_sec,
- tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, 1900);
-
- tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
-
- seq_puts(m, "alarm\t\t: ");
- if (tm.tm_hour <= 24)
- seq_printf(m, "%02d:", tm.tm_hour);
- else
- seq_puts(m, "**:");
-
- if (tm.tm_min <= 59)
- seq_printf(m, "%02d:", tm.tm_min);
- else
- seq_puts(m, "**:");
-
- if (tm.tm_sec <= 59)
- seq_printf(m, "%02d\n", tm.tm_sec);
- else
- seq_puts(m, "**\n");
-
- seq_printf(m,
- "DST_enable\t: %s\n"
- "BCD\t\t: %s\n"
- "24hr\t\t: %s\n"
- "square_wave\t: %s\n"
- "alarm_IRQ\t: %s\n"
- "update_IRQ\t: %s\n"
- "periodic_IRQ\t: %s\n"
- "periodic_freq\t: %ld\n"
- "batt_status\t: %s\n",
- (flags & RTC_DST_EN) ? "yes" : "no",
- (flags & RTC_DM_BINARY) ? "no" : "yes",
- (flags & RTC_24H) ? "yes" : "no",
- (flags & RTC_SQWE) ? "yes" : "no",
- (flags & RTC_AIE) ? "yes" : "no",
- irq_active ? "yes" : "no",
- (flags & RTC_PIE) ? "yes" : "no",
- 0L /* freq */,
- (flags & RTC_BATT_BAD) ? "bad" : "okay");
- if (!get_rtc_pll(&pll))
- seq_printf(m,
- "PLL adjustment\t: %d\n"
- "PLL max +ve adjustment\t: %d\n"
- "PLL max -ve adjustment\t: %d\n"
- "PLL +ve adjustment factor\t: %d\n"
- "PLL -ve adjustment factor\t: %d\n"
- "PLL frequency\t: %ld\n",
- pll.pll_value,
- pll.pll_max,
- pll.pll_min,
- pll.pll_posmult,
- pll.pll_negmult,
- pll.pll_clock);
- return 0;
-}
-
-static int gen_rtc_proc_open(struct inode *inode, struct file *file)
-{
- return single_open(file, gen_rtc_proc_show, NULL);
-}
-
-static const struct file_operations gen_rtc_proc_fops = {
- .open = gen_rtc_proc_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = single_release,
-};
-
-static int __init gen_rtc_proc_init(void)
-{
- struct proc_dir_entry *r;
-
- r = proc_create("driver/rtc", 0, NULL, &gen_rtc_proc_fops);
- if (!r)
- return -ENOMEM;
- return 0;
-}
-#else
-static inline int gen_rtc_proc_init(void) { return 0; }
-#endif /* CONFIG_PROC_FS */
-
-
-/*
- * The various file operations we support.
- */
-
-static const struct file_operations gen_rtc_fops = {
- .owner = THIS_MODULE,
-#ifdef CONFIG_GEN_RTC_X
- .read = gen_rtc_read,
- .poll = gen_rtc_poll,
-#endif
- .unlocked_ioctl = gen_rtc_unlocked_ioctl,
- .open = gen_rtc_open,
- .release = gen_rtc_release,
- .llseek = noop_llseek,
-};
-
-static struct miscdevice rtc_gen_dev =
-{
- .minor = RTC_MINOR,
- .name = "rtc",
- .fops = &gen_rtc_fops,
-};
-
-static int __init rtc_generic_init(void)
-{
- int retval;
-
- printk(KERN_INFO "Generic RTC Driver v%s\n", RTC_VERSION);
-
- retval = misc_register(&rtc_gen_dev);
- if (retval < 0)
- return retval;
-
- retval = gen_rtc_proc_init();
- if (retval) {
- misc_deregister(&rtc_gen_dev);
- return retval;
- }
-
- return 0;
-}
-
-static void __exit rtc_generic_exit(void)
-{
- remove_proc_entry ("driver/rtc", NULL);
- misc_deregister(&rtc_gen_dev);
-}
-
-
-module_init(rtc_generic_init);
-module_exit(rtc_generic_exit);
-
-MODULE_AUTHOR("Richard Zidlicky");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(RTC_MINOR);
diff --git a/include/asm-generic/rtc.h b/include/asm-generic/rtc.h
deleted file mode 100644
index 4fcff22cd707..000000000000
--- a/include/asm-generic/rtc.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * include/asm-generic/rtc.h
- *
- * Author: Tom Rini <trini@mvista.com>
- *
- * Based on:
- * drivers/char/rtc.c
- *
- * Please read the COPYING file for all license details.
- */
-
-#ifndef __ASM_RTC_H__
-#define __ASM_RTC_H__
-
-#include <linux/rtc.h>
-
-#ifndef get_rtc_time
-#include <linux/mc146818rtc.h>
-#define get_rtc_time mc146818_get_time
-#define set_rtc_time mc146818_set_time
-#endif
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-/* some dummy definitions */
-#define RTC_BATT_BAD 0x100 /* battery bad */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-static inline unsigned int get_rtc_ss(void)
-{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-
-#endif /* __ASM_RTC_H__ */
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* [rtc-linux] [PATCH v3 16/16] char/genrtc: remove the rest of the driver
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
No architecture uses the genrtc driver any more, so let's kill it off
for good. This now also includes asm-generic/rtc.h, which is otherwise
completely unused.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/char/Kconfig | 26 ---
drivers/char/Makefile | 1 -
drivers/char/genrtc.c | 539 ----------------------------------------------
include/asm-generic/rtc.h | 51 -----
4 files changed, 617 deletions(-)
delete mode 100644 drivers/char/genrtc.c
delete mode 100644 include/asm-generic/rtc.h
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index a81f0eb9f71e..0d40fbd21c26 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -325,32 +325,6 @@ config JS_RTC
To compile this driver as a module, choose M here: the
module will be called js-rtc.
-config OLD_GEN_RTC
- tristate "Generic /dev/rtc emulation"
- depends on RTC!=y
- depends on BROKEN
- ---help---
- If you say Y here and create a character special file /dev/rtc with
- major number 10 and minor number 135 using mknod ("man mknod"), you
- will get access to the real time clock (or hardware clock) built
- into your computer.
-
- It reports status information via the file /proc/driver/rtc and its
- behaviour is set by various ioctls on /dev/rtc. If you enable the
- "extended RTC operation" below it will also provide an emulation
- for RTC_UIE which is required by some programs and may improve
- precision in some cases.
-
- To compile this driver as a module, choose M here: the
- module will be called genrtc.
-
-config GEN_RTC_X
- bool "Extended RTC operation"
- depends on GEN_RTC
- help
- Provides an emulation for RTC_UIE which is required by some programs
- and may improve precision of the generic RTC support in some cases.
-
config EFI_RTC
bool "EFI Real Time Clock Services"
depends on IA64
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index fc0905aa7373..f33f5e35df9c 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -25,7 +25,6 @@ obj-$(CONFIG_APPLICOM) += applicom.o
obj-$(CONFIG_SONYPI) += sonypi.o
obj-$(CONFIG_RTC) += rtc.o
obj-$(CONFIG_HPET) += hpet.o
-obj-$(CONFIG_OLD_GEN_RTC) += genrtc.o
obj-$(CONFIG_EFI_RTC) += efirtc.o
obj-$(CONFIG_DS1302) += ds1302.o
obj-$(CONFIG_XILINX_HWICAP) += xilinx_hwicap/
diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
deleted file mode 100644
index 4f943759d376..000000000000
--- a/drivers/char/genrtc.c
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- * Real Time Clock interface for
- * - q40 and other m68k machines,
- * - HP PARISC machines
- * - PowerPC machines
- * emulate some RTC irq capabilities in software
- *
- * Copyright (C) 1999 Richard Zidlicky
- *
- * based on Paul Gortmaker's rtc.c device and
- * Sam Creasey Generic rtc driver
- *
- * This driver allows use of the real time clock (built into
- * nearly all computers) from user space. It exports the /dev/rtc
- * interface supporting various ioctl() and also the /proc/driver/rtc
- * pseudo-file for status information.
- *
- * The ioctls can be used to set the interrupt behaviour where
- * supported.
- *
- * The /dev/rtc interface will block on reads until an interrupt
- * has been received. If a RTC interrupt has already happened,
- * it will output an unsigned long and then block. The output value
- * contains the interrupt status in the low byte and the number of
- * interrupts since the last read in the remaining high bytes. The
- * /dev/rtc interface can also be used with the select(2) call.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
-
- * 1.01 fix for 2.3.X rz@linux-m68k.org
- * 1.02 merged with code from genrtc.c rz@linux-m68k.org
- * 1.03 make it more portable zippel@linux-m68k.org
- * 1.04 removed useless timer code rz@linux-m68k.org
- * 1.05 portable RTC_UIE emulation rz@linux-m68k.org
- * 1.06 set_rtc_time can return an error trini@kernel.crashing.org
- * 1.07 ported to HP PARISC (hppa) Helge Deller <deller@gmx.de>
- */
-
-#define RTC_VERSION "1.07"
-
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/errno.h>
-#include <linux/miscdevice.h>
-#include <linux/fcntl.h>
-
-#include <linux/rtc.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/mutex.h>
-#include <linux/workqueue.h>
-
-#include <asm/uaccess.h>
-#include <asm/rtc.h>
-
-/*
- * We sponge a minor off of the misc major. No need slurping
- * up another valuable major dev number for this. If you add
- * an ioctl, make sure you don't conflict with SPARC's RTC
- * ioctls.
- */
-
-static DEFINE_MUTEX(gen_rtc_mutex);
-static DECLARE_WAIT_QUEUE_HEAD(gen_rtc_wait);
-
-/*
- * Bits in gen_rtc_status.
- */
-
-#define RTC_IS_OPEN 0x01 /* means /dev/rtc is in use */
-
-static unsigned char gen_rtc_status; /* bitmapped status byte. */
-static unsigned long gen_rtc_irq_data; /* our output to the world */
-
-/* months start at 0 now */
-static unsigned char days_in_mo[] =
-{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-
-static int irq_active;
-
-#ifdef CONFIG_GEN_RTC_X
-static struct work_struct genrtc_task;
-static struct timer_list timer_task;
-
-static unsigned int oldsecs;
-static int lostint;
-static unsigned long tt_exp;
-
-static void gen_rtc_timer(unsigned long data);
-
-static volatile int stask_active; /* schedule_work */
-static volatile int ttask_active; /* timer_task */
-static int stop_rtc_timers; /* don't requeue tasks */
-static DEFINE_SPINLOCK(gen_rtc_lock);
-
-static void gen_rtc_interrupt(unsigned long arg);
-
-/*
- * Routine to poll RTC seconds field for change as often as possible,
- * after first RTC_UIE use timer to reduce polling
- */
-static void genrtc_troutine(struct work_struct *work)
-{
- unsigned int tmp = get_rtc_ss();
-
- if (stop_rtc_timers) {
- stask_active = 0;
- return;
- }
-
- if (oldsecs != tmp){
- oldsecs = tmp;
-
- timer_task.function = gen_rtc_timer;
- timer_task.expires = jiffies + HZ - (HZ/10);
- tt_exp=timer_task.expires;
- ttask_active=1;
- stask_active=0;
- add_timer(&timer_task);
-
- gen_rtc_interrupt(0);
- } else if (schedule_work(&genrtc_task) == 0)
- stask_active = 0;
-}
-
-static void gen_rtc_timer(unsigned long data)
-{
- lostint = get_rtc_ss() - oldsecs ;
- if (lostint<0)
- lostint = 60 - lostint;
- if (time_after(jiffies, tt_exp))
- printk(KERN_INFO "genrtc: timer task delayed by %ld jiffies\n",
- jiffies-tt_exp);
- ttask_active=0;
- stask_active=1;
- if ((schedule_work(&genrtc_task) == 0))
- stask_active = 0;
-}
-
-/*
- * call gen_rtc_interrupt function to signal an RTC_UIE,
- * arg is unused.
- * Could be invoked either from a real interrupt handler or
- * from some routine that periodically (eg 100HZ) monitors
- * whether RTC_SECS changed
- */
-static void gen_rtc_interrupt(unsigned long arg)
-{
- /* We store the status in the low byte and the number of
- * interrupts received since the last read in the remainder
- * of rtc_irq_data. */
-
- gen_rtc_irq_data += 0x100;
- gen_rtc_irq_data &= ~0xff;
- gen_rtc_irq_data |= RTC_UIE;
-
- if (lostint){
- printk("genrtc: system delaying clock ticks?\n");
- /* increment count so that userspace knows something is wrong */
- gen_rtc_irq_data += ((lostint-1)<<8);
- lostint = 0;
- }
-
- wake_up_interruptible(&gen_rtc_wait);
-}
-
-/*
- * Now all the various file operations that we export.
- */
-static ssize_t gen_rtc_read(struct file *file, char __user *buf,
- size_t count, loff_t *ppos)
-{
- unsigned long data;
- ssize_t retval;
-
- if (count != sizeof (unsigned int) && count != sizeof (unsigned long))
- return -EINVAL;
-
- if (file->f_flags & O_NONBLOCK && !gen_rtc_irq_data)
- return -EAGAIN;
-
- retval = wait_event_interruptible(gen_rtc_wait,
- (data = xchg(&gen_rtc_irq_data, 0)));
- if (retval)
- goto out;
-
- /* first test allows optimizer to nuke this case for 32-bit machines */
- if (sizeof (int) != sizeof (long) && count == sizeof (unsigned int)) {
- unsigned int uidata = data;
- retval = put_user(uidata, (unsigned int __user *)buf) ?:
- sizeof(unsigned int);
- }
- else {
- retval = put_user(data, (unsigned long __user *)buf) ?:
- sizeof(unsigned long);
- }
-out:
- return retval;
-}
-
-static unsigned int gen_rtc_poll(struct file *file,
- struct poll_table_struct *wait)
-{
- poll_wait(file, &gen_rtc_wait, wait);
- if (gen_rtc_irq_data != 0)
- return POLLIN | POLLRDNORM;
- return 0;
-}
-
-#endif
-
-/*
- * Used to disable/enable interrupts, only RTC_UIE supported
- * We also clear out any old irq data after an ioctl() that
- * meddles with the interrupt enable/disable bits.
- */
-
-static inline void gen_clear_rtc_irq_bit(unsigned char bit)
-{
-#ifdef CONFIG_GEN_RTC_X
- stop_rtc_timers = 1;
- if (ttask_active){
- del_timer_sync(&timer_task);
- ttask_active = 0;
- }
- while (stask_active)
- schedule();
-
- spin_lock(&gen_rtc_lock);
- irq_active = 0;
- spin_unlock(&gen_rtc_lock);
-#endif
-}
-
-static inline int gen_set_rtc_irq_bit(unsigned char bit)
-{
-#ifdef CONFIG_GEN_RTC_X
- spin_lock(&gen_rtc_lock);
- if ( !irq_active ) {
- irq_active = 1;
- stop_rtc_timers = 0;
- lostint = 0;
- INIT_WORK(&genrtc_task, genrtc_troutine);
- oldsecs = get_rtc_ss();
- init_timer(&timer_task);
-
- stask_active = 1;
- if (schedule_work(&genrtc_task) == 0){
- stask_active = 0;
- }
- }
- spin_unlock(&gen_rtc_lock);
- gen_rtc_irq_data = 0;
- return 0;
-#else
- return -EINVAL;
-#endif
-}
-
-static int gen_rtc_ioctl(struct file *file,
- unsigned int cmd, unsigned long arg)
-{
- struct rtc_time wtime;
- struct rtc_pll_info pll;
- void __user *argp = (void __user *)arg;
-
- switch (cmd) {
-
- case RTC_PLL_GET:
- if (get_rtc_pll(&pll))
- return -EINVAL;
- else
- return copy_to_user(argp, &pll, sizeof pll) ? -EFAULT : 0;
-
- case RTC_PLL_SET:
- if (!capable(CAP_SYS_TIME))
- return -EACCES;
- if (copy_from_user(&pll, argp, sizeof(pll)))
- return -EFAULT;
- return set_rtc_pll(&pll);
-
- case RTC_UIE_OFF: /* disable ints from RTC updates. */
- gen_clear_rtc_irq_bit(RTC_UIE);
- return 0;
-
- case RTC_UIE_ON: /* enable ints for RTC updates. */
- return gen_set_rtc_irq_bit(RTC_UIE);
-
- case RTC_RD_TIME: /* Read the time/date from RTC */
- /* this doesn't get week-day, who cares */
- memset(&wtime, 0, sizeof(wtime));
- get_rtc_time(&wtime);
-
- return copy_to_user(argp, &wtime, sizeof(wtime)) ? -EFAULT : 0;
-
- case RTC_SET_TIME: /* Set the RTC */
- {
- int year;
- unsigned char leap_yr;
-
- if (!capable(CAP_SYS_TIME))
- return -EACCES;
-
- if (copy_from_user(&wtime, argp, sizeof(wtime)))
- return -EFAULT;
-
- year = wtime.tm_year + 1900;
- leap_yr = ((!(year % 4) && (year % 100)) ||
- !(year % 400));
-
- if ((wtime.tm_mon < 0 || wtime.tm_mon > 11) || (wtime.tm_mday < 1))
- return -EINVAL;
-
- if (wtime.tm_mday < 0 || wtime.tm_mday >
- (days_in_mo[wtime.tm_mon] + ((wtime.tm_mon == 1) && leap_yr)))
- return -EINVAL;
-
- if (wtime.tm_hour < 0 || wtime.tm_hour >= 24 ||
- wtime.tm_min < 0 || wtime.tm_min >= 60 ||
- wtime.tm_sec < 0 || wtime.tm_sec >= 60)
- return -EINVAL;
-
- return set_rtc_time(&wtime);
- }
- }
-
- return -EINVAL;
-}
-
-static long gen_rtc_unlocked_ioctl(struct file *file, unsigned int cmd,
- unsigned long arg)
-{
- int ret;
-
- mutex_lock(&gen_rtc_mutex);
- ret = gen_rtc_ioctl(file, cmd, arg);
- mutex_unlock(&gen_rtc_mutex);
-
- return ret;
-}
-
-/*
- * We enforce only one user at a time here with the open/close.
- * Also clear the previous interrupt data on an open, and clean
- * up things on a close.
- */
-
-static int gen_rtc_open(struct inode *inode, struct file *file)
-{
- mutex_lock(&gen_rtc_mutex);
- if (gen_rtc_status & RTC_IS_OPEN) {
- mutex_unlock(&gen_rtc_mutex);
- return -EBUSY;
- }
-
- gen_rtc_status |= RTC_IS_OPEN;
- gen_rtc_irq_data = 0;
- irq_active = 0;
- mutex_unlock(&gen_rtc_mutex);
-
- return 0;
-}
-
-static int gen_rtc_release(struct inode *inode, struct file *file)
-{
- /*
- * Turn off all interrupts once the device is no longer
- * in use and clear the data.
- */
-
- gen_clear_rtc_irq_bit(RTC_PIE|RTC_AIE|RTC_UIE);
-
- gen_rtc_status &= ~RTC_IS_OPEN;
- return 0;
-}
-
-
-#ifdef CONFIG_PROC_FS
-
-/*
- * Info exported via "/proc/driver/rtc".
- */
-
-static int gen_rtc_proc_show(struct seq_file *m, void *v)
-{
- struct rtc_time tm;
- unsigned int flags;
- struct rtc_pll_info pll;
-
- flags = get_rtc_time(&tm);
-
- seq_printf(m,
- "rtc_time\t: %02d:%02d:%02d\n"
- "rtc_date\t: %04d-%02d-%02d\n"
- "rtc_epoch\t: %04u\n",
- tm.tm_hour, tm.tm_min, tm.tm_sec,
- tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, 1900);
-
- tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
-
- seq_puts(m, "alarm\t\t: ");
- if (tm.tm_hour <= 24)
- seq_printf(m, "%02d:", tm.tm_hour);
- else
- seq_puts(m, "**:");
-
- if (tm.tm_min <= 59)
- seq_printf(m, "%02d:", tm.tm_min);
- else
- seq_puts(m, "**:");
-
- if (tm.tm_sec <= 59)
- seq_printf(m, "%02d\n", tm.tm_sec);
- else
- seq_puts(m, "**\n");
-
- seq_printf(m,
- "DST_enable\t: %s\n"
- "BCD\t\t: %s\n"
- "24hr\t\t: %s\n"
- "square_wave\t: %s\n"
- "alarm_IRQ\t: %s\n"
- "update_IRQ\t: %s\n"
- "periodic_IRQ\t: %s\n"
- "periodic_freq\t: %ld\n"
- "batt_status\t: %s\n",
- (flags & RTC_DST_EN) ? "yes" : "no",
- (flags & RTC_DM_BINARY) ? "no" : "yes",
- (flags & RTC_24H) ? "yes" : "no",
- (flags & RTC_SQWE) ? "yes" : "no",
- (flags & RTC_AIE) ? "yes" : "no",
- irq_active ? "yes" : "no",
- (flags & RTC_PIE) ? "yes" : "no",
- 0L /* freq */,
- (flags & RTC_BATT_BAD) ? "bad" : "okay");
- if (!get_rtc_pll(&pll))
- seq_printf(m,
- "PLL adjustment\t: %d\n"
- "PLL max +ve adjustment\t: %d\n"
- "PLL max -ve adjustment\t: %d\n"
- "PLL +ve adjustment factor\t: %d\n"
- "PLL -ve adjustment factor\t: %d\n"
- "PLL frequency\t: %ld\n",
- pll.pll_value,
- pll.pll_max,
- pll.pll_min,
- pll.pll_posmult,
- pll.pll_negmult,
- pll.pll_clock);
- return 0;
-}
-
-static int gen_rtc_proc_open(struct inode *inode, struct file *file)
-{
- return single_open(file, gen_rtc_proc_show, NULL);
-}
-
-static const struct file_operations gen_rtc_proc_fops = {
- .open = gen_rtc_proc_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = single_release,
-};
-
-static int __init gen_rtc_proc_init(void)
-{
- struct proc_dir_entry *r;
-
- r = proc_create("driver/rtc", 0, NULL, &gen_rtc_proc_fops);
- if (!r)
- return -ENOMEM;
- return 0;
-}
-#else
-static inline int gen_rtc_proc_init(void) { return 0; }
-#endif /* CONFIG_PROC_FS */
-
-
-/*
- * The various file operations we support.
- */
-
-static const struct file_operations gen_rtc_fops = {
- .owner = THIS_MODULE,
-#ifdef CONFIG_GEN_RTC_X
- .read = gen_rtc_read,
- .poll = gen_rtc_poll,
-#endif
- .unlocked_ioctl = gen_rtc_unlocked_ioctl,
- .open = gen_rtc_open,
- .release = gen_rtc_release,
- .llseek = noop_llseek,
-};
-
-static struct miscdevice rtc_gen_dev =
-{
- .minor = RTC_MINOR,
- .name = "rtc",
- .fops = &gen_rtc_fops,
-};
-
-static int __init rtc_generic_init(void)
-{
- int retval;
-
- printk(KERN_INFO "Generic RTC Driver v%s\n", RTC_VERSION);
-
- retval = misc_register(&rtc_gen_dev);
- if (retval < 0)
- return retval;
-
- retval = gen_rtc_proc_init();
- if (retval) {
- misc_deregister(&rtc_gen_dev);
- return retval;
- }
-
- return 0;
-}
-
-static void __exit rtc_generic_exit(void)
-{
- remove_proc_entry ("driver/rtc", NULL);
- misc_deregister(&rtc_gen_dev);
-}
-
-
-module_init(rtc_generic_init);
-module_exit(rtc_generic_exit);
-
-MODULE_AUTHOR("Richard Zidlicky");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(RTC_MINOR);
diff --git a/include/asm-generic/rtc.h b/include/asm-generic/rtc.h
deleted file mode 100644
index 4fcff22cd707..000000000000
--- a/include/asm-generic/rtc.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * include/asm-generic/rtc.h
- *
- * Author: Tom Rini <trini@mvista.com>
- *
- * Based on:
- * drivers/char/rtc.c
- *
- * Please read the COPYING file for all license details.
- */
-
-#ifndef __ASM_RTC_H__
-#define __ASM_RTC_H__
-
-#include <linux/rtc.h>
-
-#ifndef get_rtc_time
-#include <linux/mc146818rtc.h>
-#define get_rtc_time mc146818_get_time
-#define set_rtc_time mc146818_set_time
-#endif
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-/* some dummy definitions */
-#define RTC_BATT_BAD 0x100 /* battery bad */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-static inline unsigned int get_rtc_ss(void)
-{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-
-#endif /* __ASM_RTC_H__ */
--
2.7.0
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply related [flat|nested] 144+ messages in thread* [PATCH v3 16/16] char/genrtc: remove the rest of the driver
@ 2016-04-27 22:34 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
No architecture uses the genrtc driver any more, so let's kill it off
for good. This now also includes asm-generic/rtc.h, which is otherwise
completely unused.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/char/Kconfig | 26 ---
drivers/char/Makefile | 1 -
drivers/char/genrtc.c | 539 ----------------------------------------------
include/asm-generic/rtc.h | 51 -----
4 files changed, 617 deletions(-)
delete mode 100644 drivers/char/genrtc.c
delete mode 100644 include/asm-generic/rtc.h
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index a81f0eb9f71e..0d40fbd21c26 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -325,32 +325,6 @@ config JS_RTC
To compile this driver as a module, choose M here: the
module will be called js-rtc.
-config OLD_GEN_RTC
- tristate "Generic /dev/rtc emulation"
- depends on RTC!=y
- depends on BROKEN
- ---help---
- If you say Y here and create a character special file /dev/rtc with
- major number 10 and minor number 135 using mknod ("man mknod"), you
- will get access to the real time clock (or hardware clock) built
- into your computer.
-
- It reports status information via the file /proc/driver/rtc and its
- behaviour is set by various ioctls on /dev/rtc. If you enable the
- "extended RTC operation" below it will also provide an emulation
- for RTC_UIE which is required by some programs and may improve
- precision in some cases.
-
- To compile this driver as a module, choose M here: the
- module will be called genrtc.
-
-config GEN_RTC_X
- bool "Extended RTC operation"
- depends on GEN_RTC
- help
- Provides an emulation for RTC_UIE which is required by some programs
- and may improve precision of the generic RTC support in some cases.
-
config EFI_RTC
bool "EFI Real Time Clock Services"
depends on IA64
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index fc0905aa7373..f33f5e35df9c 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -25,7 +25,6 @@ obj-$(CONFIG_APPLICOM) += applicom.o
obj-$(CONFIG_SONYPI) += sonypi.o
obj-$(CONFIG_RTC) += rtc.o
obj-$(CONFIG_HPET) += hpet.o
-obj-$(CONFIG_OLD_GEN_RTC) += genrtc.o
obj-$(CONFIG_EFI_RTC) += efirtc.o
obj-$(CONFIG_DS1302) += ds1302.o
obj-$(CONFIG_XILINX_HWICAP) += xilinx_hwicap/
diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
deleted file mode 100644
index 4f943759d376..000000000000
--- a/drivers/char/genrtc.c
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- * Real Time Clock interface for
- * - q40 and other m68k machines,
- * - HP PARISC machines
- * - PowerPC machines
- * emulate some RTC irq capabilities in software
- *
- * Copyright (C) 1999 Richard Zidlicky
- *
- * based on Paul Gortmaker's rtc.c device and
- * Sam Creasey Generic rtc driver
- *
- * This driver allows use of the real time clock (built into
- * nearly all computers) from user space. It exports the /dev/rtc
- * interface supporting various ioctl() and also the /proc/driver/rtc
- * pseudo-file for status information.
- *
- * The ioctls can be used to set the interrupt behaviour where
- * supported.
- *
- * The /dev/rtc interface will block on reads until an interrupt
- * has been received. If a RTC interrupt has already happened,
- * it will output an unsigned long and then block. The output value
- * contains the interrupt status in the low byte and the number of
- * interrupts since the last read in the remaining high bytes. The
- * /dev/rtc interface can also be used with the select(2) call.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
-
- * 1.01 fix for 2.3.X rz@linux-m68k.org
- * 1.02 merged with code from genrtc.c rz@linux-m68k.org
- * 1.03 make it more portable zippel@linux-m68k.org
- * 1.04 removed useless timer code rz@linux-m68k.org
- * 1.05 portable RTC_UIE emulation rz@linux-m68k.org
- * 1.06 set_rtc_time can return an error trini@kernel.crashing.org
- * 1.07 ported to HP PARISC (hppa) Helge Deller <deller@gmx.de>
- */
-
-#define RTC_VERSION "1.07"
-
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/errno.h>
-#include <linux/miscdevice.h>
-#include <linux/fcntl.h>
-
-#include <linux/rtc.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/mutex.h>
-#include <linux/workqueue.h>
-
-#include <asm/uaccess.h>
-#include <asm/rtc.h>
-
-/*
- * We sponge a minor off of the misc major. No need slurping
- * up another valuable major dev number for this. If you add
- * an ioctl, make sure you don't conflict with SPARC's RTC
- * ioctls.
- */
-
-static DEFINE_MUTEX(gen_rtc_mutex);
-static DECLARE_WAIT_QUEUE_HEAD(gen_rtc_wait);
-
-/*
- * Bits in gen_rtc_status.
- */
-
-#define RTC_IS_OPEN 0x01 /* means /dev/rtc is in use */
-
-static unsigned char gen_rtc_status; /* bitmapped status byte. */
-static unsigned long gen_rtc_irq_data; /* our output to the world */
-
-/* months start at 0 now */
-static unsigned char days_in_mo[] =
-{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-
-static int irq_active;
-
-#ifdef CONFIG_GEN_RTC_X
-static struct work_struct genrtc_task;
-static struct timer_list timer_task;
-
-static unsigned int oldsecs;
-static int lostint;
-static unsigned long tt_exp;
-
-static void gen_rtc_timer(unsigned long data);
-
-static volatile int stask_active; /* schedule_work */
-static volatile int ttask_active; /* timer_task */
-static int stop_rtc_timers; /* don't requeue tasks */
-static DEFINE_SPINLOCK(gen_rtc_lock);
-
-static void gen_rtc_interrupt(unsigned long arg);
-
-/*
- * Routine to poll RTC seconds field for change as often as possible,
- * after first RTC_UIE use timer to reduce polling
- */
-static void genrtc_troutine(struct work_struct *work)
-{
- unsigned int tmp = get_rtc_ss();
-
- if (stop_rtc_timers) {
- stask_active = 0;
- return;
- }
-
- if (oldsecs != tmp){
- oldsecs = tmp;
-
- timer_task.function = gen_rtc_timer;
- timer_task.expires = jiffies + HZ - (HZ/10);
- tt_exp=timer_task.expires;
- ttask_active=1;
- stask_active=0;
- add_timer(&timer_task);
-
- gen_rtc_interrupt(0);
- } else if (schedule_work(&genrtc_task) == 0)
- stask_active = 0;
-}
-
-static void gen_rtc_timer(unsigned long data)
-{
- lostint = get_rtc_ss() - oldsecs ;
- if (lostint<0)
- lostint = 60 - lostint;
- if (time_after(jiffies, tt_exp))
- printk(KERN_INFO "genrtc: timer task delayed by %ld jiffies\n",
- jiffies-tt_exp);
- ttask_active=0;
- stask_active=1;
- if ((schedule_work(&genrtc_task) == 0))
- stask_active = 0;
-}
-
-/*
- * call gen_rtc_interrupt function to signal an RTC_UIE,
- * arg is unused.
- * Could be invoked either from a real interrupt handler or
- * from some routine that periodically (eg 100HZ) monitors
- * whether RTC_SECS changed
- */
-static void gen_rtc_interrupt(unsigned long arg)
-{
- /* We store the status in the low byte and the number of
- * interrupts received since the last read in the remainder
- * of rtc_irq_data. */
-
- gen_rtc_irq_data += 0x100;
- gen_rtc_irq_data &= ~0xff;
- gen_rtc_irq_data |= RTC_UIE;
-
- if (lostint){
- printk("genrtc: system delaying clock ticks?\n");
- /* increment count so that userspace knows something is wrong */
- gen_rtc_irq_data += ((lostint-1)<<8);
- lostint = 0;
- }
-
- wake_up_interruptible(&gen_rtc_wait);
-}
-
-/*
- * Now all the various file operations that we export.
- */
-static ssize_t gen_rtc_read(struct file *file, char __user *buf,
- size_t count, loff_t *ppos)
-{
- unsigned long data;
- ssize_t retval;
-
- if (count != sizeof (unsigned int) && count != sizeof (unsigned long))
- return -EINVAL;
-
- if (file->f_flags & O_NONBLOCK && !gen_rtc_irq_data)
- return -EAGAIN;
-
- retval = wait_event_interruptible(gen_rtc_wait,
- (data = xchg(&gen_rtc_irq_data, 0)));
- if (retval)
- goto out;
-
- /* first test allows optimizer to nuke this case for 32-bit machines */
- if (sizeof (int) != sizeof (long) && count == sizeof (unsigned int)) {
- unsigned int uidata = data;
- retval = put_user(uidata, (unsigned int __user *)buf) ?:
- sizeof(unsigned int);
- }
- else {
- retval = put_user(data, (unsigned long __user *)buf) ?:
- sizeof(unsigned long);
- }
-out:
- return retval;
-}
-
-static unsigned int gen_rtc_poll(struct file *file,
- struct poll_table_struct *wait)
-{
- poll_wait(file, &gen_rtc_wait, wait);
- if (gen_rtc_irq_data != 0)
- return POLLIN | POLLRDNORM;
- return 0;
-}
-
-#endif
-
-/*
- * Used to disable/enable interrupts, only RTC_UIE supported
- * We also clear out any old irq data after an ioctl() that
- * meddles with the interrupt enable/disable bits.
- */
-
-static inline void gen_clear_rtc_irq_bit(unsigned char bit)
-{
-#ifdef CONFIG_GEN_RTC_X
- stop_rtc_timers = 1;
- if (ttask_active){
- del_timer_sync(&timer_task);
- ttask_active = 0;
- }
- while (stask_active)
- schedule();
-
- spin_lock(&gen_rtc_lock);
- irq_active = 0;
- spin_unlock(&gen_rtc_lock);
-#endif
-}
-
-static inline int gen_set_rtc_irq_bit(unsigned char bit)
-{
-#ifdef CONFIG_GEN_RTC_X
- spin_lock(&gen_rtc_lock);
- if ( !irq_active ) {
- irq_active = 1;
- stop_rtc_timers = 0;
- lostint = 0;
- INIT_WORK(&genrtc_task, genrtc_troutine);
- oldsecs = get_rtc_ss();
- init_timer(&timer_task);
-
- stask_active = 1;
- if (schedule_work(&genrtc_task) == 0){
- stask_active = 0;
- }
- }
- spin_unlock(&gen_rtc_lock);
- gen_rtc_irq_data = 0;
- return 0;
-#else
- return -EINVAL;
-#endif
-}
-
-static int gen_rtc_ioctl(struct file *file,
- unsigned int cmd, unsigned long arg)
-{
- struct rtc_time wtime;
- struct rtc_pll_info pll;
- void __user *argp = (void __user *)arg;
-
- switch (cmd) {
-
- case RTC_PLL_GET:
- if (get_rtc_pll(&pll))
- return -EINVAL;
- else
- return copy_to_user(argp, &pll, sizeof pll) ? -EFAULT : 0;
-
- case RTC_PLL_SET:
- if (!capable(CAP_SYS_TIME))
- return -EACCES;
- if (copy_from_user(&pll, argp, sizeof(pll)))
- return -EFAULT;
- return set_rtc_pll(&pll);
-
- case RTC_UIE_OFF: /* disable ints from RTC updates. */
- gen_clear_rtc_irq_bit(RTC_UIE);
- return 0;
-
- case RTC_UIE_ON: /* enable ints for RTC updates. */
- return gen_set_rtc_irq_bit(RTC_UIE);
-
- case RTC_RD_TIME: /* Read the time/date from RTC */
- /* this doesn't get week-day, who cares */
- memset(&wtime, 0, sizeof(wtime));
- get_rtc_time(&wtime);
-
- return copy_to_user(argp, &wtime, sizeof(wtime)) ? -EFAULT : 0;
-
- case RTC_SET_TIME: /* Set the RTC */
- {
- int year;
- unsigned char leap_yr;
-
- if (!capable(CAP_SYS_TIME))
- return -EACCES;
-
- if (copy_from_user(&wtime, argp, sizeof(wtime)))
- return -EFAULT;
-
- year = wtime.tm_year + 1900;
- leap_yr = ((!(year % 4) && (year % 100)) ||
- !(year % 400));
-
- if ((wtime.tm_mon < 0 || wtime.tm_mon > 11) || (wtime.tm_mday < 1))
- return -EINVAL;
-
- if (wtime.tm_mday < 0 || wtime.tm_mday >
- (days_in_mo[wtime.tm_mon] + ((wtime.tm_mon == 1) && leap_yr)))
- return -EINVAL;
-
- if (wtime.tm_hour < 0 || wtime.tm_hour >= 24 ||
- wtime.tm_min < 0 || wtime.tm_min >= 60 ||
- wtime.tm_sec < 0 || wtime.tm_sec >= 60)
- return -EINVAL;
-
- return set_rtc_time(&wtime);
- }
- }
-
- return -EINVAL;
-}
-
-static long gen_rtc_unlocked_ioctl(struct file *file, unsigned int cmd,
- unsigned long arg)
-{
- int ret;
-
- mutex_lock(&gen_rtc_mutex);
- ret = gen_rtc_ioctl(file, cmd, arg);
- mutex_unlock(&gen_rtc_mutex);
-
- return ret;
-}
-
-/*
- * We enforce only one user at a time here with the open/close.
- * Also clear the previous interrupt data on an open, and clean
- * up things on a close.
- */
-
-static int gen_rtc_open(struct inode *inode, struct file *file)
-{
- mutex_lock(&gen_rtc_mutex);
- if (gen_rtc_status & RTC_IS_OPEN) {
- mutex_unlock(&gen_rtc_mutex);
- return -EBUSY;
- }
-
- gen_rtc_status |= RTC_IS_OPEN;
- gen_rtc_irq_data = 0;
- irq_active = 0;
- mutex_unlock(&gen_rtc_mutex);
-
- return 0;
-}
-
-static int gen_rtc_release(struct inode *inode, struct file *file)
-{
- /*
- * Turn off all interrupts once the device is no longer
- * in use and clear the data.
- */
-
- gen_clear_rtc_irq_bit(RTC_PIE|RTC_AIE|RTC_UIE);
-
- gen_rtc_status &= ~RTC_IS_OPEN;
- return 0;
-}
-
-
-#ifdef CONFIG_PROC_FS
-
-/*
- * Info exported via "/proc/driver/rtc".
- */
-
-static int gen_rtc_proc_show(struct seq_file *m, void *v)
-{
- struct rtc_time tm;
- unsigned int flags;
- struct rtc_pll_info pll;
-
- flags = get_rtc_time(&tm);
-
- seq_printf(m,
- "rtc_time\t: %02d:%02d:%02d\n"
- "rtc_date\t: %04d-%02d-%02d\n"
- "rtc_epoch\t: %04u\n",
- tm.tm_hour, tm.tm_min, tm.tm_sec,
- tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, 1900);
-
- tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
-
- seq_puts(m, "alarm\t\t: ");
- if (tm.tm_hour <= 24)
- seq_printf(m, "%02d:", tm.tm_hour);
- else
- seq_puts(m, "**:");
-
- if (tm.tm_min <= 59)
- seq_printf(m, "%02d:", tm.tm_min);
- else
- seq_puts(m, "**:");
-
- if (tm.tm_sec <= 59)
- seq_printf(m, "%02d\n", tm.tm_sec);
- else
- seq_puts(m, "**\n");
-
- seq_printf(m,
- "DST_enable\t: %s\n"
- "BCD\t\t: %s\n"
- "24hr\t\t: %s\n"
- "square_wave\t: %s\n"
- "alarm_IRQ\t: %s\n"
- "update_IRQ\t: %s\n"
- "periodic_IRQ\t: %s\n"
- "periodic_freq\t: %ld\n"
- "batt_status\t: %s\n",
- (flags & RTC_DST_EN) ? "yes" : "no",
- (flags & RTC_DM_BINARY) ? "no" : "yes",
- (flags & RTC_24H) ? "yes" : "no",
- (flags & RTC_SQWE) ? "yes" : "no",
- (flags & RTC_AIE) ? "yes" : "no",
- irq_active ? "yes" : "no",
- (flags & RTC_PIE) ? "yes" : "no",
- 0L /* freq */,
- (flags & RTC_BATT_BAD) ? "bad" : "okay");
- if (!get_rtc_pll(&pll))
- seq_printf(m,
- "PLL adjustment\t: %d\n"
- "PLL max +ve adjustment\t: %d\n"
- "PLL max -ve adjustment\t: %d\n"
- "PLL +ve adjustment factor\t: %d\n"
- "PLL -ve adjustment factor\t: %d\n"
- "PLL frequency\t: %ld\n",
- pll.pll_value,
- pll.pll_max,
- pll.pll_min,
- pll.pll_posmult,
- pll.pll_negmult,
- pll.pll_clock);
- return 0;
-}
-
-static int gen_rtc_proc_open(struct inode *inode, struct file *file)
-{
- return single_open(file, gen_rtc_proc_show, NULL);
-}
-
-static const struct file_operations gen_rtc_proc_fops = {
- .open = gen_rtc_proc_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = single_release,
-};
-
-static int __init gen_rtc_proc_init(void)
-{
- struct proc_dir_entry *r;
-
- r = proc_create("driver/rtc", 0, NULL, &gen_rtc_proc_fops);
- if (!r)
- return -ENOMEM;
- return 0;
-}
-#else
-static inline int gen_rtc_proc_init(void) { return 0; }
-#endif /* CONFIG_PROC_FS */
-
-
-/*
- * The various file operations we support.
- */
-
-static const struct file_operations gen_rtc_fops = {
- .owner = THIS_MODULE,
-#ifdef CONFIG_GEN_RTC_X
- .read = gen_rtc_read,
- .poll = gen_rtc_poll,
-#endif
- .unlocked_ioctl = gen_rtc_unlocked_ioctl,
- .open = gen_rtc_open,
- .release = gen_rtc_release,
- .llseek = noop_llseek,
-};
-
-static struct miscdevice rtc_gen_dev =
-{
- .minor = RTC_MINOR,
- .name = "rtc",
- .fops = &gen_rtc_fops,
-};
-
-static int __init rtc_generic_init(void)
-{
- int retval;
-
- printk(KERN_INFO "Generic RTC Driver v%s\n", RTC_VERSION);
-
- retval = misc_register(&rtc_gen_dev);
- if (retval < 0)
- return retval;
-
- retval = gen_rtc_proc_init();
- if (retval) {
- misc_deregister(&rtc_gen_dev);
- return retval;
- }
-
- return 0;
-}
-
-static void __exit rtc_generic_exit(void)
-{
- remove_proc_entry ("driver/rtc", NULL);
- misc_deregister(&rtc_gen_dev);
-}
-
-
-module_init(rtc_generic_init);
-module_exit(rtc_generic_exit);
-
-MODULE_AUTHOR("Richard Zidlicky");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(RTC_MINOR);
diff --git a/include/asm-generic/rtc.h b/include/asm-generic/rtc.h
deleted file mode 100644
index 4fcff22cd707..000000000000
--- a/include/asm-generic/rtc.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * include/asm-generic/rtc.h
- *
- * Author: Tom Rini <trini@mvista.com>
- *
- * Based on:
- * drivers/char/rtc.c
- *
- * Please read the COPYING file for all license details.
- */
-
-#ifndef __ASM_RTC_H__
-#define __ASM_RTC_H__
-
-#include <linux/rtc.h>
-
-#ifndef get_rtc_time
-#include <linux/mc146818rtc.h>
-#define get_rtc_time mc146818_get_time
-#define set_rtc_time mc146818_set_time
-#endif
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-/* some dummy definitions */
-#define RTC_BATT_BAD 0x100 /* battery bad */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-static inline unsigned int get_rtc_ss(void)
-{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-
-#endif /* __ASM_RTC_H__ */
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread
* [PATCH v3 16/16] char/genrtc: remove the rest of the driver
2016-04-27 22:34 ` Arnd Bergmann
` (31 preceding siblings ...)
(?)
@ 2016-04-27 22:34 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-04-27 22:34 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Arnd Bergmann, geert, deller, benh, mpe, dalias, dhowells,
linux-alpha, a.zummo, linux-kernel, linux-parisc, linuxppc-dev,
linux-sh, linux-m68k, rtc-linux, linux-arch
No architecture uses the genrtc driver any more, so let's kill it off
for good. This now also includes asm-generic/rtc.h, which is otherwise
completely unused.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/char/Kconfig | 26 ---
drivers/char/Makefile | 1 -
drivers/char/genrtc.c | 539 ----------------------------------------------
include/asm-generic/rtc.h | 51 -----
4 files changed, 617 deletions(-)
delete mode 100644 drivers/char/genrtc.c
delete mode 100644 include/asm-generic/rtc.h
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index a81f0eb9f71e..0d40fbd21c26 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -325,32 +325,6 @@ config JS_RTC
To compile this driver as a module, choose M here: the
module will be called js-rtc.
-config OLD_GEN_RTC
- tristate "Generic /dev/rtc emulation"
- depends on RTC!=y
- depends on BROKEN
- ---help---
- If you say Y here and create a character special file /dev/rtc with
- major number 10 and minor number 135 using mknod ("man mknod"), you
- will get access to the real time clock (or hardware clock) built
- into your computer.
-
- It reports status information via the file /proc/driver/rtc and its
- behaviour is set by various ioctls on /dev/rtc. If you enable the
- "extended RTC operation" below it will also provide an emulation
- for RTC_UIE which is required by some programs and may improve
- precision in some cases.
-
- To compile this driver as a module, choose M here: the
- module will be called genrtc.
-
-config GEN_RTC_X
- bool "Extended RTC operation"
- depends on GEN_RTC
- help
- Provides an emulation for RTC_UIE which is required by some programs
- and may improve precision of the generic RTC support in some cases.
-
config EFI_RTC
bool "EFI Real Time Clock Services"
depends on IA64
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index fc0905aa7373..f33f5e35df9c 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -25,7 +25,6 @@ obj-$(CONFIG_APPLICOM) += applicom.o
obj-$(CONFIG_SONYPI) += sonypi.o
obj-$(CONFIG_RTC) += rtc.o
obj-$(CONFIG_HPET) += hpet.o
-obj-$(CONFIG_OLD_GEN_RTC) += genrtc.o
obj-$(CONFIG_EFI_RTC) += efirtc.o
obj-$(CONFIG_DS1302) += ds1302.o
obj-$(CONFIG_XILINX_HWICAP) += xilinx_hwicap/
diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
deleted file mode 100644
index 4f943759d376..000000000000
--- a/drivers/char/genrtc.c
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- * Real Time Clock interface for
- * - q40 and other m68k machines,
- * - HP PARISC machines
- * - PowerPC machines
- * emulate some RTC irq capabilities in software
- *
- * Copyright (C) 1999 Richard Zidlicky
- *
- * based on Paul Gortmaker's rtc.c device and
- * Sam Creasey Generic rtc driver
- *
- * This driver allows use of the real time clock (built into
- * nearly all computers) from user space. It exports the /dev/rtc
- * interface supporting various ioctl() and also the /proc/driver/rtc
- * pseudo-file for status information.
- *
- * The ioctls can be used to set the interrupt behaviour where
- * supported.
- *
- * The /dev/rtc interface will block on reads until an interrupt
- * has been received. If a RTC interrupt has already happened,
- * it will output an unsigned long and then block. The output value
- * contains the interrupt status in the low byte and the number of
- * interrupts since the last read in the remaining high bytes. The
- * /dev/rtc interface can also be used with the select(2) call.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
-
- * 1.01 fix for 2.3.X rz@linux-m68k.org
- * 1.02 merged with code from genrtc.c rz@linux-m68k.org
- * 1.03 make it more portable zippel@linux-m68k.org
- * 1.04 removed useless timer code rz@linux-m68k.org
- * 1.05 portable RTC_UIE emulation rz@linux-m68k.org
- * 1.06 set_rtc_time can return an error trini@kernel.crashing.org
- * 1.07 ported to HP PARISC (hppa) Helge Deller <deller@gmx.de>
- */
-
-#define RTC_VERSION "1.07"
-
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/errno.h>
-#include <linux/miscdevice.h>
-#include <linux/fcntl.h>
-
-#include <linux/rtc.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/mutex.h>
-#include <linux/workqueue.h>
-
-#include <asm/uaccess.h>
-#include <asm/rtc.h>
-
-/*
- * We sponge a minor off of the misc major. No need slurping
- * up another valuable major dev number for this. If you add
- * an ioctl, make sure you don't conflict with SPARC's RTC
- * ioctls.
- */
-
-static DEFINE_MUTEX(gen_rtc_mutex);
-static DECLARE_WAIT_QUEUE_HEAD(gen_rtc_wait);
-
-/*
- * Bits in gen_rtc_status.
- */
-
-#define RTC_IS_OPEN 0x01 /* means /dev/rtc is in use */
-
-static unsigned char gen_rtc_status; /* bitmapped status byte. */
-static unsigned long gen_rtc_irq_data; /* our output to the world */
-
-/* months start at 0 now */
-static unsigned char days_in_mo[] =
-{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-
-static int irq_active;
-
-#ifdef CONFIG_GEN_RTC_X
-static struct work_struct genrtc_task;
-static struct timer_list timer_task;
-
-static unsigned int oldsecs;
-static int lostint;
-static unsigned long tt_exp;
-
-static void gen_rtc_timer(unsigned long data);
-
-static volatile int stask_active; /* schedule_work */
-static volatile int ttask_active; /* timer_task */
-static int stop_rtc_timers; /* don't requeue tasks */
-static DEFINE_SPINLOCK(gen_rtc_lock);
-
-static void gen_rtc_interrupt(unsigned long arg);
-
-/*
- * Routine to poll RTC seconds field for change as often as possible,
- * after first RTC_UIE use timer to reduce polling
- */
-static void genrtc_troutine(struct work_struct *work)
-{
- unsigned int tmp = get_rtc_ss();
-
- if (stop_rtc_timers) {
- stask_active = 0;
- return;
- }
-
- if (oldsecs != tmp){
- oldsecs = tmp;
-
- timer_task.function = gen_rtc_timer;
- timer_task.expires = jiffies + HZ - (HZ/10);
- tt_exp=timer_task.expires;
- ttask_active=1;
- stask_active=0;
- add_timer(&timer_task);
-
- gen_rtc_interrupt(0);
- } else if (schedule_work(&genrtc_task) == 0)
- stask_active = 0;
-}
-
-static void gen_rtc_timer(unsigned long data)
-{
- lostint = get_rtc_ss() - oldsecs ;
- if (lostint<0)
- lostint = 60 - lostint;
- if (time_after(jiffies, tt_exp))
- printk(KERN_INFO "genrtc: timer task delayed by %ld jiffies\n",
- jiffies-tt_exp);
- ttask_active=0;
- stask_active=1;
- if ((schedule_work(&genrtc_task) == 0))
- stask_active = 0;
-}
-
-/*
- * call gen_rtc_interrupt function to signal an RTC_UIE,
- * arg is unused.
- * Could be invoked either from a real interrupt handler or
- * from some routine that periodically (eg 100HZ) monitors
- * whether RTC_SECS changed
- */
-static void gen_rtc_interrupt(unsigned long arg)
-{
- /* We store the status in the low byte and the number of
- * interrupts received since the last read in the remainder
- * of rtc_irq_data. */
-
- gen_rtc_irq_data += 0x100;
- gen_rtc_irq_data &= ~0xff;
- gen_rtc_irq_data |= RTC_UIE;
-
- if (lostint){
- printk("genrtc: system delaying clock ticks?\n");
- /* increment count so that userspace knows something is wrong */
- gen_rtc_irq_data += ((lostint-1)<<8);
- lostint = 0;
- }
-
- wake_up_interruptible(&gen_rtc_wait);
-}
-
-/*
- * Now all the various file operations that we export.
- */
-static ssize_t gen_rtc_read(struct file *file, char __user *buf,
- size_t count, loff_t *ppos)
-{
- unsigned long data;
- ssize_t retval;
-
- if (count != sizeof (unsigned int) && count != sizeof (unsigned long))
- return -EINVAL;
-
- if (file->f_flags & O_NONBLOCK && !gen_rtc_irq_data)
- return -EAGAIN;
-
- retval = wait_event_interruptible(gen_rtc_wait,
- (data = xchg(&gen_rtc_irq_data, 0)));
- if (retval)
- goto out;
-
- /* first test allows optimizer to nuke this case for 32-bit machines */
- if (sizeof (int) != sizeof (long) && count == sizeof (unsigned int)) {
- unsigned int uidata = data;
- retval = put_user(uidata, (unsigned int __user *)buf) ?:
- sizeof(unsigned int);
- }
- else {
- retval = put_user(data, (unsigned long __user *)buf) ?:
- sizeof(unsigned long);
- }
-out:
- return retval;
-}
-
-static unsigned int gen_rtc_poll(struct file *file,
- struct poll_table_struct *wait)
-{
- poll_wait(file, &gen_rtc_wait, wait);
- if (gen_rtc_irq_data != 0)
- return POLLIN | POLLRDNORM;
- return 0;
-}
-
-#endif
-
-/*
- * Used to disable/enable interrupts, only RTC_UIE supported
- * We also clear out any old irq data after an ioctl() that
- * meddles with the interrupt enable/disable bits.
- */
-
-static inline void gen_clear_rtc_irq_bit(unsigned char bit)
-{
-#ifdef CONFIG_GEN_RTC_X
- stop_rtc_timers = 1;
- if (ttask_active){
- del_timer_sync(&timer_task);
- ttask_active = 0;
- }
- while (stask_active)
- schedule();
-
- spin_lock(&gen_rtc_lock);
- irq_active = 0;
- spin_unlock(&gen_rtc_lock);
-#endif
-}
-
-static inline int gen_set_rtc_irq_bit(unsigned char bit)
-{
-#ifdef CONFIG_GEN_RTC_X
- spin_lock(&gen_rtc_lock);
- if ( !irq_active ) {
- irq_active = 1;
- stop_rtc_timers = 0;
- lostint = 0;
- INIT_WORK(&genrtc_task, genrtc_troutine);
- oldsecs = get_rtc_ss();
- init_timer(&timer_task);
-
- stask_active = 1;
- if (schedule_work(&genrtc_task) == 0){
- stask_active = 0;
- }
- }
- spin_unlock(&gen_rtc_lock);
- gen_rtc_irq_data = 0;
- return 0;
-#else
- return -EINVAL;
-#endif
-}
-
-static int gen_rtc_ioctl(struct file *file,
- unsigned int cmd, unsigned long arg)
-{
- struct rtc_time wtime;
- struct rtc_pll_info pll;
- void __user *argp = (void __user *)arg;
-
- switch (cmd) {
-
- case RTC_PLL_GET:
- if (get_rtc_pll(&pll))
- return -EINVAL;
- else
- return copy_to_user(argp, &pll, sizeof pll) ? -EFAULT : 0;
-
- case RTC_PLL_SET:
- if (!capable(CAP_SYS_TIME))
- return -EACCES;
- if (copy_from_user(&pll, argp, sizeof(pll)))
- return -EFAULT;
- return set_rtc_pll(&pll);
-
- case RTC_UIE_OFF: /* disable ints from RTC updates. */
- gen_clear_rtc_irq_bit(RTC_UIE);
- return 0;
-
- case RTC_UIE_ON: /* enable ints for RTC updates. */
- return gen_set_rtc_irq_bit(RTC_UIE);
-
- case RTC_RD_TIME: /* Read the time/date from RTC */
- /* this doesn't get week-day, who cares */
- memset(&wtime, 0, sizeof(wtime));
- get_rtc_time(&wtime);
-
- return copy_to_user(argp, &wtime, sizeof(wtime)) ? -EFAULT : 0;
-
- case RTC_SET_TIME: /* Set the RTC */
- {
- int year;
- unsigned char leap_yr;
-
- if (!capable(CAP_SYS_TIME))
- return -EACCES;
-
- if (copy_from_user(&wtime, argp, sizeof(wtime)))
- return -EFAULT;
-
- year = wtime.tm_year + 1900;
- leap_yr = ((!(year % 4) && (year % 100)) ||
- !(year % 400));
-
- if ((wtime.tm_mon < 0 || wtime.tm_mon > 11) || (wtime.tm_mday < 1))
- return -EINVAL;
-
- if (wtime.tm_mday < 0 || wtime.tm_mday >
- (days_in_mo[wtime.tm_mon] + ((wtime.tm_mon == 1) && leap_yr)))
- return -EINVAL;
-
- if (wtime.tm_hour < 0 || wtime.tm_hour >= 24 ||
- wtime.tm_min < 0 || wtime.tm_min >= 60 ||
- wtime.tm_sec < 0 || wtime.tm_sec >= 60)
- return -EINVAL;
-
- return set_rtc_time(&wtime);
- }
- }
-
- return -EINVAL;
-}
-
-static long gen_rtc_unlocked_ioctl(struct file *file, unsigned int cmd,
- unsigned long arg)
-{
- int ret;
-
- mutex_lock(&gen_rtc_mutex);
- ret = gen_rtc_ioctl(file, cmd, arg);
- mutex_unlock(&gen_rtc_mutex);
-
- return ret;
-}
-
-/*
- * We enforce only one user at a time here with the open/close.
- * Also clear the previous interrupt data on an open, and clean
- * up things on a close.
- */
-
-static int gen_rtc_open(struct inode *inode, struct file *file)
-{
- mutex_lock(&gen_rtc_mutex);
- if (gen_rtc_status & RTC_IS_OPEN) {
- mutex_unlock(&gen_rtc_mutex);
- return -EBUSY;
- }
-
- gen_rtc_status |= RTC_IS_OPEN;
- gen_rtc_irq_data = 0;
- irq_active = 0;
- mutex_unlock(&gen_rtc_mutex);
-
- return 0;
-}
-
-static int gen_rtc_release(struct inode *inode, struct file *file)
-{
- /*
- * Turn off all interrupts once the device is no longer
- * in use and clear the data.
- */
-
- gen_clear_rtc_irq_bit(RTC_PIE|RTC_AIE|RTC_UIE);
-
- gen_rtc_status &= ~RTC_IS_OPEN;
- return 0;
-}
-
-
-#ifdef CONFIG_PROC_FS
-
-/*
- * Info exported via "/proc/driver/rtc".
- */
-
-static int gen_rtc_proc_show(struct seq_file *m, void *v)
-{
- struct rtc_time tm;
- unsigned int flags;
- struct rtc_pll_info pll;
-
- flags = get_rtc_time(&tm);
-
- seq_printf(m,
- "rtc_time\t: %02d:%02d:%02d\n"
- "rtc_date\t: %04d-%02d-%02d\n"
- "rtc_epoch\t: %04u\n",
- tm.tm_hour, tm.tm_min, tm.tm_sec,
- tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, 1900);
-
- tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
-
- seq_puts(m, "alarm\t\t: ");
- if (tm.tm_hour <= 24)
- seq_printf(m, "%02d:", tm.tm_hour);
- else
- seq_puts(m, "**:");
-
- if (tm.tm_min <= 59)
- seq_printf(m, "%02d:", tm.tm_min);
- else
- seq_puts(m, "**:");
-
- if (tm.tm_sec <= 59)
- seq_printf(m, "%02d\n", tm.tm_sec);
- else
- seq_puts(m, "**\n");
-
- seq_printf(m,
- "DST_enable\t: %s\n"
- "BCD\t\t: %s\n"
- "24hr\t\t: %s\n"
- "square_wave\t: %s\n"
- "alarm_IRQ\t: %s\n"
- "update_IRQ\t: %s\n"
- "periodic_IRQ\t: %s\n"
- "periodic_freq\t: %ld\n"
- "batt_status\t: %s\n",
- (flags & RTC_DST_EN) ? "yes" : "no",
- (flags & RTC_DM_BINARY) ? "no" : "yes",
- (flags & RTC_24H) ? "yes" : "no",
- (flags & RTC_SQWE) ? "yes" : "no",
- (flags & RTC_AIE) ? "yes" : "no",
- irq_active ? "yes" : "no",
- (flags & RTC_PIE) ? "yes" : "no",
- 0L /* freq */,
- (flags & RTC_BATT_BAD) ? "bad" : "okay");
- if (!get_rtc_pll(&pll))
- seq_printf(m,
- "PLL adjustment\t: %d\n"
- "PLL max +ve adjustment\t: %d\n"
- "PLL max -ve adjustment\t: %d\n"
- "PLL +ve adjustment factor\t: %d\n"
- "PLL -ve adjustment factor\t: %d\n"
- "PLL frequency\t: %ld\n",
- pll.pll_value,
- pll.pll_max,
- pll.pll_min,
- pll.pll_posmult,
- pll.pll_negmult,
- pll.pll_clock);
- return 0;
-}
-
-static int gen_rtc_proc_open(struct inode *inode, struct file *file)
-{
- return single_open(file, gen_rtc_proc_show, NULL);
-}
-
-static const struct file_operations gen_rtc_proc_fops = {
- .open = gen_rtc_proc_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = single_release,
-};
-
-static int __init gen_rtc_proc_init(void)
-{
- struct proc_dir_entry *r;
-
- r = proc_create("driver/rtc", 0, NULL, &gen_rtc_proc_fops);
- if (!r)
- return -ENOMEM;
- return 0;
-}
-#else
-static inline int gen_rtc_proc_init(void) { return 0; }
-#endif /* CONFIG_PROC_FS */
-
-
-/*
- * The various file operations we support.
- */
-
-static const struct file_operations gen_rtc_fops = {
- .owner = THIS_MODULE,
-#ifdef CONFIG_GEN_RTC_X
- .read = gen_rtc_read,
- .poll = gen_rtc_poll,
-#endif
- .unlocked_ioctl = gen_rtc_unlocked_ioctl,
- .open = gen_rtc_open,
- .release = gen_rtc_release,
- .llseek = noop_llseek,
-};
-
-static struct miscdevice rtc_gen_dev =
-{
- .minor = RTC_MINOR,
- .name = "rtc",
- .fops = &gen_rtc_fops,
-};
-
-static int __init rtc_generic_init(void)
-{
- int retval;
-
- printk(KERN_INFO "Generic RTC Driver v%s\n", RTC_VERSION);
-
- retval = misc_register(&rtc_gen_dev);
- if (retval < 0)
- return retval;
-
- retval = gen_rtc_proc_init();
- if (retval) {
- misc_deregister(&rtc_gen_dev);
- return retval;
- }
-
- return 0;
-}
-
-static void __exit rtc_generic_exit(void)
-{
- remove_proc_entry ("driver/rtc", NULL);
- misc_deregister(&rtc_gen_dev);
-}
-
-
-module_init(rtc_generic_init);
-module_exit(rtc_generic_exit);
-
-MODULE_AUTHOR("Richard Zidlicky");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(RTC_MINOR);
diff --git a/include/asm-generic/rtc.h b/include/asm-generic/rtc.h
deleted file mode 100644
index 4fcff22cd707..000000000000
--- a/include/asm-generic/rtc.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * include/asm-generic/rtc.h
- *
- * Author: Tom Rini <trini@mvista.com>
- *
- * Based on:
- * drivers/char/rtc.c
- *
- * Please read the COPYING file for all license details.
- */
-
-#ifndef __ASM_RTC_H__
-#define __ASM_RTC_H__
-
-#include <linux/rtc.h>
-
-#ifndef get_rtc_time
-#include <linux/mc146818rtc.h>
-#define get_rtc_time mc146818_get_time
-#define set_rtc_time mc146818_set_time
-#endif
-
-#define RTC_PIE 0x40 /* periodic interrupt enable */
-#define RTC_AIE 0x20 /* alarm interrupt enable */
-#define RTC_UIE 0x10 /* update-finished interrupt enable */
-
-/* some dummy definitions */
-#define RTC_BATT_BAD 0x100 /* battery bad */
-#define RTC_SQWE 0x08 /* enable square-wave output */
-#define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */
-#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
-#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
-
-static inline unsigned int get_rtc_ss(void)
-{
- struct rtc_time h;
-
- get_rtc_time(&h);
- return h.tm_sec;
-}
-
-static inline int get_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-static inline int set_rtc_pll(struct rtc_pll_info *pll)
-{
- return -EINVAL;
-}
-
-#endif /* __ASM_RTC_H__ */
--
2.7.0
^ permalink raw reply related [flat|nested] 144+ messages in thread* Re: [PATCH v3 00/16] genrtc removal
2016-04-27 22:34 ` Arnd Bergmann
(?)
(?)
@ 2016-04-28 7:48 ` Geert Uytterhoeven
-1 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-04-28 7:48 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> I ended up stuffing the two patch series into one, as they are now
> more dependent on one another. This now thoroughly removes the
> genrtc driver including the asm/rtc.h headers it uses. For all
> architectures that still have a meaningful asm/rtc.h, this goes
> through two stages:
>
> 1) make the rtc-generic implementation independent of asm/rtc.h
> 2) remove the asm/rtc.h header and disallow the gen_rtc driver
>
> As the last step, the driver itself gets removed.
In general, after fixing the minor nit:
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
For the m68k bits:
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 144+ messages in thread* [rtc-linux] Re: [PATCH v3 00/16] genrtc removal
@ 2016-04-28 7:48 ` Geert Uytterhoeven
0 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-04-28 7:48 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> I ended up stuffing the two patch series into one, as they are now
> more dependent on one another. This now thoroughly removes the
> genrtc driver including the asm/rtc.h headers it uses. For all
> architectures that still have a meaningful asm/rtc.h, this goes
> through two stages:
>
> 1) make the rtc-generic implementation independent of asm/rtc.h
> 2) remove the asm/rtc.h header and disallow the gen_rtc driver
>
> As the last step, the driver itself gets removed.
In general, after fixing the minor nit:
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
For the m68k bits:
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 00/16] genrtc removal
@ 2016-04-28 7:48 ` Geert Uytterhoeven
0 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-04-28 7:48 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> I ended up stuffing the two patch series into one, as they are now
> more dependent on one another. This now thoroughly removes the
> genrtc driver including the asm/rtc.h headers it uses. For all
> architectures that still have a meaningful asm/rtc.h, this goes
> through two stages:
>
> 1) make the rtc-generic implementation independent of asm/rtc.h
> 2) remove the asm/rtc.h header and disallow the gen_rtc driver
>
> As the last step, the driver itself gets removed.
In general, after fixing the minor nit:
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
For the m68k bits:
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 00/16] genrtc removal
@ 2016-04-28 7:48 ` Geert Uytterhoeven
0 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-04-28 7:48 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> I ended up stuffing the two patch series into one, as they are now
> more dependent on one another. This now thoroughly removes the
> genrtc driver including the asm/rtc.h headers it uses. For all
> architectures that still have a meaningful asm/rtc.h, this goes
> through two stages:
>
> 1) make the rtc-generic implementation independent of asm/rtc.h
> 2) remove the asm/rtc.h header and disallow the gen_rtc driver
>
> As the last step, the driver itself gets removed.
In general, after fixing the minor nit:
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
For the m68k bits:
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 00/16] genrtc removal
2016-04-28 7:48 ` Geert Uytterhoeven
` (3 preceding siblings ...)
(?)
@ 2016-05-02 8:45 ` Geert Uytterhoeven
-1 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-05-02 8:45 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
Hi Arnd,
On Thu, Apr 28, 2016 at 9:48 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
>> I ended up stuffing the two patch series into one, as they are now
>> more dependent on one another. This now thoroughly removes the
>> genrtc driver including the asm/rtc.h headers it uses. For all
>> architectures that still have a meaningful asm/rtc.h, this goes
>> through two stages:
>>
>> 1) make the rtc-generic implementation independent of asm/rtc.h
>> 2) remove the asm/rtc.h header and disallow the gen_rtc driver
>>
>> As the last step, the driver itself gets removed.
>
> In general, after fixing the minor nit:
> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
>
> For the m68k bits:
> Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
More build coverage uncovered two build failures on m68k due to "[PATCH v3
02/16] rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h":
bvme6000_defconfig:
In file included from arch/m68k/bvme6000/rtc.c:19:
include/linux/mc146818rtc.h: In function ‘mc146818_is_updating’:
include/linux/mc146818rtc.h:138: error: implicit declaration of
function ‘CMOS_READ’
include/linux/mc146818rtc.h: In function ‘mc146818_get_time’:
include/linux/mc146818rtc.h:189: error: ‘RTC_ALWAYS_BCD’
undeclared (first use in this function)
include/linux/mc146818rtc.h:189: error: (Each undeclared
identifier is reported only once
include/linux/mc146818rtc.h:189: error: for each function it appears in.)
include/linux/mc146818rtc.h: In function ‘mc146818_set_time’:
include/linux/mc146818rtc.h:279: error: ‘RTC_ALWAYS_BCD’
undeclared (first use in this function)
include/linux/mc146818rtc.h:290: error: implicit declaration of
function ‘CMOS_WRITE’
mvme16x_defconfig:
In file included from arch/m68k/mvme16x/rtc.c:18:
include/linux/mc146818rtc.h: In function ‘mc146818_is_updating’:
include/linux/mc146818rtc.h:138: error: implicit declaration of
function ‘CMOS_READ’
include/linux/mc146818rtc.h: In function ‘mc146818_get_time’:
include/linux/mc146818rtc.h:189: error: ‘RTC_ALWAYS_BCD’
undeclared (first use in this function)
include/linux/mc146818rtc.h:189: error: (Each undeclared
identifier is reported only once
include/linux/mc146818rtc.h:189: error: for each function it appears in.)
include/linux/mc146818rtc.h: In function ‘mc146818_set_time’:
include/linux/mc146818rtc.h:279: error: ‘RTC_ALWAYS_BCD’
undeclared (first use in this function)
include/linux/mc146818rtc.h:290: error: implicit declaration of
function ‘CMOS_WRITE’
These do not show up with a multi-platform config including Atari
support, as arch/m68k/include/asm/mc146818rtc.h provides a definition of
CMOS_READ() if CONFIG_ATARI=y.
Fortunately the fixes are simple: replace <linux/mc146818rtc.h> by
<linux/rtc.h>. Will send patches to fix...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 00/16] genrtc removal
@ 2016-05-02 8:45 ` Geert Uytterhoeven
0 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-05-02 8:45 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
Hi Arnd,
On Thu, Apr 28, 2016 at 9:48 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
>> I ended up stuffing the two patch series into one, as they are now
>> more dependent on one another. This now thoroughly removes the
>> genrtc driver including the asm/rtc.h headers it uses. For all
>> architectures that still have a meaningful asm/rtc.h, this goes
>> through two stages:
>>
>> 1) make the rtc-generic implementation independent of asm/rtc.h
>> 2) remove the asm/rtc.h header and disallow the gen_rtc driver
>>
>> As the last step, the driver itself gets removed.
>
> In general, after fixing the minor nit:
> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
>
> For the m68k bits:
> Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
More build coverage uncovered two build failures on m68k due to "[PATCH v3
02/16] rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h":
bvme6000_defconfig:
In file included from arch/m68k/bvme6000/rtc.c:19:
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_is_updating=
=E2=80=99:
include/linux/mc146818rtc.h:138: error: implicit declaration of
function =E2=80=98CMOS_READ=E2=80=99
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_get_time=E2=
=80=99:
include/linux/mc146818rtc.h:189: error: =E2=80=98RTC_ALWAYS_BCD=E2=80=
=99
undeclared (first use in this function)
include/linux/mc146818rtc.h:189: error: (Each undeclared
identifier is reported only once
include/linux/mc146818rtc.h:189: error: for each function it appears in=
.)
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_set_time=E2=
=80=99:
include/linux/mc146818rtc.h:279: error: =E2=80=98RTC_ALWAYS_BCD=E2=80=
=99
undeclared (first use in this function)
include/linux/mc146818rtc.h:290: error: implicit declaration of
function =E2=80=98CMOS_WRITE=E2=80=99
mvme16x_defconfig:
In file included from arch/m68k/mvme16x/rtc.c:18:
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_is_updating=
=E2=80=99:
include/linux/mc146818rtc.h:138: error: implicit declaration of
function =E2=80=98CMOS_READ=E2=80=99
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_get_time=E2=
=80=99:
include/linux/mc146818rtc.h:189: error: =E2=80=98RTC_ALWAYS_BCD=E2=80=
=99
undeclared (first use in this function)
include/linux/mc146818rtc.h:189: error: (Each undeclared
identifier is reported only once
include/linux/mc146818rtc.h:189: error: for each function it appears in=
.)
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_set_time=E2=
=80=99:
include/linux/mc146818rtc.h:279: error: =E2=80=98RTC_ALWAYS_BCD=E2=80=
=99
undeclared (first use in this function)
include/linux/mc146818rtc.h:290: error: implicit declaration of
function =E2=80=98CMOS_WRITE=E2=80=99
These do not show up with a multi-platform config including Atari
support, as arch/m68k/include/asm/mc146818rtc.h provides a definition of
CMOS_READ() if CONFIG_ATARI=3Dy.
Fortunately the fixes are simple: replace <linux/mc146818rtc.h> by
<linux/rtc.h>. Will send patches to fix...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k=
.org
In personal conversations with technical people, I call myself a hacker. Bu=
t
when I'm talking to journalists I just say "programmer" or something like t=
hat.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 00/16] genrtc removal
@ 2016-05-02 8:45 ` Geert Uytterhoeven
0 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-05-02 8:45 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
Hi Arnd,
On Thu, Apr 28, 2016 at 9:48 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
>> I ended up stuffing the two patch series into one, as they are now
>> more dependent on one another. This now thoroughly removes the
>> genrtc driver including the asm/rtc.h headers it uses. For all
>> architectures that still have a meaningful asm/rtc.h, this goes
>> through two stages:
>>
>> 1) make the rtc-generic implementation independent of asm/rtc.h
>> 2) remove the asm/rtc.h header and disallow the gen_rtc driver
>>
>> As the last step, the driver itself gets removed.
>
> In general, after fixing the minor nit:
> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
>
> For the m68k bits:
> Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
More build coverage uncovered two build failures on m68k due to "[PATCH v3
02/16] rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h":
bvme6000_defconfig:
In file included from arch/m68k/bvme6000/rtc.c:19:
include/linux/mc146818rtc.h: In function ‘mc146818_is_updating’:
include/linux/mc146818rtc.h:138: error: implicit declaration of
function ‘CMOS_READ’
include/linux/mc146818rtc.h: In function ‘mc146818_get_time’:
include/linux/mc146818rtc.h:189: error: ‘RTC_ALWAYS_BCD’
undeclared (first use in this function)
include/linux/mc146818rtc.h:189: error: (Each undeclared
identifier is reported only once
include/linux/mc146818rtc.h:189: error: for each function it appears in.)
include/linux/mc146818rtc.h: In function ‘mc146818_set_time’:
include/linux/mc146818rtc.h:279: error: ‘RTC_ALWAYS_BCD’
undeclared (first use in this function)
include/linux/mc146818rtc.h:290: error: implicit declaration of
function ‘CMOS_WRITE’
mvme16x_defconfig:
In file included from arch/m68k/mvme16x/rtc.c:18:
include/linux/mc146818rtc.h: In function ‘mc146818_is_updating’:
include/linux/mc146818rtc.h:138: error: implicit declaration of
function ‘CMOS_READ’
include/linux/mc146818rtc.h: In function ‘mc146818_get_time’:
include/linux/mc146818rtc.h:189: error: ‘RTC_ALWAYS_BCD’
undeclared (first use in this function)
include/linux/mc146818rtc.h:189: error: (Each undeclared
identifier is reported only once
include/linux/mc146818rtc.h:189: error: for each function it appears in.)
include/linux/mc146818rtc.h: In function ‘mc146818_set_time’:
include/linux/mc146818rtc.h:279: error: ‘RTC_ALWAYS_BCD’
undeclared (first use in this function)
include/linux/mc146818rtc.h:290: error: implicit declaration of
function ‘CMOS_WRITE’
These do not show up with a multi-platform config including Atari
support, as arch/m68k/include/asm/mc146818rtc.h provides a definition of
CMOS_READ() if CONFIG_ATARI=y.
Fortunately the fixes are simple: replace <linux/mc146818rtc.h> by
<linux/rtc.h>. Will send patches to fix...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 144+ messages in thread* [rtc-linux] Re: [PATCH v3 00/16] genrtc removal
@ 2016-05-02 8:45 ` Geert Uytterhoeven
0 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-05-02 8:45 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
Hi Arnd,
On Thu, Apr 28, 2016 at 9:48 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
>> I ended up stuffing the two patch series into one, as they are now
>> more dependent on one another. This now thoroughly removes the
>> genrtc driver including the asm/rtc.h headers it uses. For all
>> architectures that still have a meaningful asm/rtc.h, this goes
>> through two stages:
>>
>> 1) make the rtc-generic implementation independent of asm/rtc.h
>> 2) remove the asm/rtc.h header and disallow the gen_rtc driver
>>
>> As the last step, the driver itself gets removed.
>
> In general, after fixing the minor nit:
> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
>
> For the m68k bits:
> Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
More build coverage uncovered two build failures on m68k due to "[PATCH v3
02/16] rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h":
bvme6000_defconfig:
In file included from arch/m68k/bvme6000/rtc.c:19:
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_is_updating=
=E2=80=99:
include/linux/mc146818rtc.h:138: error: implicit declaration of
function =E2=80=98CMOS_READ=E2=80=99
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_get_time=E2=
=80=99:
include/linux/mc146818rtc.h:189: error: =E2=80=98RTC_ALWAYS_BCD=E2=80=
=99
undeclared (first use in this function)
include/linux/mc146818rtc.h:189: error: (Each undeclared
identifier is reported only once
include/linux/mc146818rtc.h:189: error: for each function it appears in=
.)
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_set_time=E2=
=80=99:
include/linux/mc146818rtc.h:279: error: =E2=80=98RTC_ALWAYS_BCD=E2=80=
=99
undeclared (first use in this function)
include/linux/mc146818rtc.h:290: error: implicit declaration of
function =E2=80=98CMOS_WRITE=E2=80=99
mvme16x_defconfig:
In file included from arch/m68k/mvme16x/rtc.c:18:
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_is_updating=
=E2=80=99:
include/linux/mc146818rtc.h:138: error: implicit declaration of
function =E2=80=98CMOS_READ=E2=80=99
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_get_time=E2=
=80=99:
include/linux/mc146818rtc.h:189: error: =E2=80=98RTC_ALWAYS_BCD=E2=80=
=99
undeclared (first use in this function)
include/linux/mc146818rtc.h:189: error: (Each undeclared
identifier is reported only once
include/linux/mc146818rtc.h:189: error: for each function it appears in=
.)
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_set_time=E2=
=80=99:
include/linux/mc146818rtc.h:279: error: =E2=80=98RTC_ALWAYS_BCD=E2=80=
=99
undeclared (first use in this function)
include/linux/mc146818rtc.h:290: error: implicit declaration of
function =E2=80=98CMOS_WRITE=E2=80=99
These do not show up with a multi-platform config including Atari
support, as arch/m68k/include/asm/mc146818rtc.h provides a definition of
CMOS_READ() if CONFIG_ATARI=3Dy.
Fortunately the fixes are simple: replace <linux/mc146818rtc.h> by
<linux/rtc.h>. Will send patches to fix...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k=
.org
In personal conversations with technical people, I call myself a hacker. Bu=
t
when I'm talking to journalists I just say "programmer" or something like t=
hat.
-- Linus Torvalds
--=20
--=20
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---=20
You received this message because you are subscribed to the Google Groups "=
rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an e=
mail to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 00/16] genrtc removal
@ 2016-05-02 8:45 ` Geert Uytterhoeven
0 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-05-02 8:45 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
Hi Arnd,
On Thu, Apr 28, 2016 at 9:48 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
>> I ended up stuffing the two patch series into one, as they are now
>> more dependent on one another. This now thoroughly removes the
>> genrtc driver including the asm/rtc.h headers it uses. For all
>> architectures that still have a meaningful asm/rtc.h, this goes
>> through two stages:
>>
>> 1) make the rtc-generic implementation independent of asm/rtc.h
>> 2) remove the asm/rtc.h header and disallow the gen_rtc driver
>>
>> As the last step, the driver itself gets removed.
>
> In general, after fixing the minor nit:
> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
>
> For the m68k bits:
> Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
More build coverage uncovered two build failures on m68k due to "[PATCH v3
02/16] rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h":
bvme6000_defconfig:
In file included from arch/m68k/bvme6000/rtc.c:19:
include/linux/mc146818rtc.h: In function ‘mc146818_is_updating’:
include/linux/mc146818rtc.h:138: error: implicit declaration of
function ‘CMOS_READ’
include/linux/mc146818rtc.h: In function ‘mc146818_get_time’:
include/linux/mc146818rtc.h:189: error: ‘RTC_ALWAYS_BCD’
undeclared (first use in this function)
include/linux/mc146818rtc.h:189: error: (Each undeclared
identifier is reported only once
include/linux/mc146818rtc.h:189: error: for each function it appears in.)
include/linux/mc146818rtc.h: In function ‘mc146818_set_time’:
include/linux/mc146818rtc.h:279: error: ‘RTC_ALWAYS_BCD’
undeclared (first use in this function)
include/linux/mc146818rtc.h:290: error: implicit declaration of
function ‘CMOS_WRITE’
mvme16x_defconfig:
In file included from arch/m68k/mvme16x/rtc.c:18:
include/linux/mc146818rtc.h: In function ‘mc146818_is_updating’:
include/linux/mc146818rtc.h:138: error: implicit declaration of
function ‘CMOS_READ’
include/linux/mc146818rtc.h: In function ‘mc146818_get_time’:
include/linux/mc146818rtc.h:189: error: ‘RTC_ALWAYS_BCD’
undeclared (first use in this function)
include/linux/mc146818rtc.h:189: error: (Each undeclared
identifier is reported only once
include/linux/mc146818rtc.h:189: error: for each function it appears in.)
include/linux/mc146818rtc.h: In function ‘mc146818_set_time’:
include/linux/mc146818rtc.h:279: error: ‘RTC_ALWAYS_BCD’
undeclared (first use in this function)
include/linux/mc146818rtc.h:290: error: implicit declaration of
function ‘CMOS_WRITE’
These do not show up with a multi-platform config including Atari
support, as arch/m68k/include/asm/mc146818rtc.h provides a definition of
CMOS_READ() if CONFIG_ATARI=y.
Fortunately the fixes are simple: replace <linux/mc146818rtc.h> by
<linux/rtc.h>. Will send patches to fix...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 00/16] genrtc removal
@ 2016-05-02 8:45 ` Geert Uytterhoeven
0 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-05-02 8:45 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
Hi Arnd,
On Thu, Apr 28, 2016 at 9:48 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote=
:
>> I ended up stuffing the two patch series into one, as they are now
>> more dependent on one another. This now thoroughly removes the
>> genrtc driver including the asm/rtc.h headers it uses. For all
>> architectures that still have a meaningful asm/rtc.h, this goes
>> through two stages:
>>
>> 1) make the rtc-generic implementation independent of asm/rtc.h
>> 2) remove the asm/rtc.h header and disallow the gen_rtc driver
>>
>> As the last step, the driver itself gets removed.
>
> In general, after fixing the minor nit:
> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
>
> For the m68k bits:
> Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
More build coverage uncovered two build failures on m68k due to "[PATCH=
v3
02/16] rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h":
bvme6000_defconfig:
In file included from arch/m68k/bvme6000/rtc.c:19:
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_is_updat=
ing=E2=80=99:
include/linux/mc146818rtc.h:138: error: implicit declaration of
function =E2=80=98CMOS_READ=E2=80=99
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_get_time=
=E2=80=99:
include/linux/mc146818rtc.h:189: error: =E2=80=98RTC_ALWAYS_BCD=E2=80=
=99
undeclared (first use in this function)
include/linux/mc146818rtc.h:189: error: (Each undeclared
identifier is reported only once
include/linux/mc146818rtc.h:189: error: for each function it appear=
s in.)
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_set_time=
=E2=80=99:
include/linux/mc146818rtc.h:279: error: =E2=80=98RTC_ALWAYS_BCD=E2=80=
=99
undeclared (first use in this function)
include/linux/mc146818rtc.h:290: error: implicit declaration of
function =E2=80=98CMOS_WRITE=E2=80=99
mvme16x_defconfig:
In file included from arch/m68k/mvme16x/rtc.c:18:
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_is_updat=
ing=E2=80=99:
include/linux/mc146818rtc.h:138: error: implicit declaration of
function =E2=80=98CMOS_READ=E2=80=99
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_get_time=
=E2=80=99:
include/linux/mc146818rtc.h:189: error: =E2=80=98RTC_ALWAYS_BCD=E2=80=
=99
undeclared (first use in this function)
include/linux/mc146818rtc.h:189: error: (Each undeclared
identifier is reported only once
include/linux/mc146818rtc.h:189: error: for each function it appear=
s in.)
include/linux/mc146818rtc.h: In function =E2=80=98mc146818_set_time=
=E2=80=99:
include/linux/mc146818rtc.h:279: error: =E2=80=98RTC_ALWAYS_BCD=E2=80=
=99
undeclared (first use in this function)
include/linux/mc146818rtc.h:290: error: implicit declaration of
function =E2=80=98CMOS_WRITE=E2=80=99
These do not show up with a multi-platform config including Atari
support, as arch/m68k/include/asm/mc146818rtc.h provides a definition o=
f
CMOS_READ() if CONFIG_ATARI=3Dy.
=46ortunately the fixes are simple: replace <linux/mc146818rtc.h> by
<linux/rtc.h>. Will send patches to fix...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-=
m68k.org
In personal conversations with technical people, I call myself a hacker=
=2E But
when I'm talking to journalists I just say "programmer" or something li=
ke that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 00/16] genrtc removal
2016-04-27 22:34 ` Arnd Bergmann
` (33 preceding siblings ...)
(?)
@ 2016-04-28 7:48 ` Geert Uytterhoeven
-1 siblings, 0 replies; 144+ messages in thread
From: Geert Uytterhoeven @ 2016-04-28 7:48 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Alexandre Belloni, Helge Deller, Benjamin Herrenschmidt,
Michael Ellerman, Rich Felker, David Howells, alpha,
Alessandro Zummo, linux-kernel, Parisc List, linuxppc-dev,
Linux-sh list, linux-m68k, RTCLINUX, Linux-Arch
On Thu, Apr 28, 2016 at 12:34 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> I ended up stuffing the two patch series into one, as they are now
> more dependent on one another. This now thoroughly removes the
> genrtc driver including the asm/rtc.h headers it uses. For all
> architectures that still have a meaningful asm/rtc.h, this goes
> through two stages:
>
> 1) make the rtc-generic implementation independent of asm/rtc.h
> 2) remove the asm/rtc.h header and disallow the gen_rtc driver
>
> As the last step, the driver itself gets removed.
In general, after fixing the minor nit:
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
For the m68k bits:
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 00/16] genrtc removal
2016-04-27 22:34 ` Arnd Bergmann
(?)
(?)
@ 2016-05-03 7:24 ` Alexandre Belloni
-1 siblings, 0 replies; 144+ messages in thread
From: Alexandre Belloni @ 2016-05-03 7:24 UTC (permalink / raw)
To: Arnd Bergmann
Cc: geert, deller, benh, mpe, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch
Hi Arnd,
I see you didn't copy Greg on that series (that may explain his
confusion on the previous patch), do you expect me to take it
through the RTC tree? That is fine but I'd like some acks from him.
On 28/04/2016 at 00:34:14 +0200, Arnd Bergmann wrote :
> I ended up stuffing the two patch series into one, as they are now
> more dependent on one another. This now thoroughly removes the
> genrtc driver including the asm/rtc.h headers it uses. For all
> architectures that still have a meaningful asm/rtc.h, this goes
> through two stages:
>
> 1) make the rtc-generic implementation independent of asm/rtc.h
> 2) remove the asm/rtc.h header and disallow the gen_rtc driver
>
> As the last step, the driver itself gets removed.
>
> Arnd
>
> arch/alpha/include/asm/rtc.h | 1 -
> arch/alpha/kernel/core_marvel.c | 1 -
> arch/alpha/kernel/rtc.c | 6 +-
> arch/frv/include/asm/mc146818rtc.h | 16 -
> arch/h8300/include/asm/mc146818rtc.h | 9 -
> arch/ia64/include/asm/mc146818rtc.h | 10 -
> arch/m68k/amiga/config.c | 1 -
> arch/m68k/apollo/config.c | 1 -
> arch/m68k/bvme6000/config.c | 1 -
> arch/m68k/hp300/config.c | 2 +-
> arch/m68k/include/asm/rtc.h | 79 -----
> arch/m68k/kernel/time.c | 49 +++-
> arch/m68k/mac/config.c | 3 +-
> arch/m68k/mac/misc.c | 1 -
> arch/m68k/mvme147/config.c | 1 -
> arch/m68k/mvme16x/config.c | 1 -
> arch/m68k/q40/config.c | 2 +-
> arch/m68k/sun3/config.c | 1 -
> arch/m68k/sun3/intersil.c | 2 +-
> arch/m68k/sun3x/time.c | 2 +-
> arch/mips/sni/time.c | 1 -
> arch/mn10300/include/asm/rtc.h | 2 -
> arch/mn10300/kernel/rtc.c | 2 +-
> arch/parisc/include/asm/mc146818rtc.h | 9 -
> arch/parisc/include/asm/rtc.h | 131 ---------
> arch/parisc/kernel/time.c | 36 ++-
> arch/powerpc/include/asm/rtc.h | 78 -----
> arch/powerpc/kernel/time.c | 29 +-
> arch/powerpc/platforms/Kconfig | 11 +
> arch/powerpc/platforms/ps3/time.c | 2 +-
> arch/sh/include/asm/mc146818rtc.h | 7 -
> arch/sh/include/asm/rtc.h | 11 -
> arch/sh/kernel/time.c | 32 +-
> arch/x86/include/asm/mc146818rtc.h | 1 -
> arch/x86/include/asm/rtc.h | 1 -
> arch/x86/kernel/hpet.c | 3 +-
> arch/x86/kernel/rtc.c | 3 +-
> arch/x86/platform/efi/efi.c | 1 -
> drivers/acpi/acpi_cmos_rtc.c | 2 +-
> drivers/base/power/trace.c | 6 +-
> drivers/char/Kconfig | 26 --
> drivers/char/Makefile | 1 -
> drivers/char/genrtc.c | 539 ----------------------------------
> drivers/rtc/rtc-cmos.c | 12 +-
> drivers/rtc/rtc-generic.c | 36 +--
> drivers/rtc/rtc-mrst.c | 2 +-
> include/asm-generic/rtc.h | 247 ----------------
> include/linux/mc146818rtc.h | 194 ++++++++++++
> 48 files changed, 358 insertions(+), 1256 deletions(-)
>
> [PATCH v3 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files
> [PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of
> [PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h
> [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
> [PATCH v3 05/16] char/genrtc: remove alpha support
> [PATCH v3 06/16] char/genrtc: remove mn10300 support
> [PATCH v3 07/16] rtc: parisc: provide rtc_class_ops directly
> [PATCH v3 08/16] char/genrtc: remove parisc support
> [PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
> [PATCH v3 10/16] rtc: m68k: provide ioctl for q40
> [PATCH v3 11/16] char/genrtc: remove m68k support
> [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
> [PATCH v3 13/16] char/genrtc: remove powerpc support
> [PATCH v3 14/16] rtc: generic: remove get_rtc_time/set_rtc_time
> [PATCH v3 15/16] char/genrtc: remove asm-generic/rtc.h from mips
> [PATCH v3 16/16] char/genrtc: remove the rest of the driver
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 144+ messages in thread
* [rtc-linux] Re: [PATCH v3 00/16] genrtc removal
@ 2016-05-03 7:24 ` Alexandre Belloni
0 siblings, 0 replies; 144+ messages in thread
From: Alexandre Belloni @ 2016-05-03 7:24 UTC (permalink / raw)
To: Arnd Bergmann
Cc: geert, deller, benh, mpe, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch
Hi Arnd,
I see you didn't copy Greg on that series (that may explain his
confusion on the previous patch), do you expect me to take it
through the RTC tree? That is fine but I'd like some acks from him.
On 28/04/2016 at 00:34:14 +0200, Arnd Bergmann wrote :
> I ended up stuffing the two patch series into one, as they are now
> more dependent on one another. This now thoroughly removes the
> genrtc driver including the asm/rtc.h headers it uses. For all
> architectures that still have a meaningful asm/rtc.h, this goes
> through two stages:
>
> 1) make the rtc-generic implementation independent of asm/rtc.h
> 2) remove the asm/rtc.h header and disallow the gen_rtc driver
>
> As the last step, the driver itself gets removed.
>
> Arnd
>
> arch/alpha/include/asm/rtc.h | 1 -
> arch/alpha/kernel/core_marvel.c | 1 -
> arch/alpha/kernel/rtc.c | 6 +-
> arch/frv/include/asm/mc146818rtc.h | 16 -
> arch/h8300/include/asm/mc146818rtc.h | 9 -
> arch/ia64/include/asm/mc146818rtc.h | 10 -
> arch/m68k/amiga/config.c | 1 -
> arch/m68k/apollo/config.c | 1 -
> arch/m68k/bvme6000/config.c | 1 -
> arch/m68k/hp300/config.c | 2 +-
> arch/m68k/include/asm/rtc.h | 79 -----
> arch/m68k/kernel/time.c | 49 +++-
> arch/m68k/mac/config.c | 3 +-
> arch/m68k/mac/misc.c | 1 -
> arch/m68k/mvme147/config.c | 1 -
> arch/m68k/mvme16x/config.c | 1 -
> arch/m68k/q40/config.c | 2 +-
> arch/m68k/sun3/config.c | 1 -
> arch/m68k/sun3/intersil.c | 2 +-
> arch/m68k/sun3x/time.c | 2 +-
> arch/mips/sni/time.c | 1 -
> arch/mn10300/include/asm/rtc.h | 2 -
> arch/mn10300/kernel/rtc.c | 2 +-
> arch/parisc/include/asm/mc146818rtc.h | 9 -
> arch/parisc/include/asm/rtc.h | 131 ---------
> arch/parisc/kernel/time.c | 36 ++-
> arch/powerpc/include/asm/rtc.h | 78 -----
> arch/powerpc/kernel/time.c | 29 +-
> arch/powerpc/platforms/Kconfig | 11 +
> arch/powerpc/platforms/ps3/time.c | 2 +-
> arch/sh/include/asm/mc146818rtc.h | 7 -
> arch/sh/include/asm/rtc.h | 11 -
> arch/sh/kernel/time.c | 32 +-
> arch/x86/include/asm/mc146818rtc.h | 1 -
> arch/x86/include/asm/rtc.h | 1 -
> arch/x86/kernel/hpet.c | 3 +-
> arch/x86/kernel/rtc.c | 3 +-
> arch/x86/platform/efi/efi.c | 1 -
> drivers/acpi/acpi_cmos_rtc.c | 2 +-
> drivers/base/power/trace.c | 6 +-
> drivers/char/Kconfig | 26 --
> drivers/char/Makefile | 1 -
> drivers/char/genrtc.c | 539 ----------------------------------
> drivers/rtc/rtc-cmos.c | 12 +-
> drivers/rtc/rtc-generic.c | 36 +--
> drivers/rtc/rtc-mrst.c | 2 +-
> include/asm-generic/rtc.h | 247 ----------------
> include/linux/mc146818rtc.h | 194 ++++++++++++
> 48 files changed, 358 insertions(+), 1256 deletions(-)
>
> [PATCH v3 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files
> [PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of
> [PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h
> [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
> [PATCH v3 05/16] char/genrtc: remove alpha support
> [PATCH v3 06/16] char/genrtc: remove mn10300 support
> [PATCH v3 07/16] rtc: parisc: provide rtc_class_ops directly
> [PATCH v3 08/16] char/genrtc: remove parisc support
> [PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
> [PATCH v3 10/16] rtc: m68k: provide ioctl for q40
> [PATCH v3 11/16] char/genrtc: remove m68k support
> [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
> [PATCH v3 13/16] char/genrtc: remove powerpc support
> [PATCH v3 14/16] rtc: generic: remove get_rtc_time/set_rtc_time
> [PATCH v3 15/16] char/genrtc: remove asm-generic/rtc.h from mips
> [PATCH v3 16/16] char/genrtc: remove the rest of the driver
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 00/16] genrtc removal
@ 2016-05-03 7:24 ` Alexandre Belloni
0 siblings, 0 replies; 144+ messages in thread
From: Alexandre Belloni @ 2016-05-03 7:24 UTC (permalink / raw)
To: Arnd Bergmann
Cc: geert, deller, benh, mpe, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch
Hi Arnd,
I see you didn't copy Greg on that series (that may explain his
confusion on the previous patch), do you expect me to take it
through the RTC tree? That is fine but I'd like some acks from him.
On 28/04/2016 at 00:34:14 +0200, Arnd Bergmann wrote :
> I ended up stuffing the two patch series into one, as they are now
> more dependent on one another. This now thoroughly removes the
> genrtc driver including the asm/rtc.h headers it uses. For all
> architectures that still have a meaningful asm/rtc.h, this goes
> through two stages:
>
> 1) make the rtc-generic implementation independent of asm/rtc.h
> 2) remove the asm/rtc.h header and disallow the gen_rtc driver
>
> As the last step, the driver itself gets removed.
>
> Arnd
>
> arch/alpha/include/asm/rtc.h | 1 -
> arch/alpha/kernel/core_marvel.c | 1 -
> arch/alpha/kernel/rtc.c | 6 +-
> arch/frv/include/asm/mc146818rtc.h | 16 -
> arch/h8300/include/asm/mc146818rtc.h | 9 -
> arch/ia64/include/asm/mc146818rtc.h | 10 -
> arch/m68k/amiga/config.c | 1 -
> arch/m68k/apollo/config.c | 1 -
> arch/m68k/bvme6000/config.c | 1 -
> arch/m68k/hp300/config.c | 2 +-
> arch/m68k/include/asm/rtc.h | 79 -----
> arch/m68k/kernel/time.c | 49 +++-
> arch/m68k/mac/config.c | 3 +-
> arch/m68k/mac/misc.c | 1 -
> arch/m68k/mvme147/config.c | 1 -
> arch/m68k/mvme16x/config.c | 1 -
> arch/m68k/q40/config.c | 2 +-
> arch/m68k/sun3/config.c | 1 -
> arch/m68k/sun3/intersil.c | 2 +-
> arch/m68k/sun3x/time.c | 2 +-
> arch/mips/sni/time.c | 1 -
> arch/mn10300/include/asm/rtc.h | 2 -
> arch/mn10300/kernel/rtc.c | 2 +-
> arch/parisc/include/asm/mc146818rtc.h | 9 -
> arch/parisc/include/asm/rtc.h | 131 ---------
> arch/parisc/kernel/time.c | 36 ++-
> arch/powerpc/include/asm/rtc.h | 78 -----
> arch/powerpc/kernel/time.c | 29 +-
> arch/powerpc/platforms/Kconfig | 11 +
> arch/powerpc/platforms/ps3/time.c | 2 +-
> arch/sh/include/asm/mc146818rtc.h | 7 -
> arch/sh/include/asm/rtc.h | 11 -
> arch/sh/kernel/time.c | 32 +-
> arch/x86/include/asm/mc146818rtc.h | 1 -
> arch/x86/include/asm/rtc.h | 1 -
> arch/x86/kernel/hpet.c | 3 +-
> arch/x86/kernel/rtc.c | 3 +-
> arch/x86/platform/efi/efi.c | 1 -
> drivers/acpi/acpi_cmos_rtc.c | 2 +-
> drivers/base/power/trace.c | 6 +-
> drivers/char/Kconfig | 26 --
> drivers/char/Makefile | 1 -
> drivers/char/genrtc.c | 539 ----------------------------------
> drivers/rtc/rtc-cmos.c | 12 +-
> drivers/rtc/rtc-generic.c | 36 +--
> drivers/rtc/rtc-mrst.c | 2 +-
> include/asm-generic/rtc.h | 247 ----------------
> include/linux/mc146818rtc.h | 194 ++++++++++++
> 48 files changed, 358 insertions(+), 1256 deletions(-)
>
> [PATCH v3 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files
> [PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of
> [PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h
> [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
> [PATCH v3 05/16] char/genrtc: remove alpha support
> [PATCH v3 06/16] char/genrtc: remove mn10300 support
> [PATCH v3 07/16] rtc: parisc: provide rtc_class_ops directly
> [PATCH v3 08/16] char/genrtc: remove parisc support
> [PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
> [PATCH v3 10/16] rtc: m68k: provide ioctl for q40
> [PATCH v3 11/16] char/genrtc: remove m68k support
> [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
> [PATCH v3 13/16] char/genrtc: remove powerpc support
> [PATCH v3 14/16] rtc: generic: remove get_rtc_time/set_rtc_time
> [PATCH v3 15/16] char/genrtc: remove asm-generic/rtc.h from mips
> [PATCH v3 16/16] char/genrtc: remove the rest of the driver
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 00/16] genrtc removal
@ 2016-05-03 7:24 ` Alexandre Belloni
0 siblings, 0 replies; 144+ messages in thread
From: Alexandre Belloni @ 2016-05-03 7:24 UTC (permalink / raw)
To: Arnd Bergmann
Cc: geert, deller, benh, mpe, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch
Hi Arnd,
I see you didn't copy Greg on that series (that may explain his
confusion on the previous patch), do you expect me to take it
through the RTC tree? That is fine but I'd like some acks from him.
On 28/04/2016 at 00:34:14 +0200, Arnd Bergmann wrote :
> I ended up stuffing the two patch series into one, as they are now
> more dependent on one another. This now thoroughly removes the
> genrtc driver including the asm/rtc.h headers it uses. For all
> architectures that still have a meaningful asm/rtc.h, this goes
> through two stages:
>
> 1) make the rtc-generic implementation independent of asm/rtc.h
> 2) remove the asm/rtc.h header and disallow the gen_rtc driver
>
> As the last step, the driver itself gets removed.
>
> Arnd
>
> arch/alpha/include/asm/rtc.h | 1 -
> arch/alpha/kernel/core_marvel.c | 1 -
> arch/alpha/kernel/rtc.c | 6 +-
> arch/frv/include/asm/mc146818rtc.h | 16 -
> arch/h8300/include/asm/mc146818rtc.h | 9 -
> arch/ia64/include/asm/mc146818rtc.h | 10 -
> arch/m68k/amiga/config.c | 1 -
> arch/m68k/apollo/config.c | 1 -
> arch/m68k/bvme6000/config.c | 1 -
> arch/m68k/hp300/config.c | 2 +-
> arch/m68k/include/asm/rtc.h | 79 -----
> arch/m68k/kernel/time.c | 49 +++-
> arch/m68k/mac/config.c | 3 +-
> arch/m68k/mac/misc.c | 1 -
> arch/m68k/mvme147/config.c | 1 -
> arch/m68k/mvme16x/config.c | 1 -
> arch/m68k/q40/config.c | 2 +-
> arch/m68k/sun3/config.c | 1 -
> arch/m68k/sun3/intersil.c | 2 +-
> arch/m68k/sun3x/time.c | 2 +-
> arch/mips/sni/time.c | 1 -
> arch/mn10300/include/asm/rtc.h | 2 -
> arch/mn10300/kernel/rtc.c | 2 +-
> arch/parisc/include/asm/mc146818rtc.h | 9 -
> arch/parisc/include/asm/rtc.h | 131 ---------
> arch/parisc/kernel/time.c | 36 ++-
> arch/powerpc/include/asm/rtc.h | 78 -----
> arch/powerpc/kernel/time.c | 29 +-
> arch/powerpc/platforms/Kconfig | 11 +
> arch/powerpc/platforms/ps3/time.c | 2 +-
> arch/sh/include/asm/mc146818rtc.h | 7 -
> arch/sh/include/asm/rtc.h | 11 -
> arch/sh/kernel/time.c | 32 +-
> arch/x86/include/asm/mc146818rtc.h | 1 -
> arch/x86/include/asm/rtc.h | 1 -
> arch/x86/kernel/hpet.c | 3 +-
> arch/x86/kernel/rtc.c | 3 +-
> arch/x86/platform/efi/efi.c | 1 -
> drivers/acpi/acpi_cmos_rtc.c | 2 +-
> drivers/base/power/trace.c | 6 +-
> drivers/char/Kconfig | 26 --
> drivers/char/Makefile | 1 -
> drivers/char/genrtc.c | 539 ----------------------------------
> drivers/rtc/rtc-cmos.c | 12 +-
> drivers/rtc/rtc-generic.c | 36 +--
> drivers/rtc/rtc-mrst.c | 2 +-
> include/asm-generic/rtc.h | 247 ----------------
> include/linux/mc146818rtc.h | 194 ++++++++++++
> 48 files changed, 358 insertions(+), 1256 deletions(-)
>
> [PATCH v3 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files
> [PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of
> [PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h
> [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
> [PATCH v3 05/16] char/genrtc: remove alpha support
> [PATCH v3 06/16] char/genrtc: remove mn10300 support
> [PATCH v3 07/16] rtc: parisc: provide rtc_class_ops directly
> [PATCH v3 08/16] char/genrtc: remove parisc support
> [PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
> [PATCH v3 10/16] rtc: m68k: provide ioctl for q40
> [PATCH v3 11/16] char/genrtc: remove m68k support
> [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
> [PATCH v3 13/16] char/genrtc: remove powerpc support
> [PATCH v3 14/16] rtc: generic: remove get_rtc_time/set_rtc_time
> [PATCH v3 15/16] char/genrtc: remove asm-generic/rtc.h from mips
> [PATCH v3 16/16] char/genrtc: remove the rest of the driver
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 00/16] genrtc removal
2016-05-03 7:24 ` Alexandre Belloni
(?)
(?)
@ 2016-05-03 10:05 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-05-03 10:05 UTC (permalink / raw)
To: Alexandre Belloni
Cc: geert, deller, benh, mpe, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch, gregkh
On Tuesday 03 May 2016 09:24:18 Alexandre Belloni wrote:
> Hi Arnd,
>
> I see you didn't copy Greg on that series (that may explain his
> confusion on the previous patch), do you expect me to take it
> through the RTC tree? That is fine but I'd like some acks from him.
Yes, that was a mistake. I dropped Greg from one Cc list in v2 when
I split up the RTC changes into the part that was for drivers/rtc
and the other one for Greg's char-misc tree. Then I reused the first
Cc list when I sent a combined series for v3 again. I'll fix that
when I post v4. There are only very small changes in there that
I still need to pick up, so hopefully that will be the last version.
It would be nice if you could take it through your tree then.
Arnd
> On 28/04/2016 at 00:34:14 +0200, Arnd Bergmann wrote :
> > I ended up stuffing the two patch series into one, as they are now
> > more dependent on one another. This now thoroughly removes the
> > genrtc driver including the asm/rtc.h headers it uses. For all
> > architectures that still have a meaningful asm/rtc.h, this goes
> > through two stages:
> >
> > 1) make the rtc-generic implementation independent of asm/rtc.h
> > 2) remove the asm/rtc.h header and disallow the gen_rtc driver
> >
> > As the last step, the driver itself gets removed.
> >
> > Arnd
> >
> > arch/alpha/include/asm/rtc.h | 1 -
> > arch/alpha/kernel/core_marvel.c | 1 -
> > arch/alpha/kernel/rtc.c | 6 +-
> > arch/frv/include/asm/mc146818rtc.h | 16 -
> > arch/h8300/include/asm/mc146818rtc.h | 9 -
> > arch/ia64/include/asm/mc146818rtc.h | 10 -
> > arch/m68k/amiga/config.c | 1 -
> > arch/m68k/apollo/config.c | 1 -
> > arch/m68k/bvme6000/config.c | 1 -
> > arch/m68k/hp300/config.c | 2 +-
> > arch/m68k/include/asm/rtc.h | 79 -----
> > arch/m68k/kernel/time.c | 49 +++-
> > arch/m68k/mac/config.c | 3 +-
> > arch/m68k/mac/misc.c | 1 -
> > arch/m68k/mvme147/config.c | 1 -
> > arch/m68k/mvme16x/config.c | 1 -
> > arch/m68k/q40/config.c | 2 +-
> > arch/m68k/sun3/config.c | 1 -
> > arch/m68k/sun3/intersil.c | 2 +-
> > arch/m68k/sun3x/time.c | 2 +-
> > arch/mips/sni/time.c | 1 -
> > arch/mn10300/include/asm/rtc.h | 2 -
> > arch/mn10300/kernel/rtc.c | 2 +-
> > arch/parisc/include/asm/mc146818rtc.h | 9 -
> > arch/parisc/include/asm/rtc.h | 131 ---------
> > arch/parisc/kernel/time.c | 36 ++-
> > arch/powerpc/include/asm/rtc.h | 78 -----
> > arch/powerpc/kernel/time.c | 29 +-
> > arch/powerpc/platforms/Kconfig | 11 +
> > arch/powerpc/platforms/ps3/time.c | 2 +-
> > arch/sh/include/asm/mc146818rtc.h | 7 -
> > arch/sh/include/asm/rtc.h | 11 -
> > arch/sh/kernel/time.c | 32 +-
> > arch/x86/include/asm/mc146818rtc.h | 1 -
> > arch/x86/include/asm/rtc.h | 1 -
> > arch/x86/kernel/hpet.c | 3 +-
> > arch/x86/kernel/rtc.c | 3 +-
> > arch/x86/platform/efi/efi.c | 1 -
> > drivers/acpi/acpi_cmos_rtc.c | 2 +-
> > drivers/base/power/trace.c | 6 +-
> > drivers/char/Kconfig | 26 --
> > drivers/char/Makefile | 1 -
> > drivers/char/genrtc.c | 539 ----------------------------------
> > drivers/rtc/rtc-cmos.c | 12 +-
> > drivers/rtc/rtc-generic.c | 36 +--
> > drivers/rtc/rtc-mrst.c | 2 +-
> > include/asm-generic/rtc.h | 247 ----------------
> > include/linux/mc146818rtc.h | 194 ++++++++++++
> > 48 files changed, 358 insertions(+), 1256 deletions(-)
> >
> > [PATCH v3 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files
> > [PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of
> > [PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h
> > [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
> > [PATCH v3 05/16] char/genrtc: remove alpha support
> > [PATCH v3 06/16] char/genrtc: remove mn10300 support
> > [PATCH v3 07/16] rtc: parisc: provide rtc_class_ops directly
> > [PATCH v3 08/16] char/genrtc: remove parisc support
> > [PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
> > [PATCH v3 10/16] rtc: m68k: provide ioctl for q40
> > [PATCH v3 11/16] char/genrtc: remove m68k support
> > [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
> > [PATCH v3 13/16] char/genrtc: remove powerpc support
> > [PATCH v3 14/16] rtc: generic: remove get_rtc_time/set_rtc_time
> > [PATCH v3 15/16] char/genrtc: remove asm-generic/rtc.h from mips
> > [PATCH v3 16/16] char/genrtc: remove the rest of the driver
>
>
^ permalink raw reply [flat|nested] 144+ messages in thread
* [rtc-linux] Re: [PATCH v3 00/16] genrtc removal
@ 2016-05-03 10:05 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-05-03 10:05 UTC (permalink / raw)
To: Alexandre Belloni
Cc: geert, deller, benh, mpe, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch, gregkh
On Tuesday 03 May 2016 09:24:18 Alexandre Belloni wrote:
> Hi Arnd,
>
> I see you didn't copy Greg on that series (that may explain his
> confusion on the previous patch), do you expect me to take it
> through the RTC tree? That is fine but I'd like some acks from him.
Yes, that was a mistake. I dropped Greg from one Cc list in v2 when
I split up the RTC changes into the part that was for drivers/rtc
and the other one for Greg's char-misc tree. Then I reused the first
Cc list when I sent a combined series for v3 again. I'll fix that
when I post v4. There are only very small changes in there that
I still need to pick up, so hopefully that will be the last version.
It would be nice if you could take it through your tree then.
Arnd
> On 28/04/2016 at 00:34:14 +0200, Arnd Bergmann wrote :
> > I ended up stuffing the two patch series into one, as they are now
> > more dependent on one another. This now thoroughly removes the
> > genrtc driver including the asm/rtc.h headers it uses. For all
> > architectures that still have a meaningful asm/rtc.h, this goes
> > through two stages:
> >
> > 1) make the rtc-generic implementation independent of asm/rtc.h
> > 2) remove the asm/rtc.h header and disallow the gen_rtc driver
> >
> > As the last step, the driver itself gets removed.
> >
> > Arnd
> >
> > arch/alpha/include/asm/rtc.h | 1 -
> > arch/alpha/kernel/core_marvel.c | 1 -
> > arch/alpha/kernel/rtc.c | 6 +-
> > arch/frv/include/asm/mc146818rtc.h | 16 -
> > arch/h8300/include/asm/mc146818rtc.h | 9 -
> > arch/ia64/include/asm/mc146818rtc.h | 10 -
> > arch/m68k/amiga/config.c | 1 -
> > arch/m68k/apollo/config.c | 1 -
> > arch/m68k/bvme6000/config.c | 1 -
> > arch/m68k/hp300/config.c | 2 +-
> > arch/m68k/include/asm/rtc.h | 79 -----
> > arch/m68k/kernel/time.c | 49 +++-
> > arch/m68k/mac/config.c | 3 +-
> > arch/m68k/mac/misc.c | 1 -
> > arch/m68k/mvme147/config.c | 1 -
> > arch/m68k/mvme16x/config.c | 1 -
> > arch/m68k/q40/config.c | 2 +-
> > arch/m68k/sun3/config.c | 1 -
> > arch/m68k/sun3/intersil.c | 2 +-
> > arch/m68k/sun3x/time.c | 2 +-
> > arch/mips/sni/time.c | 1 -
> > arch/mn10300/include/asm/rtc.h | 2 -
> > arch/mn10300/kernel/rtc.c | 2 +-
> > arch/parisc/include/asm/mc146818rtc.h | 9 -
> > arch/parisc/include/asm/rtc.h | 131 ---------
> > arch/parisc/kernel/time.c | 36 ++-
> > arch/powerpc/include/asm/rtc.h | 78 -----
> > arch/powerpc/kernel/time.c | 29 +-
> > arch/powerpc/platforms/Kconfig | 11 +
> > arch/powerpc/platforms/ps3/time.c | 2 +-
> > arch/sh/include/asm/mc146818rtc.h | 7 -
> > arch/sh/include/asm/rtc.h | 11 -
> > arch/sh/kernel/time.c | 32 +-
> > arch/x86/include/asm/mc146818rtc.h | 1 -
> > arch/x86/include/asm/rtc.h | 1 -
> > arch/x86/kernel/hpet.c | 3 +-
> > arch/x86/kernel/rtc.c | 3 +-
> > arch/x86/platform/efi/efi.c | 1 -
> > drivers/acpi/acpi_cmos_rtc.c | 2 +-
> > drivers/base/power/trace.c | 6 +-
> > drivers/char/Kconfig | 26 --
> > drivers/char/Makefile | 1 -
> > drivers/char/genrtc.c | 539 ----------------------------------
> > drivers/rtc/rtc-cmos.c | 12 +-
> > drivers/rtc/rtc-generic.c | 36 +--
> > drivers/rtc/rtc-mrst.c | 2 +-
> > include/asm-generic/rtc.h | 247 ----------------
> > include/linux/mc146818rtc.h | 194 ++++++++++++
> > 48 files changed, 358 insertions(+), 1256 deletions(-)
> >
> > [PATCH v3 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files
> > [PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of
> > [PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h
> > [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
> > [PATCH v3 05/16] char/genrtc: remove alpha support
> > [PATCH v3 06/16] char/genrtc: remove mn10300 support
> > [PATCH v3 07/16] rtc: parisc: provide rtc_class_ops directly
> > [PATCH v3 08/16] char/genrtc: remove parisc support
> > [PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
> > [PATCH v3 10/16] rtc: m68k: provide ioctl for q40
> > [PATCH v3 11/16] char/genrtc: remove m68k support
> > [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
> > [PATCH v3 13/16] char/genrtc: remove powerpc support
> > [PATCH v3 14/16] rtc: generic: remove get_rtc_time/set_rtc_time
> > [PATCH v3 15/16] char/genrtc: remove asm-generic/rtc.h from mips
> > [PATCH v3 16/16] char/genrtc: remove the rest of the driver
>
>
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 00/16] genrtc removal
@ 2016-05-03 10:05 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-05-03 10:05 UTC (permalink / raw)
To: Alexandre Belloni
Cc: geert, deller, benh, mpe, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch, gregkh
On Tuesday 03 May 2016 09:24:18 Alexandre Belloni wrote:
> Hi Arnd,
>
> I see you didn't copy Greg on that series (that may explain his
> confusion on the previous patch), do you expect me to take it
> through the RTC tree? That is fine but I'd like some acks from him.
Yes, that was a mistake. I dropped Greg from one Cc list in v2 when
I split up the RTC changes into the part that was for drivers/rtc
and the other one for Greg's char-misc tree. Then I reused the first
Cc list when I sent a combined series for v3 again. I'll fix that
when I post v4. There are only very small changes in there that
I still need to pick up, so hopefully that will be the last version.
It would be nice if you could take it through your tree then.
Arnd
> On 28/04/2016 at 00:34:14 +0200, Arnd Bergmann wrote :
> > I ended up stuffing the two patch series into one, as they are now
> > more dependent on one another. This now thoroughly removes the
> > genrtc driver including the asm/rtc.h headers it uses. For all
> > architectures that still have a meaningful asm/rtc.h, this goes
> > through two stages:
> >
> > 1) make the rtc-generic implementation independent of asm/rtc.h
> > 2) remove the asm/rtc.h header and disallow the gen_rtc driver
> >
> > As the last step, the driver itself gets removed.
> >
> > Arnd
> >
> > arch/alpha/include/asm/rtc.h | 1 -
> > arch/alpha/kernel/core_marvel.c | 1 -
> > arch/alpha/kernel/rtc.c | 6 +-
> > arch/frv/include/asm/mc146818rtc.h | 16 -
> > arch/h8300/include/asm/mc146818rtc.h | 9 -
> > arch/ia64/include/asm/mc146818rtc.h | 10 -
> > arch/m68k/amiga/config.c | 1 -
> > arch/m68k/apollo/config.c | 1 -
> > arch/m68k/bvme6000/config.c | 1 -
> > arch/m68k/hp300/config.c | 2 +-
> > arch/m68k/include/asm/rtc.h | 79 -----
> > arch/m68k/kernel/time.c | 49 +++-
> > arch/m68k/mac/config.c | 3 +-
> > arch/m68k/mac/misc.c | 1 -
> > arch/m68k/mvme147/config.c | 1 -
> > arch/m68k/mvme16x/config.c | 1 -
> > arch/m68k/q40/config.c | 2 +-
> > arch/m68k/sun3/config.c | 1 -
> > arch/m68k/sun3/intersil.c | 2 +-
> > arch/m68k/sun3x/time.c | 2 +-
> > arch/mips/sni/time.c | 1 -
> > arch/mn10300/include/asm/rtc.h | 2 -
> > arch/mn10300/kernel/rtc.c | 2 +-
> > arch/parisc/include/asm/mc146818rtc.h | 9 -
> > arch/parisc/include/asm/rtc.h | 131 ---------
> > arch/parisc/kernel/time.c | 36 ++-
> > arch/powerpc/include/asm/rtc.h | 78 -----
> > arch/powerpc/kernel/time.c | 29 +-
> > arch/powerpc/platforms/Kconfig | 11 +
> > arch/powerpc/platforms/ps3/time.c | 2 +-
> > arch/sh/include/asm/mc146818rtc.h | 7 -
> > arch/sh/include/asm/rtc.h | 11 -
> > arch/sh/kernel/time.c | 32 +-
> > arch/x86/include/asm/mc146818rtc.h | 1 -
> > arch/x86/include/asm/rtc.h | 1 -
> > arch/x86/kernel/hpet.c | 3 +-
> > arch/x86/kernel/rtc.c | 3 +-
> > arch/x86/platform/efi/efi.c | 1 -
> > drivers/acpi/acpi_cmos_rtc.c | 2 +-
> > drivers/base/power/trace.c | 6 +-
> > drivers/char/Kconfig | 26 --
> > drivers/char/Makefile | 1 -
> > drivers/char/genrtc.c | 539 ----------------------------------
> > drivers/rtc/rtc-cmos.c | 12 +-
> > drivers/rtc/rtc-generic.c | 36 +--
> > drivers/rtc/rtc-mrst.c | 2 +-
> > include/asm-generic/rtc.h | 247 ----------------
> > include/linux/mc146818rtc.h | 194 ++++++++++++
> > 48 files changed, 358 insertions(+), 1256 deletions(-)
> >
> > [PATCH v3 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files
> > [PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of
> > [PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h
> > [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
> > [PATCH v3 05/16] char/genrtc: remove alpha support
> > [PATCH v3 06/16] char/genrtc: remove mn10300 support
> > [PATCH v3 07/16] rtc: parisc: provide rtc_class_ops directly
> > [PATCH v3 08/16] char/genrtc: remove parisc support
> > [PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
> > [PATCH v3 10/16] rtc: m68k: provide ioctl for q40
> > [PATCH v3 11/16] char/genrtc: remove m68k support
> > [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
> > [PATCH v3 13/16] char/genrtc: remove powerpc support
> > [PATCH v3 14/16] rtc: generic: remove get_rtc_time/set_rtc_time
> > [PATCH v3 15/16] char/genrtc: remove asm-generic/rtc.h from mips
> > [PATCH v3 16/16] char/genrtc: remove the rest of the driver
>
>
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 00/16] genrtc removal
@ 2016-05-03 10:05 ` Arnd Bergmann
0 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-05-03 10:05 UTC (permalink / raw)
To: Alexandre Belloni
Cc: geert, deller, benh, mpe, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch, gregkh
On Tuesday 03 May 2016 09:24:18 Alexandre Belloni wrote:
> Hi Arnd,
>
> I see you didn't copy Greg on that series (that may explain his
> confusion on the previous patch), do you expect me to take it
> through the RTC tree? That is fine but I'd like some acks from him.
Yes, that was a mistake. I dropped Greg from one Cc list in v2 when
I split up the RTC changes into the part that was for drivers/rtc
and the other one for Greg's char-misc tree. Then I reused the first
Cc list when I sent a combined series for v3 again. I'll fix that
when I post v4. There are only very small changes in there that
I still need to pick up, so hopefully that will be the last version.
It would be nice if you could take it through your tree then.
Arnd
> On 28/04/2016 at 00:34:14 +0200, Arnd Bergmann wrote :
> > I ended up stuffing the two patch series into one, as they are now
> > more dependent on one another. This now thoroughly removes the
> > genrtc driver including the asm/rtc.h headers it uses. For all
> > architectures that still have a meaningful asm/rtc.h, this goes
> > through two stages:
> >
> > 1) make the rtc-generic implementation independent of asm/rtc.h
> > 2) remove the asm/rtc.h header and disallow the gen_rtc driver
> >
> > As the last step, the driver itself gets removed.
> >
> > Arnd
> >
> > arch/alpha/include/asm/rtc.h | 1 -
> > arch/alpha/kernel/core_marvel.c | 1 -
> > arch/alpha/kernel/rtc.c | 6 +-
> > arch/frv/include/asm/mc146818rtc.h | 16 -
> > arch/h8300/include/asm/mc146818rtc.h | 9 -
> > arch/ia64/include/asm/mc146818rtc.h | 10 -
> > arch/m68k/amiga/config.c | 1 -
> > arch/m68k/apollo/config.c | 1 -
> > arch/m68k/bvme6000/config.c | 1 -
> > arch/m68k/hp300/config.c | 2 +-
> > arch/m68k/include/asm/rtc.h | 79 -----
> > arch/m68k/kernel/time.c | 49 +++-
> > arch/m68k/mac/config.c | 3 +-
> > arch/m68k/mac/misc.c | 1 -
> > arch/m68k/mvme147/config.c | 1 -
> > arch/m68k/mvme16x/config.c | 1 -
> > arch/m68k/q40/config.c | 2 +-
> > arch/m68k/sun3/config.c | 1 -
> > arch/m68k/sun3/intersil.c | 2 +-
> > arch/m68k/sun3x/time.c | 2 +-
> > arch/mips/sni/time.c | 1 -
> > arch/mn10300/include/asm/rtc.h | 2 -
> > arch/mn10300/kernel/rtc.c | 2 +-
> > arch/parisc/include/asm/mc146818rtc.h | 9 -
> > arch/parisc/include/asm/rtc.h | 131 ---------
> > arch/parisc/kernel/time.c | 36 ++-
> > arch/powerpc/include/asm/rtc.h | 78 -----
> > arch/powerpc/kernel/time.c | 29 +-
> > arch/powerpc/platforms/Kconfig | 11 +
> > arch/powerpc/platforms/ps3/time.c | 2 +-
> > arch/sh/include/asm/mc146818rtc.h | 7 -
> > arch/sh/include/asm/rtc.h | 11 -
> > arch/sh/kernel/time.c | 32 +-
> > arch/x86/include/asm/mc146818rtc.h | 1 -
> > arch/x86/include/asm/rtc.h | 1 -
> > arch/x86/kernel/hpet.c | 3 +-
> > arch/x86/kernel/rtc.c | 3 +-
> > arch/x86/platform/efi/efi.c | 1 -
> > drivers/acpi/acpi_cmos_rtc.c | 2 +-
> > drivers/base/power/trace.c | 6 +-
> > drivers/char/Kconfig | 26 --
> > drivers/char/Makefile | 1 -
> > drivers/char/genrtc.c | 539 ----------------------------------
> > drivers/rtc/rtc-cmos.c | 12 +-
> > drivers/rtc/rtc-generic.c | 36 +--
> > drivers/rtc/rtc-mrst.c | 2 +-
> > include/asm-generic/rtc.h | 247 ----------------
> > include/linux/mc146818rtc.h | 194 ++++++++++++
> > 48 files changed, 358 insertions(+), 1256 deletions(-)
> >
> > [PATCH v3 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files
> > [PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of
> > [PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h
> > [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
> > [PATCH v3 05/16] char/genrtc: remove alpha support
> > [PATCH v3 06/16] char/genrtc: remove mn10300 support
> > [PATCH v3 07/16] rtc: parisc: provide rtc_class_ops directly
> > [PATCH v3 08/16] char/genrtc: remove parisc support
> > [PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
> > [PATCH v3 10/16] rtc: m68k: provide ioctl for q40
> > [PATCH v3 11/16] char/genrtc: remove m68k support
> > [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
> > [PATCH v3 13/16] char/genrtc: remove powerpc support
> > [PATCH v3 14/16] rtc: generic: remove get_rtc_time/set_rtc_time
> > [PATCH v3 15/16] char/genrtc: remove asm-generic/rtc.h from mips
> > [PATCH v3 16/16] char/genrtc: remove the rest of the driver
>
>
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 00/16] genrtc removal
2016-05-03 10:05 ` Arnd Bergmann
` (2 preceding siblings ...)
(?)
@ 2016-05-29 23:37 ` Alexandre Belloni
-1 siblings, 0 replies; 144+ messages in thread
From: Alexandre Belloni @ 2016-05-29 23:37 UTC (permalink / raw)
To: Arnd Bergmann
Cc: geert, deller, benh, mpe, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch, gregkh
Hi,
On 03/05/2016 at 12:05:34 +0200, Arnd Bergmann wrote :
> On Tuesday 03 May 2016 09:24:18 Alexandre Belloni wrote:
> > Hi Arnd,
> >
> > I see you didn't copy Greg on that series (that may explain his
> > confusion on the previous patch), do you expect me to take it
> > through the RTC tree? That is fine but I'd like some acks from him.
>
> Yes, that was a mistake. I dropped Greg from one Cc list in v2 when
> I split up the RTC changes into the part that was for drivers/rtc
> and the other one for Greg's char-misc tree. Then I reused the first
> Cc list when I sent a combined series for v3 again. I'll fix that
> when I post v4. There are only very small changes in there that
> I still need to pick up, so hopefully that will be the last version.
>
> It would be nice if you could take it through your tree then.
>
We are now at 4.7-rc1. Can you send v4 soon so that I can apply that
series and get it in linux-next?
There is a small rebase to do on patch v3.
Thanks!
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 00/16] genrtc removal
2016-05-03 10:05 ` Arnd Bergmann
` (2 preceding siblings ...)
(?)
@ 2016-05-29 23:37 ` Alexandre Belloni
-1 siblings, 0 replies; 144+ messages in thread
From: Alexandre Belloni @ 2016-05-29 23:37 UTC (permalink / raw)
To: Arnd Bergmann
Cc: geert-Td1EMuHUCqxL1ZNQvxDV9g, deller-Mmb7MZpHnFY,
benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r,
mpe-Gsx/Oe8HsFggBc27wqDAHg, dalias-8zAoT0mYgF4,
dhowells-H+wXaHxf7aLQT0dZR+AlfA,
linux-alpha-u79uwXL29TY76Z2rM5mHXA,
a.zummo-BfzFCNDTiLLj+vYz1yj4TQ,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-parisc-u79uwXL29TY76Z2rM5mHXA,
linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ,
linux-sh-u79uwXL29TY76Z2rM5mHXA,
linux-m68k-cunTk1MwBs8S/qaLPR03pWD2FQJk+8+b,
rtc-linux-/JYPxA39Uh5TLH3MbocFFw,
linux-arch-u79uwXL29TY76Z2rM5mHXA,
gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r
Hi,
On 03/05/2016 at 12:05:34 +0200, Arnd Bergmann wrote :
> On Tuesday 03 May 2016 09:24:18 Alexandre Belloni wrote:
> > Hi Arnd,
> >
> > I see you didn't copy Greg on that series (that may explain his
> > confusion on the previous patch), do you expect me to take it
> > through the RTC tree? That is fine but I'd like some acks from him.
>
> Yes, that was a mistake. I dropped Greg from one Cc list in v2 when
> I split up the RTC changes into the part that was for drivers/rtc
> and the other one for Greg's char-misc tree. Then I reused the first
> Cc list when I sent a combined series for v3 again. I'll fix that
> when I post v4. There are only very small changes in there that
> I still need to pick up, so hopefully that will be the last version.
>
> It would be nice if you could take it through your tree then.
>
We are now at 4.7-rc1. Can you send v4 soon so that I can apply that
series and get it in linux-next?
There is a small rebase to do on patch v3.
Thanks!
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 144+ messages in thread* Re: [PATCH v3 00/16] genrtc removal
@ 2016-05-29 23:37 ` Alexandre Belloni
0 siblings, 0 replies; 144+ messages in thread
From: Alexandre Belloni @ 2016-05-29 23:37 UTC (permalink / raw)
To: Arnd Bergmann
Cc: geert, deller, benh, mpe, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch, gregkh
Hi,
On 03/05/2016 at 12:05:34 +0200, Arnd Bergmann wrote :
> On Tuesday 03 May 2016 09:24:18 Alexandre Belloni wrote:
> > Hi Arnd,
> >
> > I see you didn't copy Greg on that series (that may explain his
> > confusion on the previous patch), do you expect me to take it
> > through the RTC tree? That is fine but I'd like some acks from him.
>
> Yes, that was a mistake. I dropped Greg from one Cc list in v2 when
> I split up the RTC changes into the part that was for drivers/rtc
> and the other one for Greg's char-misc tree. Then I reused the first
> Cc list when I sent a combined series for v3 again. I'll fix that
> when I post v4. There are only very small changes in there that
> I still need to pick up, so hopefully that will be the last version.
>
> It would be nice if you could take it through your tree then.
>
We are now at 4.7-rc1. Can you send v4 soon so that I can apply that
series and get it in linux-next?
There is a small rebase to do on patch v3.
Thanks!
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 144+ messages in thread
* [rtc-linux] Re: [PATCH v3 00/16] genrtc removal
@ 2016-05-29 23:37 ` Alexandre Belloni
0 siblings, 0 replies; 144+ messages in thread
From: Alexandre Belloni @ 2016-05-29 23:37 UTC (permalink / raw)
To: Arnd Bergmann
Cc: geert, deller, benh, mpe, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch, gregkh
Hi,
On 03/05/2016 at 12:05:34 +0200, Arnd Bergmann wrote :
> On Tuesday 03 May 2016 09:24:18 Alexandre Belloni wrote:
> > Hi Arnd,
> >
> > I see you didn't copy Greg on that series (that may explain his
> > confusion on the previous patch), do you expect me to take it
> > through the RTC tree? That is fine but I'd like some acks from him.
>
> Yes, that was a mistake. I dropped Greg from one Cc list in v2 when
> I split up the RTC changes into the part that was for drivers/rtc
> and the other one for Greg's char-misc tree. Then I reused the first
> Cc list when I sent a combined series for v3 again. I'll fix that
> when I post v4. There are only very small changes in there that
> I still need to pick up, so hopefully that will be the last version.
>
> It would be nice if you could take it through your tree then.
>
We are now at 4.7-rc1. Can you send v4 soon so that I can apply that
series and get it in linux-next?
There is a small rebase to do on patch v3.
Thanks!
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 00/16] genrtc removal
@ 2016-05-29 23:37 ` Alexandre Belloni
0 siblings, 0 replies; 144+ messages in thread
From: Alexandre Belloni @ 2016-05-29 23:37 UTC (permalink / raw)
To: Arnd Bergmann
Cc: geert, deller, benh, mpe, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch, gregkh
Hi,
On 03/05/2016 at 12:05:34 +0200, Arnd Bergmann wrote :
> On Tuesday 03 May 2016 09:24:18 Alexandre Belloni wrote:
> > Hi Arnd,
> >
> > I see you didn't copy Greg on that series (that may explain his
> > confusion on the previous patch), do you expect me to take it
> > through the RTC tree? That is fine but I'd like some acks from him.
>
> Yes, that was a mistake. I dropped Greg from one Cc list in v2 when
> I split up the RTC changes into the part that was for drivers/rtc
> and the other one for Greg's char-misc tree. Then I reused the first
> Cc list when I sent a combined series for v3 again. I'll fix that
> when I post v4. There are only very small changes in there that
> I still need to pick up, so hopefully that will be the last version.
>
> It would be nice if you could take it through your tree then.
>
We are now at 4.7-rc1. Can you send v4 soon so that I can apply that
series and get it in linux-next?
There is a small rebase to do on patch v3.
Thanks!
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 00/16] genrtc removal
@ 2016-05-29 23:37 ` Alexandre Belloni
0 siblings, 0 replies; 144+ messages in thread
From: Alexandre Belloni @ 2016-05-29 23:37 UTC (permalink / raw)
To: Arnd Bergmann
Cc: geert-Td1EMuHUCqxL1ZNQvxDV9g, deller-Mmb7MZpHnFY,
benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r,
mpe-Gsx/Oe8HsFggBc27wqDAHg, dalias-8zAoT0mYgF4,
dhowells-H+wXaHxf7aLQT0dZR+AlfA,
linux-alpha-u79uwXL29TY76Z2rM5mHXA,
a.zummo-BfzFCNDTiLLj+vYz1yj4TQ,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-parisc-u79uwXL29TY76Z2rM5mHXA,
linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ,
linux-sh-u79uwXL29TY76Z2rM5mHXA,
linux-m68k-cunTk1MwBs8S/qaLPR03pWD2FQJk+8+b,
rtc-linux-/JYPxA39Uh5TLH3MbocFFw,
linux-arch-u79uwXL29TY76Z2rM5mHXA,
gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r
Hi,
On 03/05/2016 at 12:05:34 +0200, Arnd Bergmann wrote :
> On Tuesday 03 May 2016 09:24:18 Alexandre Belloni wrote:
> > Hi Arnd,
> >
> > I see you didn't copy Greg on that series (that may explain his
> > confusion on the previous patch), do you expect me to take it
> > through the RTC tree? That is fine but I'd like some acks from him.
>
> Yes, that was a mistake. I dropped Greg from one Cc list in v2 when
> I split up the RTC changes into the part that was for drivers/rtc
> and the other one for Greg's char-misc tree. Then I reused the first
> Cc list when I sent a combined series for v3 again. I'll fix that
> when I post v4. There are only very small changes in there that
> I still need to pick up, so hopefully that will be the last version.
>
> It would be nice if you could take it through your tree then.
>
We are now at 4.7-rc1. Can you send v4 soon so that I can apply that
series and get it in linux-next?
There is a small rebase to do on patch v3.
Thanks!
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 144+ messages in thread
* Re: [PATCH v3 00/16] genrtc removal
2016-05-03 7:24 ` Alexandre Belloni
` (3 preceding siblings ...)
(?)
@ 2016-05-03 10:05 ` Arnd Bergmann
-1 siblings, 0 replies; 144+ messages in thread
From: Arnd Bergmann @ 2016-05-03 10:05 UTC (permalink / raw)
To: Alexandre Belloni
Cc: geert, deller, benh, mpe, dalias, dhowells, linux-alpha, a.zummo,
linux-kernel, linux-parisc, linuxppc-dev, linux-sh, linux-m68k,
rtc-linux, linux-arch, gregkh
On Tuesday 03 May 2016 09:24:18 Alexandre Belloni wrote:
> Hi Arnd,
>
> I see you didn't copy Greg on that series (that may explain his
> confusion on the previous patch), do you expect me to take it
> through the RTC tree? That is fine but I'd like some acks from him.
Yes, that was a mistake. I dropped Greg from one Cc list in v2 when
I split up the RTC changes into the part that was for drivers/rtc
and the other one for Greg's char-misc tree. Then I reused the first
Cc list when I sent a combined series for v3 again. I'll fix that
when I post v4. There are only very small changes in there that
I still need to pick up, so hopefully that will be the last version.
It would be nice if you could take it through your tree then.
Arnd
> On 28/04/2016 at 00:34:14 +0200, Arnd Bergmann wrote :
> > I ended up stuffing the two patch series into one, as they are now
> > more dependent on one another. This now thoroughly removes the
> > genrtc driver including the asm/rtc.h headers it uses. For all
> > architectures that still have a meaningful asm/rtc.h, this goes
> > through two stages:
> >
> > 1) make the rtc-generic implementation independent of asm/rtc.h
> > 2) remove the asm/rtc.h header and disallow the gen_rtc driver
> >
> > As the last step, the driver itself gets removed.
> >
> > Arnd
> >
> > arch/alpha/include/asm/rtc.h | 1 -
> > arch/alpha/kernel/core_marvel.c | 1 -
> > arch/alpha/kernel/rtc.c | 6 +-
> > arch/frv/include/asm/mc146818rtc.h | 16 -
> > arch/h8300/include/asm/mc146818rtc.h | 9 -
> > arch/ia64/include/asm/mc146818rtc.h | 10 -
> > arch/m68k/amiga/config.c | 1 -
> > arch/m68k/apollo/config.c | 1 -
> > arch/m68k/bvme6000/config.c | 1 -
> > arch/m68k/hp300/config.c | 2 +-
> > arch/m68k/include/asm/rtc.h | 79 -----
> > arch/m68k/kernel/time.c | 49 +++-
> > arch/m68k/mac/config.c | 3 +-
> > arch/m68k/mac/misc.c | 1 -
> > arch/m68k/mvme147/config.c | 1 -
> > arch/m68k/mvme16x/config.c | 1 -
> > arch/m68k/q40/config.c | 2 +-
> > arch/m68k/sun3/config.c | 1 -
> > arch/m68k/sun3/intersil.c | 2 +-
> > arch/m68k/sun3x/time.c | 2 +-
> > arch/mips/sni/time.c | 1 -
> > arch/mn10300/include/asm/rtc.h | 2 -
> > arch/mn10300/kernel/rtc.c | 2 +-
> > arch/parisc/include/asm/mc146818rtc.h | 9 -
> > arch/parisc/include/asm/rtc.h | 131 ---------
> > arch/parisc/kernel/time.c | 36 ++-
> > arch/powerpc/include/asm/rtc.h | 78 -----
> > arch/powerpc/kernel/time.c | 29 +-
> > arch/powerpc/platforms/Kconfig | 11 +
> > arch/powerpc/platforms/ps3/time.c | 2 +-
> > arch/sh/include/asm/mc146818rtc.h | 7 -
> > arch/sh/include/asm/rtc.h | 11 -
> > arch/sh/kernel/time.c | 32 +-
> > arch/x86/include/asm/mc146818rtc.h | 1 -
> > arch/x86/include/asm/rtc.h | 1 -
> > arch/x86/kernel/hpet.c | 3 +-
> > arch/x86/kernel/rtc.c | 3 +-
> > arch/x86/platform/efi/efi.c | 1 -
> > drivers/acpi/acpi_cmos_rtc.c | 2 +-
> > drivers/base/power/trace.c | 6 +-
> > drivers/char/Kconfig | 26 --
> > drivers/char/Makefile | 1 -
> > drivers/char/genrtc.c | 539 ----------------------------------
> > drivers/rtc/rtc-cmos.c | 12 +-
> > drivers/rtc/rtc-generic.c | 36 +--
> > drivers/rtc/rtc-mrst.c | 2 +-
> > include/asm-generic/rtc.h | 247 ----------------
> > include/linux/mc146818rtc.h | 194 ++++++++++++
> > 48 files changed, 358 insertions(+), 1256 deletions(-)
> >
> > [PATCH v3 01/16] rtc: cmos: remove empty asm/mc146818rtc.h files
> > [PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of
> > [PATCH v3 03/16] char/genrtc: x86: remove remnants of asm/rtc.h
> > [PATCH v3 04/16] rtc: sh: provide rtc_class_ops directly
> > [PATCH v3 05/16] char/genrtc: remove alpha support
> > [PATCH v3 06/16] char/genrtc: remove mn10300 support
> > [PATCH v3 07/16] rtc: parisc: provide rtc_class_ops directly
> > [PATCH v3 08/16] char/genrtc: remove parisc support
> > [PATCH v3 09/16] rtc: m68k: provide rtc_class_ops directly
> > [PATCH v3 10/16] rtc: m68k: provide ioctl for q40
> > [PATCH v3 11/16] char/genrtc: remove m68k support
> > [PATCH v3 12/16] rtc: powerpc: provide rtc_class_ops directly
> > [PATCH v3 13/16] char/genrtc: remove powerpc support
> > [PATCH v3 14/16] rtc: generic: remove get_rtc_time/set_rtc_time
> > [PATCH v3 15/16] char/genrtc: remove asm-generic/rtc.h from mips
> > [PATCH v3 16/16] char/genrtc: remove the rest of the driver
>
>
^ permalink raw reply [flat|nested] 144+ messages in thread