UPSTREAM: Merge commit 'e0502b1d' into mainline - PC194 -0629

* commit 'e0502b1d':
  msm: camera: isp: Fix overwriting UBWC config register
  msm: camera: Correct check for rdi res_id
  msm: camera: isp: Fix CSID acquire in 2PD path
  ARM: dts: msm: Add register base address for sm8150 target
  ARM: dts: msm: Add support for PWM for BoB regulator for SM8150
  msm: camera: sensor: Add support to vote for PWM mode
  msm: camera: icp: allow reconfig io during streaming
  msm: camera: sync: Protect row state read
  msm: camera: flash: Optimizing flash off operation
  msm: camera: isp: Remove additional stop CSID paths
  msm: camera: ife: Add support for 2PD pipeline
  msm: camera: sensor: Correct spelling error

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