Merge tag 'amlogic-fixes' into v5.9/dt64