Merge "msm: rtb: Macroize more of the readl/writel code" into msm-3.0