* [PATCH 1/7] Revert "clockevents: Add a clkevt-of mechanism like clksrc-of"
@ 2017-05-27 9:58 Daniel Lezcano
2017-05-27 9:58 ` [PATCH 4/7] clocksource: Rename CLOCKSOURCE_ACPI_DECLARE Daniel Lezcano
` (4 more replies)
0 siblings, 5 replies; 13+ messages in thread
From: Daniel Lezcano @ 2017-05-27 9:58 UTC (permalink / raw)
To: tglx, daniel.lezcano; +Cc: linux-arm-kernel, linux-kernel, Mark Rutland
After discussing it, this feature is dropped as it is not considered
adequate:
https://patchwork.kernel.org/patch/9639317/
There is no user of this macro yet, so there is no impact on the drivers.
This reverts commit 376bc27150f180d9f5eddec6a14117780177589d.
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/Kconfig | 7 -----
drivers/clocksource/Makefile | 1 -
drivers/clocksource/clkevt-probe.c | 56 --------------------------------------
include/linux/clockchips.h | 9 ------
4 files changed, 73 deletions(-)
delete mode 100644 drivers/clocksource/clkevt-probe.c
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 1b22ade..623fcc6 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -5,10 +5,6 @@ config CLKSRC_OF
bool
select CLKSRC_PROBE
-config CLKEVT_OF
- bool
- select CLKEVT_PROBE
-
config CLKSRC_ACPI
bool
select CLKSRC_PROBE
@@ -16,9 +12,6 @@ config CLKSRC_ACPI
config CLKSRC_PROBE
bool
-config CLKEVT_PROBE
- bool
-
config CLKSRC_I8253
bool
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index cf0c30b..cad713c 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -1,5 +1,4 @@
obj-$(CONFIG_CLKSRC_PROBE) += clksrc-probe.o
-obj-$(CONFIG_CLKEVT_PROBE) += clkevt-probe.o
obj-$(CONFIG_ATMEL_PIT) += timer-atmel-pit.o
obj-$(CONFIG_ATMEL_ST) += timer-atmel-st.o
obj-$(CONFIG_ATMEL_TCB_CLKSRC) += tcb_clksrc.o
diff --git a/drivers/clocksource/clkevt-probe.c b/drivers/clocksource/clkevt-probe.c
deleted file mode 100644
index 8c30fec..0000000
--- a/drivers/clocksource/clkevt-probe.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2016, Linaro Ltd. All rights reserved.
- * Daniel Lezcano <daniel.lezcano@linaro.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/init.h>
-#include <linux/of.h>
-#include <linux/clockchip.h>
-
-extern struct of_device_id __clkevt_of_table[];
-
-static const struct of_device_id __clkevt_of_table_sentinel
- __used __section(__clkevt_of_table_end);
-
-int __init clockevent_probe(void)
-{
- struct device_node *np;
- const struct of_device_id *match;
- of_init_fn_1_ret init_func;
- int ret, clockevents = 0;
-
- for_each_matching_node_and_match(np, __clkevt_of_table, &match) {
- if (!of_device_is_available(np))
- continue;
-
- init_func = match->data;
-
- ret = init_func(np);
- if (ret) {
- pr_warn("Failed to initialize '%s' (%d)\n",
- np->name, ret);
- continue;
- }
-
- clockevents++;
- }
-
- if (!clockevents) {
- pr_crit("%s: no matching clockevent found\n", __func__);
- return -ENODEV;
- }
-
- return 0;
-}
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index eef1569..a116926 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -223,13 +223,4 @@ static inline void tick_setup_hrtimer_broadcast(void) { }
#endif /* !CONFIG_GENERIC_CLOCKEVENTS */
-#define CLOCKEVENT_OF_DECLARE(name, compat, fn) \
- OF_DECLARE_1_RET(clkevt, name, compat, fn)
-
-#ifdef CONFIG_CLKEVT_PROBE
-extern int clockevent_probe(void);
-#els
-static inline int clockevent_probe(void) { return 0; }
-#endif
-
#endif /* _LINUX_CLOCKCHIPS_H */
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 4/7] clocksource: Rename CLOCKSOURCE_ACPI_DECLARE
2017-05-27 9:58 [PATCH 1/7] Revert "clockevents: Add a clkevt-of mechanism like clksrc-of" Daniel Lezcano
@ 2017-05-27 9:58 ` Daniel Lezcano
2017-05-28 13:50 ` Linus Walleij
2017-05-27 9:58 ` [PATCH 5/7] clocksource: Rename clksrc Daniel Lezcano
` (3 subsequent siblings)
4 siblings, 1 reply; 13+ messages in thread
From: Daniel Lezcano @ 2017-05-27 9:58 UTC (permalink / raw)
To: tglx, daniel.lezcano
Cc: linux-arm-kernel, linux-kernel, Mark Rutland, Marc Zyngier,
John Stultz, Stephen Boyd
The macro name is now renamed to 'TIMER_ACPI_DECLARE' for consistency
with the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/arm_arch_timer.c | 2 +-
include/linux/clocksource.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 9a41958..8d4bec9 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -1516,5 +1516,5 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table)
return arch_timer_common_init();
}
-CLOCKSOURCE_ACPI_DECLARE(arch_timer, ACPI_SIG_GTDT, arch_timer_acpi_init);
+TIMER_ACPI_DECLARE(arch_timer, ACPI_SIG_GTDT, arch_timer_acpi_init);
#endif
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 010bb9f..e43f37f 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -258,7 +258,7 @@ extern void timer_probe(void);
static inline void timer_probe(void) {}
#endif
-#define CLOCKSOURCE_ACPI_DECLARE(name, table_id, fn) \
+#define TIMER_ACPI_DECLARE(name, table_id, fn) \
ACPI_DECLARE_PROBE_ENTRY(clksrc, name, table_id, 0, NULL, 0, fn)
#endif /* _LINUX_CLOCKSOURCE_H */
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 5/7] clocksource: Rename clksrc
2017-05-27 9:58 [PATCH 1/7] Revert "clockevents: Add a clkevt-of mechanism like clksrc-of" Daniel Lezcano
2017-05-27 9:58 ` [PATCH 4/7] clocksource: Rename CLOCKSOURCE_ACPI_DECLARE Daniel Lezcano
@ 2017-05-27 9:58 ` Daniel Lezcano
2017-05-28 13:51 ` Linus Walleij
2017-05-27 9:58 ` [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF Daniel Lezcano
` (2 subsequent siblings)
4 siblings, 1 reply; 13+ messages in thread
From: Daniel Lezcano @ 2017-05-27 9:58 UTC (permalink / raw)
To: tglx, daniel.lezcano
Cc: linux-arm-kernel, linux-kernel, Arnd Bergmann, John Stultz,
Stephen Boyd, open list:GENERIC INCLUDE/ASM HEADER FILES
The table name is now renamed to 'timer' for consistency with
the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/clksrc-probe.c | 18 +++++++++---------
include/asm-generic/vmlinux.lds.h | 6 +++---
include/linux/clocksource.h | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/clocksource/clksrc-probe.c b/drivers/clocksource/clksrc-probe.c
index 5d549c2..da81e5d 100644
--- a/drivers/clocksource/clksrc-probe.c
+++ b/drivers/clocksource/clksrc-probe.c
@@ -19,20 +19,20 @@
#include <linux/of.h>
#include <linux/clocksource.h>
-extern struct of_device_id __clksrc_of_table[];
+extern struct of_device_id __timer_of_table[];
-static const struct of_device_id __clksrc_of_table_sentinel
- __used __section(__clksrc_of_table_end);
+static const struct of_device_id __timer_of_table_sentinel
+ __used __section(__timer_of_table_end);
void __init timer_probe(void)
{
struct device_node *np;
const struct of_device_id *match;
of_init_fn_1_ret init_func_ret;
- unsigned clocksources = 0;
+ unsigned timers = 0;
int ret;
- for_each_matching_node_and_match(np, __clksrc_of_table, &match) {
+ for_each_matching_node_and_match(np, __timer_of_table, &match) {
if (!of_device_is_available(np))
continue;
@@ -45,11 +45,11 @@ void __init timer_probe(void)
continue;
}
- clocksources++;
+ timers++;
}
- clocksources += acpi_probe_device_table(clksrc);
+ timers += acpi_probe_device_table(timer);
- if (!clocksources)
- pr_crit("%s: no matching clocksources found\n", __func__);
+ if (!timers)
+ pr_crit("%s: no matching timers found\n", __func__);
}
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 0968d13..ca922ae 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -172,7 +172,7 @@
KEEP(*(__##name##_of_table)) \
KEEP(*(__##name##_of_table_end))
-#define CLKSRC_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, clksrc)
+#define TIMER_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, timer)
#define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip)
#define CLK_OF_TABLES() OF_TABLE(CONFIG_COMMON_CLK, clk)
#define IOMMU_OF_TABLES() OF_TABLE(CONFIG_OF_IOMMU, iommu)
@@ -558,14 +558,14 @@
MEM_DISCARD(init.rodata) \
CLK_OF_TABLES() \
RESERVEDMEM_OF_TABLES() \
- CLKSRC_OF_TABLES() \
+ TIMER_OF_TABLES() \
IOMMU_OF_TABLES() \
CPU_METHOD_OF_TABLES() \
CPUIDLE_METHOD_OF_TABLES() \
KERNEL_DTB() \
IRQCHIP_OF_MATCH_TABLE() \
ACPI_PROBE_TABLE(irqchip) \
- ACPI_PROBE_TABLE(clksrc) \
+ ACPI_PROBE_TABLE(timer) \
ACPI_PROBE_TABLE(iort) \
EARLYCON_TABLE()
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index e43f37f..7cd38b2 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -250,7 +250,7 @@ extern int clocksource_mmio_init(void __iomem *, const char *,
extern int clocksource_i8253_init(void);
#define TIMER_OF_DECLARE(name, compat, fn) \
- OF_DECLARE_1_RET(clksrc, name, compat, fn)
+ OF_DECLARE_1_RET(timer, name, compat, fn)
#ifdef CONFIG_CLKSRC_PROBE
extern void timer_probe(void);
@@ -259,6 +259,6 @@ static inline void timer_probe(void) {}
#endif
#define TIMER_ACPI_DECLARE(name, table_id, fn) \
- ACPI_DECLARE_PROBE_ENTRY(clksrc, name, table_id, 0, NULL, 0, fn)
+ ACPI_DECLARE_PROBE_ENTRY(timer, name, table_id, 0, NULL, 0, fn)
#endif /* _LINUX_CLOCKSOURCE_H */
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF
2017-05-27 9:58 [PATCH 1/7] Revert "clockevents: Add a clkevt-of mechanism like clksrc-of" Daniel Lezcano
2017-05-27 9:58 ` [PATCH 4/7] clocksource: Rename CLOCKSOURCE_ACPI_DECLARE Daniel Lezcano
2017-05-27 9:58 ` [PATCH 5/7] clocksource: Rename clksrc Daniel Lezcano
@ 2017-05-27 9:58 ` Daniel Lezcano
2017-05-28 3:00 ` Shawn Guo
` (2 more replies)
2017-05-27 9:58 ` [PATCH 7/7] clocksource: Rename CLKSRC_ACPI Daniel Lezcano
[not found] ` <1495879129-28109-2-git-send-email-daniel.lezcano@linaro.org>
4 siblings, 3 replies; 13+ messages in thread
From: Daniel Lezcano @ 2017-05-27 9:58 UTC (permalink / raw)
To: tglx, daniel.lezcano
Cc: linux-arm-kernel, linux-kernel, Russell King, Florian Fainelli,
Ray Jui, Scott Branden,
maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...,
Alexander Shiyan, Shawn Guo, Sascha Hauer, Fabio Estevam,
Kukjin Kim, Krzysztof Kozlowski, Javier Martinez Canillas,
Catalin Marinas, Will Deacon, Yoshinori Sato, Michal Simek,
John Crispin, Ralf Baechle, Ley Foon Tan, Rich Felker,
Arnd Bergmann, John Stultz, Stephen Boyd, Linus Walleij,
Stephen Rothwell, Olof Johansson,
moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES,
moderated list:H8/300 ARCHITECTURE,
open list:RALINK MIPS ARCHITECTURE,
moderated list:NIOS2 ARCHITECTURE, open list:SUPERH,
open list:GENERIC INCLUDE/ASM HEADER FILES
The config option name is now renamed to 'TIMER_OF' for consistency with
the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
arch/arm/Kconfig | 10 +++---
arch/arm/mach-bcm/Kconfig | 2 +-
arch/arm/mach-clps711x/Kconfig | 2 +-
arch/arm/mach-imx/epit.c | 2 +-
arch/arm/mach-s3c24xx/Kconfig | 2 +-
arch/arm/mach-s3c64xx/Kconfig | 2 +-
arch/arm64/Kconfig.platforms | 4 +--
arch/h8300/Kconfig | 2 +-
arch/microblaze/Kconfig | 2 +-
arch/mips/ralink/Kconfig | 2 +-
arch/nios2/Kconfig | 2 +-
arch/sh/boards/Kconfig | 2 +-
drivers/clocksource/Kconfig | 60 ++++++++++++++++-----------------
drivers/clocksource/Makefile | 2 +-
drivers/clocksource/clksrc-probe.c | 55 ------------------------------
drivers/clocksource/clps711x-timer.c | 2 +-
drivers/clocksource/samsung_pwm_timer.c | 2 +-
drivers/clocksource/timer-probe.c | 55 ++++++++++++++++++++++++++++++
include/asm-generic/vmlinux.lds.h | 2 +-
include/linux/clocksource.h | 2 +-
20 files changed, 107 insertions(+), 107 deletions(-)
delete mode 100644 drivers/clocksource/clksrc-probe.c
create mode 100644 drivers/clocksource/timer-probe.c
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0d4e71b..713dbbb 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -337,7 +337,7 @@ config ARCH_MULTIPLATFORM
select ARM_HAS_SG_CHAIN
select ARM_PATCH_PHYS_VIRT
select AUTO_ZRELADDR
- select CLKSRC_OF
+ select TIMER_OF
select COMMON_CLK
select GENERIC_CLOCKEVENTS
select MIGHT_HAVE_PCI
@@ -351,7 +351,7 @@ config ARM_SINGLE_ARMV7M
depends on !MMU
select ARM_NVIC
select AUTO_ZRELADDR
- select CLKSRC_OF
+ select TIMER_OF
select COMMON_CLK
select CPU_V7M
select GENERIC_CLOCKEVENTS
@@ -541,7 +541,7 @@ config ARCH_PXA
select CLKDEV_LOOKUP
select CLKSRC_PXA
select CLKSRC_MMIO
- select CLKSRC_OF
+ select TIMER_OF
select CPU_XSCALE if !CPU_XSC3
select GENERIC_CLOCKEVENTS
select GPIO_PXA
@@ -580,7 +580,7 @@ config ARCH_SA1100
select CLKDEV_LOOKUP
select CLKSRC_MMIO
select CLKSRC_PXA
- select CLKSRC_OF if OF
+ select TIMER_OF if OF
select CPU_FREQ
select CPU_SA1100
select GENERIC_CLOCKEVENTS
@@ -1386,7 +1386,7 @@ config HAVE_ARM_ARCH_TIMER
config HAVE_ARM_TWD
bool
- select CLKSRC_OF if OF
+ select TIMER_OF if OF
help
This options enables support for the ARM timer and watchdog unit
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index a0e66d8..d6e291b8 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -150,7 +150,7 @@ config ARCH_BCM2835
select ARM_ERRATA_411920 if ARCH_MULTI_V6
select ARM_TIMER_SP804
select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7
- select CLKSRC_OF
+ select TIMER_OF
select BCM2835_TIMER
select PINCTRL
select PINCTRL_BCM2835
diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig
index 61284b9..f385b1f 100644
--- a/arch/arm/mach-clps711x/Kconfig
+++ b/arch/arm/mach-clps711x/Kconfig
@@ -2,7 +2,7 @@ menuconfig ARCH_CLPS711X
bool "Cirrus Logic EP721x/EP731x-based"
depends on ARCH_MULTI_V4T
select AUTO_ZRELADDR
- select CLKSRC_OF
+ select TIMER_OF
select CLPS711X_TIMER
select COMMON_CLK
select CPU_ARM720T
diff --git a/arch/arm/mach-imx/epit.c b/arch/arm/mach-imx/epit.c
index fb9a73a..4a4d2e2 100644
--- a/arch/arm/mach-imx/epit.c
+++ b/arch/arm/mach-imx/epit.c
@@ -39,7 +39,7 @@
#define EPITCR_OM_TOGGLE (1 << 22)
#define EPITCR_OM_CLEAR (2 << 22)
#define EPITCR_OM_SET (3 << 22)
-#define EPITCR_CLKSRC_OFF (0 << 24)
+#define EPITCR_TIMER_OFF (0 << 24)
#define EPITCR_CLKSRC_PERIPHERAL (1 << 24)
#define EPITCR_CLKSRC_REF_HIGH (1 << 24)
#define EPITCR_CLKSRC_REF_LOW (3 << 24)
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 4b1690a..f07da82 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -394,7 +394,7 @@ config MACH_SMDK2416
config MACH_S3C2416_DT
bool "Samsung S3C2416 machine using devicetree"
- select CLKSRC_OF
+ select TIMER_OF
select USE_OF
select PINCTRL
select PINCTRL_S3C24XX
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 459214f..71a4934 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -336,7 +336,7 @@ config MACH_WLF_CRAGG_6410
config MACH_S3C64XX_DT
bool "Samsung S3C6400/S3C6410 machine using Device Tree"
- select CLKSRC_OF
+ select TIMER_OF
select CPU_S3C6400
select CPU_S3C6410
select PINCTRL
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 129cc5a..611abc4 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -17,7 +17,7 @@ config ARCH_ALPINE
config ARCH_BCM2835
bool "Broadcom BCM2835 family"
- select CLKSRC_OF
+ select TIMER_OF
select GPIOLIB
select PINCTRL
select PINCTRL_BCM2835
@@ -170,7 +170,7 @@ config ARCH_TEGRA
select ARCH_HAS_RESET_CONTROLLER
select CLKDEV_LOOKUP
select CLKSRC_MMIO
- select CLKSRC_OF
+ select TIMER_OF
select GENERIC_CLOCKEVENTS
select GPIOLIB
select PINCTRL
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 3ae8525..6e3d36f 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -15,7 +15,7 @@ config H8300
select OF_IRQ
select OF_EARLY_FLATTREE
select HAVE_MEMBLOCK
- select CLKSRC_OF
+ select TIMER_OF
select H8300_TMR8
select HAVE_KERNEL_GZIP
select HAVE_KERNEL_LZO
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 85885a5..8e47121 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -4,7 +4,7 @@ config MICROBLAZE
select ARCH_MIGHT_HAVE_PC_PARPORT
select ARCH_WANT_IPC_PARSE_VERSION
select BUILDTIME_EXTABLE_SORT
- select CLKSRC_OF
+ select TIMER_OF
select CLONE_BACKWARDS3
select COMMON_CLK
select GENERIC_ATOMIC64
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
index 9825dee..710b04c 100644
--- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig
@@ -4,7 +4,7 @@ config CLKEVT_RT3352
bool
depends on SOC_RT305X || SOC_MT7620
default y
- select CLKSRC_OF
+ select TIMER_OF
select CLKSRC_MMIO
config RALINK_ILL_ACC
diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
index 51a56c8..863f388 100644
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
@@ -1,6 +1,6 @@
config NIOS2
def_bool y
- select CLKSRC_OF
+ select TIMER_OF
select GENERIC_ATOMIC64
select GENERIC_CLOCKEVENTS
select GENERIC_CPU_DEVICES
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
index 4e21949..3554fca 100644
--- a/arch/sh/boards/Kconfig
+++ b/arch/sh/boards/Kconfig
@@ -10,7 +10,7 @@ config SH_DEVICE_TREE
bool "Board Described by Device Tree"
select OF
select OF_EARLY_FLATTREE
- select CLKSRC_OF
+ select TIMER_OF
select COMMON_CLK
select GENERIC_CALIBRATE_DELAY
help
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 623fcc6..90f062e 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -1,15 +1,15 @@
menu "Clock Source drivers"
depends on !ARCH_USES_GETTIMEOFFSET
-config CLKSRC_OF
+config TIMER_OF
bool
- select CLKSRC_PROBE
+ select TIMER_PROBE
config CLKSRC_ACPI
bool
- select CLKSRC_PROBE
+ select TIMER_PROBE
-config CLKSRC_PROBE
+config TIMER_PROBE
bool
config CLKSRC_I8253
@@ -58,14 +58,14 @@ config DW_APB_TIMER
config DW_APB_TIMER_OF
bool
select DW_APB_TIMER
- select CLKSRC_OF
+ select TIMER_OF
config FTTMR010_TIMER
bool "Faraday Technology timer driver" if COMPILE_TEST
depends on GENERIC_CLOCKEVENTS
depends on HAS_IOMEM
select CLKSRC_MMIO
- select CLKSRC_OF
+ select TIMER_OF
select MFD_SYSCON
help
Enables support for the Faraday Technology timer block
@@ -74,7 +74,7 @@ config FTTMR010_TIMER
config ROCKCHIP_TIMER
bool "Rockchip timer driver" if COMPILE_TEST
depends on ARM || ARM64
- select CLKSRC_OF
+ select TIMER_OF
select CLKSRC_MMIO
help
Enables the support for the rockchip timer driver.
@@ -82,7 +82,7 @@ config ROCKCHIP_TIMER
config ARMADA_370_XP_TIMER
bool "Armada 370 and XP timer driver" if COMPILE_TEST
depends on ARM
- select CLKSRC_OF
+ select TIMER_OF
select CLKSRC_MMIO
help
Enables the support for the Armada 370 and XP timer driver.
@@ -97,7 +97,7 @@ config MESON6_TIMER
config ORION_TIMER
bool "Orion timer driver" if COMPILE_TEST
depends on ARM
- select CLKSRC_OF
+ select TIMER_OF
select CLKSRC_MMIO
help
Enables the support for the Orion timer driver
@@ -141,7 +141,7 @@ config ASM9260_TIMER
bool "ASM9260 timer driver" if COMPILE_TEST
depends on GENERIC_CLOCKEVENTS
select CLKSRC_MMIO
- select CLKSRC_OF
+ select TIMER_OF
help
Enables support for the ASM9260 timer.
@@ -247,21 +247,21 @@ config CLKSRC_LPC32XX
depends on GENERIC_CLOCKEVENTS && HAS_IOMEM
depends on ARM
select CLKSRC_MMIO
- select CLKSRC_OF
+ select TIMER_OF
help
Support for the LPC32XX clocksource.
config CLKSRC_PISTACHIO
bool "Clocksource for Pistachio SoC" if COMPILE_TEST
depends on HAS_IOMEM
- select CLKSRC_OF
+ select TIMER_OF
help
Enables the clocksource for the Pistachio SoC.
config CLKSRC_TI_32K
bool "Texas Instruments 32.768 Hz Clocksource" if COMPILE_TEST
depends on GENERIC_SCHED_CLOCK
- select CLKSRC_OF if OF
+ select TIMER_OF if OF
help
This option enables support for Texas Instruments 32.768 Hz clocksource
available on many OMAP-like platforms.
@@ -270,7 +270,7 @@ config CLKSRC_NPS
bool "NPS400 clocksource driver" if COMPILE_TEST
depends on !PHYS_ADDR_T_64BIT
select CLKSRC_MMIO
- select CLKSRC_OF if OF
+ select TIMER_OF if OF
help
NPS400 clocksource support.
Got 64 bit counter with update rate up to 1000MHz.
@@ -285,12 +285,12 @@ config CLKSRC_MPS2
bool "Clocksource for MPS2 SoCs" if COMPILE_TEST
depends on GENERIC_SCHED_CLOCK
select CLKSRC_MMIO
- select CLKSRC_OF
+ select TIMER_OF
config ARC_TIMERS
bool "Support for 32-bit TIMERn counters in ARC Cores" if COMPILE_TEST
depends on GENERIC_CLOCKEVENTS
- select CLKSRC_OF
+ select TIMER_OF
help
These are legacy 32-bit TIMER0 and TIMER1 counters found on all ARC cores
(ARC700 as well as ARC HS38).
@@ -300,7 +300,7 @@ config ARC_TIMERS_64BIT
bool "Support for 64-bit counters in ARC HS38 cores" if COMPILE_TEST
depends on GENERIC_CLOCKEVENTS
depends on ARC_TIMERS
- select CLKSRC_OF
+ select TIMER_OF
help
This enables 2 different 64-bit timers: RTC (for UP) and GFRC (for SMP)
RTC is implemented inside the core, while GFRC sits outside the core in
@@ -309,7 +309,7 @@ config ARC_TIMERS_64BIT
config ARM_ARCH_TIMER
bool
- select CLKSRC_OF if OF
+ select TIMER_OF if OF
select CLKSRC_ACPI if ACPI
config ARM_ARCH_TIMER_EVTSTREAM
@@ -367,7 +367,7 @@ config ARM64_ERRATUM_858921
config ARM_GLOBAL_TIMER
bool "Support for the ARM global timer" if COMPILE_TEST
- select CLKSRC_OF if OF
+ select TIMER_OF if OF
depends on ARM
help
This options enables support for the ARM global timer unit
@@ -376,7 +376,7 @@ config ARM_TIMER_SP804
bool "Support for Dual Timer SP804 module"
depends on GENERIC_SCHED_CLOCK && CLKDEV_LOOKUP
select CLKSRC_MMIO
- select CLKSRC_OF if OF
+ select TIMER_OF if OF
config CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
bool
@@ -387,19 +387,19 @@ config CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
config ARMV7M_SYSTICK
bool "Support for the ARMv7M system time" if COMPILE_TEST
- select CLKSRC_OF if OF
+ select TIMER_OF if OF
select CLKSRC_MMIO
help
This options enables support for the ARMv7M system timer unit
config ATMEL_PIT
- select CLKSRC_OF if OF
+ select TIMER_OF if OF
def_bool SOC_AT91SAM9 || SOC_SAMA5
config ATMEL_ST
bool "Atmel ST timer support" if COMPILE_TEST
depends on GENERIC_CLOCKEVENTS
- select CLKSRC_OF
+ select TIMER_OF
select MFD_SYSCON
help
Support for the Atmel ST timer.
@@ -442,7 +442,7 @@ config VF_PIT_TIMER
config OXNAS_RPS_TIMER
bool "Oxford Semiconductor OXNAS RPS Timers driver" if COMPILE_TEST
depends on GENERIC_CLOCKEVENTS
- select CLKSRC_OF
+ select TIMER_OF
select CLKSRC_MMIO
help
This enables support for the Oxford Semiconductor OXNAS RPS timers.
@@ -453,7 +453,7 @@ config SYS_SUPPORTS_SH_CMT
config MTK_TIMER
bool "Mediatek timer driver" if COMPILE_TEST
depends on GENERIC_CLOCKEVENTS && HAS_IOMEM
- select CLKSRC_OF
+ select TIMER_OF
select CLKSRC_MMIO
help
Support for Mediatek timer driver.
@@ -526,7 +526,7 @@ config EM_TIMER_STI
config CLKSRC_QCOM
bool "Qualcomm MSM timer" if COMPILE_TEST
depends on ARM
- select CLKSRC_OF
+ select TIMER_OF
help
This enables the clocksource and the per CPU clockevent driver for the
Qualcomm SoCs.
@@ -534,7 +534,7 @@ config CLKSRC_QCOM
config CLKSRC_VERSATILE
bool "ARM Versatile (Express) reference platforms clock source" if COMPILE_TEST
depends on GENERIC_SCHED_CLOCK && !ARCH_USES_GETTIMEOFFSET
- select CLKSRC_OF
+ select TIMER_OF
default y if MFD_VEXPRESS_SYSREG
help
This option enables clock source based on free running
@@ -545,12 +545,12 @@ config CLKSRC_VERSATILE
config CLKSRC_MIPS_GIC
bool
depends on MIPS_GIC
- select CLKSRC_OF
+ select TIMER_OF
config CLKSRC_TANGO_XTAL
bool "Clocksource for Tango SoC" if COMPILE_TEST
depends on ARM
- select CLKSRC_OF
+ select TIMER_OF
select CLKSRC_MMIO
help
This enables the clocksource for Tango SoC
@@ -591,7 +591,7 @@ config CLKSRC_IMX_GPT
config CLKSRC_ST_LPC
bool "Low power clocksource found in the LPC" if COMPILE_TEST
- select CLKSRC_OF if OF
+ select TIMER_OF if OF
depends on HAS_IOMEM
select CLKSRC_MMIO
help
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index cad713c..ec55921 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_CLKSRC_PROBE) += clksrc-probe.o
+obj-$(CONFIG_TIMER_PROBE) += timer-probe.o
obj-$(CONFIG_ATMEL_PIT) += timer-atmel-pit.o
obj-$(CONFIG_ATMEL_ST) += timer-atmel-st.o
obj-$(CONFIG_ATMEL_TCB_CLKSRC) += tcb_clksrc.o
diff --git a/drivers/clocksource/clksrc-probe.c b/drivers/clocksource/clksrc-probe.c
deleted file mode 100644
index da81e5d..0000000
--- a/drivers/clocksource/clksrc-probe.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/acpi.h>
-#include <linux/init.h>
-#include <linux/of.h>
-#include <linux/clocksource.h>
-
-extern struct of_device_id __timer_of_table[];
-
-static const struct of_device_id __timer_of_table_sentinel
- __used __section(__timer_of_table_end);
-
-void __init timer_probe(void)
-{
- struct device_node *np;
- const struct of_device_id *match;
- of_init_fn_1_ret init_func_ret;
- unsigned timers = 0;
- int ret;
-
- for_each_matching_node_and_match(np, __timer_of_table, &match) {
- if (!of_device_is_available(np))
- continue;
-
- init_func_ret = match->data;
-
- ret = init_func_ret(np);
- if (ret) {
- pr_err("Failed to initialize '%s': %d\n",
- of_node_full_name(np), ret);
- continue;
- }
-
- timers++;
- }
-
- timers += acpi_probe_device_table(timer);
-
- if (!timers)
- pr_crit("%s: no matching timers found\n", __func__);
-}
diff --git a/drivers/clocksource/clps711x-timer.c b/drivers/clocksource/clps711x-timer.c
index fc9e025..a8dd805 100644
--- a/drivers/clocksource/clps711x-timer.c
+++ b/drivers/clocksource/clps711x-timer.c
@@ -103,7 +103,7 @@ void __init clps711x_clksrc_init(void __iomem *tc1_base, void __iomem *tc2_base,
BUG_ON(_clps711x_clkevt_init(tc2, tc2_base, irq));
}
-#ifdef CONFIG_CLKSRC_OF
+#ifdef CONFIG_TIMER_OF
static int __init clps711x_timer_init(struct device_node *np)
{
unsigned int irq = irq_of_parse_and_map(np, 0);
diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c
index 21cd72c..6d5d126 100644
--- a/drivers/clocksource/samsung_pwm_timer.c
+++ b/drivers/clocksource/samsung_pwm_timer.c
@@ -418,7 +418,7 @@ void __init samsung_pwm_clocksource_init(void __iomem *base,
_samsung_pwm_clocksource_init();
}
-#ifdef CONFIG_CLKSRC_OF
+#ifdef CONFIG_TIMER_OF
static int __init samsung_pwm_alloc(struct device_node *np,
const struct samsung_pwm_variant *variant)
{
diff --git a/drivers/clocksource/timer-probe.c b/drivers/clocksource/timer-probe.c
new file mode 100644
index 0000000..da81e5d
--- /dev/null
+++ b/drivers/clocksource/timer-probe.c
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/acpi.h>
+#include <linux/init.h>
+#include <linux/of.h>
+#include <linux/clocksource.h>
+
+extern struct of_device_id __timer_of_table[];
+
+static const struct of_device_id __timer_of_table_sentinel
+ __used __section(__timer_of_table_end);
+
+void __init timer_probe(void)
+{
+ struct device_node *np;
+ const struct of_device_id *match;
+ of_init_fn_1_ret init_func_ret;
+ unsigned timers = 0;
+ int ret;
+
+ for_each_matching_node_and_match(np, __timer_of_table, &match) {
+ if (!of_device_is_available(np))
+ continue;
+
+ init_func_ret = match->data;
+
+ ret = init_func_ret(np);
+ if (ret) {
+ pr_err("Failed to initialize '%s': %d\n",
+ of_node_full_name(np), ret);
+ continue;
+ }
+
+ timers++;
+ }
+
+ timers += acpi_probe_device_table(timer);
+
+ if (!timers)
+ pr_crit("%s: no matching timers found\n", __func__);
+}
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index ca922ae..79d5443 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -172,7 +172,7 @@
KEEP(*(__##name##_of_table)) \
KEEP(*(__##name##_of_table_end))
-#define TIMER_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, timer)
+#define TIMER_OF_TABLES() OF_TABLE(CONFIG_TIMER_OF, timer)
#define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip)
#define CLK_OF_TABLES() OF_TABLE(CONFIG_COMMON_CLK, clk)
#define IOMMU_OF_TABLES() OF_TABLE(CONFIG_OF_IOMMU, iommu)
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 7cd38b2..c48ceef 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -252,7 +252,7 @@ extern int clocksource_i8253_init(void);
#define TIMER_OF_DECLARE(name, compat, fn) \
OF_DECLARE_1_RET(timer, name, compat, fn)
-#ifdef CONFIG_CLKSRC_PROBE
+#ifdef CONFIG_TIMER_PROBE
extern void timer_probe(void);
#else
static inline void timer_probe(void) {}
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 7/7] clocksource: Rename CLKSRC_ACPI
2017-05-27 9:58 [PATCH 1/7] Revert "clockevents: Add a clkevt-of mechanism like clksrc-of" Daniel Lezcano
` (2 preceding siblings ...)
2017-05-27 9:58 ` [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF Daniel Lezcano
@ 2017-05-27 9:58 ` Daniel Lezcano
2017-05-28 13:52 ` Linus Walleij
[not found] ` <1495879129-28109-2-git-send-email-daniel.lezcano@linaro.org>
4 siblings, 1 reply; 13+ messages in thread
From: Daniel Lezcano @ 2017-05-27 9:58 UTC (permalink / raw)
To: tglx, daniel.lezcano; +Cc: linux-arm-kernel, linux-kernel
The config option name is now renamed to 'CLKSRC_ACPI' for consistency with
the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 90f062e..4ba230d 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -5,7 +5,7 @@ config TIMER_OF
bool
select TIMER_PROBE
-config CLKSRC_ACPI
+config TIMER_ACPI
bool
select TIMER_PROBE
@@ -310,7 +310,7 @@ config ARC_TIMERS_64BIT
config ARM_ARCH_TIMER
bool
select TIMER_OF if OF
- select CLKSRC_ACPI if ACPI
+ select TIMER_ACPI if ACPI
config ARM_ARCH_TIMER_EVTSTREAM
bool "Enable ARM architected timer event stream generation by default"
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF
2017-05-27 9:58 ` [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF Daniel Lezcano
@ 2017-05-28 3:00 ` Shawn Guo
2017-05-28 9:18 ` Daniel Lezcano
2017-05-28 13:52 ` Linus Walleij
2017-05-31 8:24 ` Krzysztof Kozlowski
2 siblings, 1 reply; 13+ messages in thread
From: Shawn Guo @ 2017-05-28 3:00 UTC (permalink / raw)
To: Daniel Lezcano
Cc: tglx, linux-arm-kernel, linux-kernel, Russell King,
Florian Fainelli, Ray Jui, Scott Branden,
maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...,
Alexander Shiyan, Sascha Hauer, Fabio Estevam, Kukjin Kim,
Krzysztof Kozlowski, Javier Martinez Canillas, Catalin Marinas,
Will Deacon, Yoshinori Sato, Michal Simek, John Crispin,
Ralf Baechle, Ley Foon Tan, Rich Felker, Arnd Bergmann,
John Stultz, Stephen Boyd, Linus Walleij, Stephen Rothwell,
Olof Johansson,
moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES,
moderated list:H8/300 ARCHITECTURE,
open list:RALINK MIPS ARCHITECTURE,
moderated list:NIOS2 ARCHITECTURE, open list:SUPERH,
open list:GENERIC INCLUDE/ASM HEADER FILES
On Sat, May 27, 2017 at 11:58:47AM +0200, Daniel Lezcano wrote:
> diff --git a/arch/arm/mach-imx/epit.c b/arch/arm/mach-imx/epit.c
> index fb9a73a..4a4d2e2 100644
> --- a/arch/arm/mach-imx/epit.c
> +++ b/arch/arm/mach-imx/epit.c
> @@ -39,7 +39,7 @@
> #define EPITCR_OM_TOGGLE (1 << 22)
> #define EPITCR_OM_CLEAR (2 << 22)
> #define EPITCR_OM_SET (3 << 22)
> -#define EPITCR_CLKSRC_OFF (0 << 24)
> +#define EPITCR_TIMER_OFF (0 << 24)
> #define EPITCR_CLKSRC_PERIPHERAL (1 << 24)
> #define EPITCR_CLKSRC_REF_HIGH (1 << 24)
> #define EPITCR_CLKSRC_REF_LOW (3 << 24)
I do not think this change should be there.
Shawn
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF
2017-05-28 3:00 ` Shawn Guo
@ 2017-05-28 9:18 ` Daniel Lezcano
0 siblings, 0 replies; 13+ messages in thread
From: Daniel Lezcano @ 2017-05-28 9:18 UTC (permalink / raw)
To: Shawn Guo
Cc: tglx, linux-arm-kernel, linux-kernel, Russell King,
Florian Fainelli, Ray Jui, Scott Branden,
maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...,
Alexander Shiyan, Sascha Hauer, Fabio Estevam, Kukjin Kim,
Krzysztof Kozlowski, Javier Martinez Canillas, Catalin Marinas,
Will Deacon, Yoshinori Sato, Michal Simek, John Crispin,
Ralf Baechle, Ley Foon Tan, Rich Felker, Arnd Bergmann,
John Stultz, Stephen Boyd, Linus Walleij, Stephen Rothwell,
Olof Johansson,
moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES,
moderated list:H8/300 ARCHITECTURE,
open list:RALINK MIPS ARCHITECTURE,
moderated list:NIOS2 ARCHITECTURE, open list:SUPERH,
open list:GENERIC INCLUDE/ASM HEADER FILES
On 28/05/2017 05:00, Shawn Guo wrote:
> On Sat, May 27, 2017 at 11:58:47AM +0200, Daniel Lezcano wrote:
>> diff --git a/arch/arm/mach-imx/epit.c b/arch/arm/mach-imx/epit.c
>> index fb9a73a..4a4d2e2 100644
>> --- a/arch/arm/mach-imx/epit.c
>> +++ b/arch/arm/mach-imx/epit.c
>> @@ -39,7 +39,7 @@
>> #define EPITCR_OM_TOGGLE (1 << 22)
>> #define EPITCR_OM_CLEAR (2 << 22)
>> #define EPITCR_OM_SET (3 << 22)
>> -#define EPITCR_CLKSRC_OFF (0 << 24)
>> +#define EPITCR_TIMER_OFF (0 << 24)
>> #define EPITCR_CLKSRC_PERIPHERAL (1 << 24)
>> #define EPITCR_CLKSRC_REF_HIGH (1 << 24)
>> #define EPITCR_CLKSRC_REF_LOW (3 << 24)
>
> I do not think this change should be there.
Right. Thanks!
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 4/7] clocksource: Rename CLOCKSOURCE_ACPI_DECLARE
2017-05-27 9:58 ` [PATCH 4/7] clocksource: Rename CLOCKSOURCE_ACPI_DECLARE Daniel Lezcano
@ 2017-05-28 13:50 ` Linus Walleij
0 siblings, 0 replies; 13+ messages in thread
From: Linus Walleij @ 2017-05-28 13:50 UTC (permalink / raw)
To: Daniel Lezcano
Cc: Thomas Gleixner, linux-arm-kernel, linux-kernel, Mark Rutland,
Marc Zyngier, John Stultz, Stephen Boyd
On Sat, May 27, 2017 at 11:58 AM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> The macro name is now renamed to 'TIMER_ACPI_DECLARE' for consistency
> with the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change.
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 5/7] clocksource: Rename clksrc
2017-05-27 9:58 ` [PATCH 5/7] clocksource: Rename clksrc Daniel Lezcano
@ 2017-05-28 13:51 ` Linus Walleij
0 siblings, 0 replies; 13+ messages in thread
From: Linus Walleij @ 2017-05-28 13:51 UTC (permalink / raw)
To: Daniel Lezcano
Cc: Thomas Gleixner, linux-arm-kernel, linux-kernel, Arnd Bergmann,
John Stultz, Stephen Boyd,
open list:GENERIC INCLUDE/ASM HEADER FILES
On Sat, May 27, 2017 at 11:58 AM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> The table name is now renamed to 'timer' for consistency with
> the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change.
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF
2017-05-27 9:58 ` [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF Daniel Lezcano
2017-05-28 3:00 ` Shawn Guo
@ 2017-05-28 13:52 ` Linus Walleij
2017-05-31 8:24 ` Krzysztof Kozlowski
2 siblings, 0 replies; 13+ messages in thread
From: Linus Walleij @ 2017-05-28 13:52 UTC (permalink / raw)
To: Daniel Lezcano
Cc: Thomas Gleixner, linux-arm-kernel, linux-kernel, Russell King,
Florian Fainelli, Ray Jui, Scott Branden,
maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...,
Alexander Shiyan, Shawn Guo, Sascha Hauer, Fabio Estevam,
Kukjin Kim, Krzysztof Kozlowski, Javier Martinez Canillas,
Catalin Marinas, Will Deacon, Yoshinori Sato, Michal Simek,
John Crispin, Ralf Baechle, Ley Foon Tan, Rich Felker,
Arnd Bergmann, John Stultz, Stephen Boyd, Stephen Rothwell,
Olof Johansson,
moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES,
moderated list:H8/300 ARCHITECTURE,
open list:RALINK MIPS ARCHITECTURE,
moderated list:NIOS2 ARCHITECTURE, open list:SUPERH,
open list:GENERIC INCLUDE/ASM HEADER FILES
On Sat, May 27, 2017 at 11:58 AM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> The config option name is now renamed to 'TIMER_OF' for consistency with
> the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change.
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
After fixing the offset thing found by Shawn:
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 7/7] clocksource: Rename CLKSRC_ACPI
2017-05-27 9:58 ` [PATCH 7/7] clocksource: Rename CLKSRC_ACPI Daniel Lezcano
@ 2017-05-28 13:52 ` Linus Walleij
0 siblings, 0 replies; 13+ messages in thread
From: Linus Walleij @ 2017-05-28 13:52 UTC (permalink / raw)
To: Daniel Lezcano; +Cc: Thomas Gleixner, linux-arm-kernel, linux-kernel
On Sat, May 27, 2017 at 11:58 AM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> The config option name is now renamed to 'CLKSRC_ACPI' for consistency with
> the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change.
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE
[not found] ` <1495879129-28109-2-git-send-email-daniel.lezcano@linaro.org>
@ 2017-05-29 8:02 ` Mason
0 siblings, 0 replies; 13+ messages in thread
From: Mason @ 2017-05-29 8:02 UTC (permalink / raw)
To: Daniel Lezcano; +Cc: LKML
On 27/05/2017 11:58, Daniel Lezcano wrote:
> The CLOCKSOUCE_OF_DECLARE macro is used widely
"CLOCKSOURCE" is misspelled ;-)
Regards.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF
2017-05-27 9:58 ` [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF Daniel Lezcano
2017-05-28 3:00 ` Shawn Guo
2017-05-28 13:52 ` Linus Walleij
@ 2017-05-31 8:24 ` Krzysztof Kozlowski
2 siblings, 0 replies; 13+ messages in thread
From: Krzysztof Kozlowski @ 2017-05-31 8:24 UTC (permalink / raw)
To: Daniel Lezcano
Cc: tglx, linux-arm-kernel, linux-kernel, Russell King,
Florian Fainelli, Ray Jui, Scott Branden,
maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...,
Alexander Shiyan, Shawn Guo, Sascha Hauer, Fabio Estevam,
Kukjin Kim, Javier Martinez Canillas, Catalin Marinas,
Will Deacon, Yoshinori Sato, Michal Simek, John Crispin,
Ralf Baechle, Ley Foon Tan, Rich Felker, Arnd Bergmann,
John Stultz, Stephen Boyd, Linus Walleij, Stephen Rothwell,
Olof Johansson,
moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES,
moderated list:H8/300 ARCHITECTURE,
open list:RALINK MIPS ARCHITECTURE,
moderated list:NIOS2 ARCHITECTURE, open list:SUPERH,
open list:GENERIC INCLUDE/ASM HEADER FILES
On Sat, May 27, 2017 at 11:58 AM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> The config option name is now renamed to 'TIMER_OF' for consistency with
> the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change.
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> ---
> arch/arm/Kconfig | 10 +++---
> arch/arm/mach-bcm/Kconfig | 2 +-
> arch/arm/mach-clps711x/Kconfig | 2 +-
> arch/arm/mach-imx/epit.c | 2 +-
> arch/arm/mach-s3c24xx/Kconfig | 2 +-
> arch/arm/mach-s3c64xx/Kconfig | 2 +-
> arch/arm64/Kconfig.platforms | 4 +--
> arch/h8300/Kconfig | 2 +-
> arch/microblaze/Kconfig | 2 +-
> arch/mips/ralink/Kconfig | 2 +-
> arch/nios2/Kconfig | 2 +-
> arch/sh/boards/Kconfig | 2 +-
> drivers/clocksource/Kconfig | 60 ++++++++++++++++-----------------
> drivers/clocksource/Makefile | 2 +-
> drivers/clocksource/clksrc-probe.c | 55 ------------------------------
> drivers/clocksource/clps711x-timer.c | 2 +-
> drivers/clocksource/samsung_pwm_timer.c | 2 +-
For s3c24xx, s3c64xx and samsung_pwm_timer:
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2017-05-31 8:25 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-27 9:58 [PATCH 1/7] Revert "clockevents: Add a clkevt-of mechanism like clksrc-of" Daniel Lezcano
2017-05-27 9:58 ` [PATCH 4/7] clocksource: Rename CLOCKSOURCE_ACPI_DECLARE Daniel Lezcano
2017-05-28 13:50 ` Linus Walleij
2017-05-27 9:58 ` [PATCH 5/7] clocksource: Rename clksrc Daniel Lezcano
2017-05-28 13:51 ` Linus Walleij
2017-05-27 9:58 ` [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF Daniel Lezcano
2017-05-28 3:00 ` Shawn Guo
2017-05-28 9:18 ` Daniel Lezcano
2017-05-28 13:52 ` Linus Walleij
2017-05-31 8:24 ` Krzysztof Kozlowski
2017-05-27 9:58 ` [PATCH 7/7] clocksource: Rename CLKSRC_ACPI Daniel Lezcano
2017-05-28 13:52 ` Linus Walleij
[not found] ` <1495879129-28109-2-git-send-email-daniel.lezcano@linaro.org>
2017-05-29 8:02 ` [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE Mason
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).