* Drew Fustini <dfustini@xxxxxxxxxxxx> [220202 23:26]: > I modified the errata fix to use timer 15 and 16 instead which resolves > the timer conflict. Makes sens to me, just one nit below. > Note: I am keeping the device tree and driver change together in one > patch as that is how the original errata fix commit was structured. Yes.. The old dtb handling for the timer driver causes this dependency unfortunately. > --- a/drivers/clocksource/timer-ti-dm-systimer.c > +++ b/drivers/clocksource/timer-ti-dm-systimer.c > @@ -695,9 +695,9 @@ static int __init dmtimer_percpu_quirk_init(struct device_node *np, u32 pa) > 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; Linux use lower case hex number typically :) With that, please feel free to add: Reviewed-by: Tony Lindgren <tony@xxxxxxxxxxx>
