Switch to msm7k with fixes