Merge "msm: msm_bus: Fix setting the modes for masters" into msm-3.4