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

Amlogic fixes for v5.8-rc
- misc DT fixes, and SoC ID fixes