Merge "msm: cam: icp: Use correct macro for input resources" into dev/msm-4.9-camx