Merge "msm: msm_iomap: Unify iomap for 7x30 with 7K & 8K" into msm-3.0