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