Merge "ARM: dts: msm: Fix ER indices as per ipa-hw support"