Merge "msm: iomap: Add MSMSAMARIUM support"