[PATCH 3/3] riscv: Move timer portions of SiFive CLINT to drivers/timer

[Rick Chen]

Hi Sean

> On 10/13/20 8:43 PM, Rick Chen wrote:
> >> Half of this driver is a DM-based timer driver, and half is RISC-V-specific
> >> IPI code. Move the timer portions in with the other timer drivers. The
> >> KConfig is not moved, since it also enables IPIs. It could also be split
> >> into two configs, but no boards use the timer but not the IPI atm, so I
> >> haven't split it.
> >>
> >> Signed-off-by: Sean Anderson <seanga2 at gmail.com>
> >> ---
> >>
> >>  MAINTAINERS                        |  1 +
> >>  arch/riscv/lib/sifive_clint.c      | 43 ++------------------------
> >>  drivers/timer/Makefile             |  1 +
> >>  drivers/timer/sifive_clint_timer.c | 49 ++++++++++++++++++++++++++++++
> >>  4 files changed, 53 insertions(+), 41 deletions(-)

I am trying to sync to master, but it conflicts.
Can you rebase again ?

Applying: riscv: Move Andes PLMT driver to drivers/timer
Applying: timer: Add _TIMER suffix to Andes PLMT Kconfig
Applying: riscv: Move timer portions of SiFive CLINT to drivers/timer
error: patch failed: arch/riscv/lib/sifive_clint.c:61
error: arch/riscv/lib/sifive_clint.c: patch does not apply
Patch failed at 0003 riscv: Move timer portions of SiFive CLINT to drivers/timer

Thanks,
Rick