The following commit has been merged into the timers/core branch of tip: Commit-ID: 07385a6055a8649593052703b1bfd6aef49db02a Gitweb: https://git.kernel.org/tip/07385a6055a8649593052703b1bfd6aef49db02a Author: Kartik <kkartik@xxxxxxxxxx> AuthorDate: Mon, 04 Jul 2022 13:43:39 +05:30 Committer: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> CommitterDate: Sat, 16 Jul 2022 00:38:50 +02:00 clocksource/drivers/timer-tegra186: Add support for Tegra234 SoC The timer IP block present on Tegra234 SoC supports watchdog timer functionality that can be used to recover from system hangs. The watchdog timer uses a timer in the background for countdown. Signed-off-by: Kartik <kkartik@xxxxxxxxxx> Acked-by: Thierry Reding <treding@xxxxxxxxxx> Link: https://lore.kernel.org/r/1656922422-25823-4-git-send-email-kkartik@xxxxxxxxxx Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> --- drivers/clocksource/timer-tegra186.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/clocksource/timer-tegra186.c b/drivers/clocksource/timer-tegra186.c index 4515517..ea74288 100644 --- a/drivers/clocksource/timer-tegra186.c +++ b/drivers/clocksource/timer-tegra186.c @@ -486,8 +486,14 @@ static const struct tegra186_timer_soc tegra186_timer = { .num_wdts = 3, }; +static const struct tegra186_timer_soc tegra234_timer = { + .num_timers = 16, + .num_wdts = 3, +}; + static const struct of_device_id tegra186_timer_of_match[] = { { .compatible = "nvidia,tegra186-timer", .data = &tegra186_timer }, + { .compatible = "nvidia,tegra234-timer", .data = &tegra234_timer }, { } }; MODULE_DEVICE_TABLE(of, tegra186_timer_of_match);