Merge "arm/dt: msm8610: Update SPM configuration"