UPSTREAM: Merge commit 'ccfbd11d' into msm-4.9 - PC108

* commit 'ccfbd11d':
  Revert "msm: camera: icp: Freeing memory in workqueue"
  msm: camera: Reset csiphy during power up and power down

Change-Id: Ifd66259ddd629c8527f160fb49519f7a41aad734
Signed-off-by: Abhijit Trivedi <abhijitt@codeaurora.org>