Merge "arm/dt: msm8974: Add cache ERP devices" into msm-3.4