On Tue, 2021-02-02 at 21:07 +0200, Sakari Ailus wrote: > On Tue, Jan 12, 2021 at 04:49:15PM -0300, Ezequiel Garcia wrote: > > Now that mach-based PXA platforms are registering proper > > fixed-rate clocks through the CCF, the v4l2-clk clock > > is no longer required. > > > > Drop this clock, so the driver no longer depends on the > > legacy v4l2-clk API. > > > > Signed-off-by: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxx> > > There was a minor conflict with the recently merged patches. I resolved it > (second last chunk) here: > > <URL:https://git.linuxtv.org/sailus/media_tree.git/commit/?id=2bd3c6097aaac76c0a7846456820de1ccf48194e> > Looks good. Thanks, Ezequiel