move these to msm8960-common 1/2