Merge tag 'MMI-S2SN32.34-60' into android13-4.19-kona

* tag 'MMI-S2SN32.34-60':
  ARM: dts: msm: Add support for tioman gpio for Khaje
  ARM: dts: msm: Add flash support for khaje
  ARM: dts: msm: Add sensor devicetree for khaje camera
  ARM: dts: msm: Add CSIPHY/CCI nodes for khaje
  ARM: dts: msm: Add camera device tree support for Khaje Camera
  ARM: dts: msm: Add tpg node to bengal device tree
  ARM: dts: msm: fix wrong IRQ type for TFE
  ARM: dts: msm: Fix the svs voting level for scuba csiphy
  ARM: dts: msm: camera: disable gpu mitigation
  ARM: dts: msm: camera: ope: Change turbo clock corner
  ARM: dts: msm: camera: Add tfe2 fuse info to cpas node
  ARM: dts: msm: Add GMSL camera DTSI for robotics RB5
  ARM: dts: msm: camera: ope: enabled debugfs support for clk level
  ARM: dts: msm: Fix the vdig voltage for front camera
  ARM: dts: msm: Add support for robotics RB5 camera
  ARM: dts: msm: Remove fuse setting for secure camera
  ARM: dts: msm: camera: Add support to Cx Ipeak
  ARM: dts: msm: Update PHY version for bengal target
  ARM: dts: msm: camera: cpas: Disable secure feature mask
  ARM: dts: msm: Fix compilation issue for scuba-camera-sensor-idp
  ARM: dts: msm: Update GPU Mitigation
  ARM: dts: msm: Add Camera Sensor nodes for IDP/IDPS for scuba
  ARM: dts: msm: Fix the phy regulator voltage
  ARM: dts: msm: Add cci and csiphy support for Scuba camera
  ARM: dts: msm: Fix Bus and TFE nodes in Scuba camera
  ARM: dts: msm: Add support for Scuba camera
  ARM: dts: msm: Add csiphy3 and cci1 clients to cpas
  ARM: dts: msm: Change CSID and VFE interrupt name for lagoon camera
  ARM: dts: msm: Change IPE Write port, IPE clock source for lagoon camera
  ARM: dts: msm: Add csiphy and cci nodes in lagoon camera DT
  ARM: dts: msm: Update clock header for lagoon
  ARM: dts: msm: Add camera sensor nodes in MTP/CDP for lagoon
  ARM: dts: msm: camera: ope: Change BL fifo depth
  ARM: dts: msm: Add support for Kona XR platform camera hardware
  ARM: dts: msm: Change the vdig voltage of bengal front camera
  ARM: dts: msm: Change the vdig voltage of bengal front camera
  ARM: dts: msm: Fix order of clock naming in csid lite node for kona
  ARM: dts: msm: camera: Update fifo depth for OPE CDM
  ARM: dts: msm: Add CAMNOC nodes in lagoon camera dtsi
  ARM: dts: msm: Override csiphy version for lito v2
  ARM: dts: msm: camera: cpas: Add GPU Limit support
  ARM: dts: msm: Add lagoon camera dtsi
  dt-bindings: camera: Add CSID and IFE support for lagoon
  ARM: dts: msm: Fix inverted image on front camera
  ARM: dts: msm: camera: Correct the clock rates for all modules
  ARM: dts: msm: Add support to discard a region in dma space
  ARM: dts: msm: Fix orientation of front camera
  ARM: dts: msm: Add camera dts nodes for Bengal QRD
  ARM: dts: msm: camera: Add support to Cx Ipeak
  ARM: dts: msm: camera: smmu: Fix camera SID issue
  ARM: dts: msm: camera: cpas: Add camera fuse support
  ARM: dts: msm: camera: cci: Add cci version
  ARM: dts: msm: Fix orientation of camera sensors
  ARM: dts: msm: Fix the reset gpio for rear aux camera
  ARM: dts: msm: camera: cpas: Add constituent paths for OPE
  ARM: dts: msm: camera: Add required clocks to tpg and cpas node
  ARM: dts: msm: Fix svs clock level for bengal
  ARM: dts: msm: Fix custom gpio tables for bengal
  ARM: dts: msm: Add support for camera hardware for bengal platform
  ARM: dts: msm: Add dtsi nodes for csiphy and cci
  dt-bindings: camera: Add CDM support
  dt-bindings: camera: Add TFE support
  ARM: dts: msm: Add support for target SM4250

 Conflicts:
	arch/arm64/boot/dts/vendor/qcom/camera/bengal-camera-sensor-idp.dtsi
	arch/arm64/boot/dts/vendor/qcom/camera/bengal-camera-sensor-qrd.dtsi
	arch/arm64/boot/dts/vendor/qcom/camera/bengal-camera.dtsi
	arch/arm64/boot/dts/vendor/qcom/camera/bindings/msm-cam-csiphy.txt
	arch/arm64/boot/dts/vendor/qcom/camera/kona-camera-sensor-rb5.dtsi
	arch/arm64/boot/dts/vendor/qcom/camera/kona-camera-sensor-xr.dtsi
	arch/arm64/boot/dts/vendor/qcom/camera/lagoon-camera-sensor-cdp.dtsi
	arch/arm64/boot/dts/vendor/qcom/camera/lagoon-camera-sensor-mtp.dtsi
	arch/arm64/boot/dts/vendor/qcom/camera/lagoon-camera.dtsi
	arch/arm64/boot/dts/vendor/qcom/camera/scuba-camera-sensor-idp.dtsi
	arch/arm64/boot/dts/vendor/qcom/camera/scuba-camera.dtsi

Change-Id: Ief1f21727ae2c9c5c280e5d8976b6eb6825ca8c3