| commit | 92d4c21e51fc12736c39c2a161a42f20e2be8a00 | [log] [tgz] |
|---|---|---|
| author | Olivier Deprez <olivier.deprez@arm.com> | Tue Dec 06 15:05:30 2022 +0100 |
| committer | Olivier Deprez <olivier.deprez@arm.com> | Tue Dec 06 15:05:30 2022 +0100 |
| tree | 0ea63b023a85dff7aeb0895b46d3b22a65669ae1 | |
| parent | 157378f43faad830e4aa3815bde5fa9f9a9f5be6 [diff] [blame] |
Update Linux to v5.10.157 Sourced from [1] [1] https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.157.tar.xz Signed-off-by: Olivier Deprez <olivier.deprez@arm.com> Change-Id: I7b30d9e98d8c465d6b44de8e7433b4a40b3289ba
diff --git a/drivers/clocksource/timer-ti-dm-systimer.c b/drivers/clocksource/timer-ti-dm-systimer.c index 1fccb45..2737407 100644 --- a/drivers/clocksource/timer-ti-dm-systimer.c +++ b/drivers/clocksource/timer-ti-dm-systimer.c
@@ -694,9 +694,9 @@ return 0; } - if (pa == 0x48034000) /* dra7 dmtimer3 */ + if (pa == 0x4882c000) /* dra7 dmtimer15 */ return dmtimer_percpu_timer_init(np, 0); - else if (pa == 0x48036000) /* dra7 dmtimer4 */ + else if (pa == 0x4882e000) /* dra7 dmtimer16 */ return dmtimer_percpu_timer_init(np, 1); return 0;