diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2020-02-10 17:30:20 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-02-12 08:30:49 +0100 |
| commit | 37f468f474351b81603f058103945edce206e77a (patch) | |
| tree | ff6b2c69e466804e0d40e9684a8cbc96246eb24b /drivers | |
| parent | b6b8e9ceaf20c307e6eb7eb967d8398e7f7112f6 (diff) | |
| download | barebox-37f468f474351b81603f058103945edce206e77a.tar.gz barebox-37f468f474351b81603f058103945edce206e77a.tar.xz | |
clocksource: rename driver for ARMv8 Timer to ARM architected timer
The driver matches against both "arm,armv7-timer" and "arm,armv8-timer"
compatibles, thus rename it to better reflect that it's not only ARMv8
specific.
Only functional change intended is name changes. The symbol is default
y, so the rename shouldn't cause it to get lost with olddefconfig.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clocksource/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/clocksource/Makefile | 4 | ||||
| -rw-r--r-- | drivers/clocksource/arm_architected_timer.c (renamed from drivers/clocksource/armv8-timer.c) | 19 |
3 files changed, 12 insertions, 13 deletions
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 43c5bfc973..39ddd159f9 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -70,7 +70,7 @@ config CLOCKSOURCE_ROCKCHIP config CLOCKSOURCE_ATMEL_PIT bool -config CLOCKSOURCE_ARMV8_TIMER +config CLOCKSOURCE_ARM_ARCHITECTED_TIMER bool default y depends on ARM && (CPU_64v8 || CPU_V7) diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 8dbf91f323..cba6344bbb 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -11,9 +11,9 @@ obj-$(CONFIG_CLOCKSOURCE_ORION) += orion.o obj-$(CONFIG_CLOCKSOURCE_UEMD) += uemd.o obj-$(CONFIG_CLOCKSOURCE_ROCKCHIP)+= rk_timer.o obj-$(CONFIG_CLOCKSOURCE_ATMEL_PIT) += timer-atmel-pit.o -obj-$(CONFIG_CLOCKSOURCE_ARMV8_TIMER) += armv8-timer.o +obj-$(CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER) += arm_architected_timer.o ifneq ($(CONFIG_CPU_V8),y) -CFLAGS_armv8-timer.o := -march=armv7-a +CFLAGS_arm_architected_timer.o := -march=armv7-a endif obj-$(CONFIG_CLOCKSOURCE_ARM_GLOBAL_TIMER) += arm_global_timer.o obj-$(CONFIG_CLOCKSOURCE_IMX_GPT) += timer-imx-gpt.o diff --git a/drivers/clocksource/armv8-timer.c b/drivers/clocksource/arm_architected_timer.c index 3095f8cfc4..3ca7dfd17d 100644 --- a/drivers/clocksource/armv8-timer.c +++ b/drivers/clocksource/arm_architected_timer.c @@ -20,34 +20,33 @@ #include <io.h> #include <asm/system.h> -static uint64_t armv8_clocksource_read(void) +static uint64_t arm_arch_clocksource_read(void) { return get_cntpct(); } static struct clocksource cs = { - .read = armv8_clocksource_read, + .read = arm_arch_clocksource_read, .mask = CLOCKSOURCE_MASK(64), .shift = 0, }; -static int armv8_timer_probe(struct device_d *dev) +static int arm_arch_timer_probe(struct device_d *dev) { cs.mult = clocksource_hz2mult(get_cntfrq(), cs.shift); return init_clock(&cs); } -static struct of_device_id armv8_timer_dt_ids[] = { +static struct of_device_id arm_arch_timer_dt_ids[] = { { .compatible = "arm,armv7-timer", }, { .compatible = "arm,armv8-timer", }, { } }; -static struct driver_d armv8_timer_driver = { - .name = "armv8-timer", - .probe = armv8_timer_probe, - .of_compatible = DRV_OF_COMPAT(armv8_timer_dt_ids), +static struct driver_d arm_arch_timer_driver = { + .name = "arm-architected-timer", + .probe = arm_arch_timer_probe, + .of_compatible = DRV_OF_COMPAT(arm_arch_timer_dt_ids), }; -postcore_platform_driver(armv8_timer_driver); - +postcore_platform_driver(arm_arch_timer_driver); |