adm8668: merge 3.3 fixes