Merge "msm: dcvs: rearrange platform data"