Merge "ARM:dts:msm:8974 update generic cam entries"