Merge tag 'amlogic-drivers-2' of https://git.kernel.org/pub/scm/linux/kernel/git...