Merge "msm: cache_erp: Add device tree support" into msm-3.4