Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2183349
Conflicts:
drivers/clocksource/Makefile
Contextual conflicts due to missed upstream commit 5fc1f93f6998.
5fc1f93f6998 clocksource/drivers: Add MStar MSC313e timer support
commit c92e7ef16400bf035e8b49c7dd091bfce4f99773
Author: Laurent Vivier <laurent@vivier.eu>
Date: Wed Apr 6 22:15:22 2022 +0200
clocksource/drivers: Add a goldfish-timer clocksource
Add a clocksource based on the goldfish-rtc device.
Move the timer register definition to <clocksource/timer-goldfish.h>
This kernel implementation is based on the QEMU upstream implementation:
https://git.qemu.org/?p=qemu.git;a=blob_plain;f=hw/rtc/goldfish_rtc.c
goldfish-timer is a high-precision signed 64-bit nanosecond timer.
It is part of the 'goldfish' virtual hardware platform used to run
some emulated Android systems under QEMU.
This timer only supports oneshot event.
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20220406201523.243733-4-laurent@vivier.eu
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
(cherry picked from commit c92e7ef16400bf035e8b49c7dd091bfce4f99773)
Signed-off-by: Gavin Shan <gshan@redhat.com>
Gavin Shan