[PATCH v3 2/2] riscv: timer: Add support for an early timer

[Pragnesh Patel]

Hi Rick

On Tue, Jan 12, 2021 at 7:30 AM Rick Chen <rickchen36 at gmail.com> wrote:
>
> Hi Pragnesh
>
> > > From: Pragnesh Patel [mailto:pragnesh.patel at sifive.com]
> > > Sent: Sunday, January 10, 2021 8:43 PM
> > > To: u-boot at lists.denx.de
> > > Cc: atish.patra at wdc.com; palmerdabbelt at google.com; bmeng.cn at gmail.com; paul.walmsley at sifive.com; anup.patel at wdc.com; sagar.kadam at sifive.com; Rick Jian-Zhi Chen(陳建志); Pragnesh Patel; Palmer Dabbelt; Sean Anderson; Simon Glass
> > > Subject: [PATCH v3 2/2] riscv: timer: Add support for an early timer
> > >
> > > Added support for timer_early_get_count() and timer_early_get_rate()
> > > This is mostly useful in tracing.
> > >
> > > Signed-off-by: Pragnesh Patel <pragnesh.patel at sifive.com>
> > > ---
> > >
> > > Changes in v3:
> > > - Add IS_ENABLED(CONFIG_TIMER_EARLY) for timer_early_get_rate()
> > >   and timer_early_get_count() functions.
> >
> > Reviewed-by: Rick Chen <rick at andestech.com>
>
> I am trying to merge to mainline, but it conflict with master.
> Please rebase again,
>
> Applying: trace: select TIMER_EARLY to avoid infinite recursion
> Applying: riscv: timer: Add support for an early timer
> error: patch failed: drivers/timer/andes_plmt_timer.c:17
> error: drivers/timer/andes_plmt_timer.c: patch does not apply
> error: patch failed: drivers/timer/sifive_clint_timer.c:14
> error: drivers/timer/sifive_clint_timer.c: patch does not apply
> Patch failed at 0002 riscv: timer: Add support for an early timer
> The copy of the patch that failed is found in: .git/rebase-apply/patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".

Will rebase and send again.

>
> Thanks,
> Rick