Merge "fip: s6 bringup [7/7]" into amlogic-dev