Merge "ARM: dts: msm: Update the energy model for SDM670"