Merge "msm: scm-pas: Fix the bus-master port id for the MSM8610"