Merge "msm: board-8660: Support unique map for CP and no CP" into msm-3.4