On Mon, 15 Apr 2019, Enric Balletbo i Serra wrote: > On 12/4/19 9:18, Pi-Hsun Shih wrote: > > System Companion Processor (SCP) is Cortex M4 co-processor on some > > MediaTek platform that can run EC-style firmware. Since a SCP and EC > > would both exist on a system, and use the cros_ec_dev driver, we need to > > differentiate between them for the userspace, or they would both be > > registered at /dev/cros_ec, causing a conflict. > > > > Signed-off-by: Pi-Hsun Shih <[email protected]> > > Acked-by: Enric Balletbo i Serra <[email protected]> > > Lee, there are several patches touching these files right now so you could > have > to solve some trivial conflicts. If you want I send a series with all that > apply > cleanly just let me know.
It would be ideal if you could bundle them to avoid conflicts. -- Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog

