Merge branch 'LA.UM.8.13.R1.08.00.00.571.023' into qcom-msm-4.19-7250

Change-Id: I774438447fb24e9d9aa7317d3304781bbbdb310e

5 files changed, 72 insertions, 7 deletions

diff --git a/bindings/msm-cam-custom-hw.txt b/bindings/msm-cam-custom-hw.txt
new file mode 100644
index 0000000..61125d0
--- /dev/null
+++ b/bindings/msm-cam-custom-hw.txt
@@ -0,0 +1,28 @@
+* Qualcomm Technologies, Inc. MSM Camera Custom HW
+
+Camera Custom device provides the definitions for enabling
+the custom hardware. It also provides the functions for the client
+to control the Custom hardware.
+
+=======================
+Required Node Structure
+=======================
+The Custom device is described in one level of the device node.
+
+======================================
+First Level Node - CAM Custom device
+======================================
+Required properties:
+- compatible
+  Usage: required
+  Value type: <string>
+  Definition: Should specify the compatibility string for matching the
+	driver. e.g. "qcom,cam_custom_hw_sub_mod".
+
+Example:
+
+	qcom,cam-custom-hw {
+		compatible = "qcom,cam_custom_hw_sub_mod";
+		arch-compat = "custom";
+		status = "ok";
+	};
diff --git a/bindings/msm-cam-custom.txt b/bindings/msm-cam-custom.txt
new file mode 100644
index 0000000..8c5cc61
--- /dev/null
+++ b/bindings/msm-cam-custom.txt
@@ -0,0 +1,31 @@
+* Qualcomm Technologies, Inc. MSM Camera Custom
+
+The MSM camera Custom driver provides the definitions for enabling
+the Camera custom hadware. It provides the functions for the Client to
+control the custom hardware.
+
+=======================
+Required Node Structure
+=======================
+The camera Custom device is described in one level of device node.
+
+==================================
+First Level Node - CAM CUSTOM device
+==================================
+- compatible
+  Usage: required
+  Value type: <string>
+  Definition: Should be "qcom,cam-custom".
+
+- arch-compat
+  Usage: required
+  Value type: <string>
+  Definition: Should be "custom".
+
+Example:
+
+	qcom,cam-custom {
+		compatible = "qcom,cam-custom";
+		arch-compat = "custom";
+		status = "ok";
+	};
diff --git a/bindings/msm-cam-ife-csid.txt b/bindings/msm-cam-ife-csid.txt
index 9d1af95..ecff78e 100644
--- a/bindings/msm-cam-ife-csid.txt
+++ b/bindings/msm-cam-ife-csid.txt
@@ -16,8 +16,8 @@ First Level Node - CAM IFE CSID device
   Usage: required
   Value type: <string>
   Definition: Should be "qcom,csid170", "qcom,csid175", "qcom,csid175_200",
-              "qcom,csid480", "qcom,csid-lite170", "qcom,csid-lite175"
-              or "qcom,csid-lite480".
+              "qcom,csid480", "qcom,csid-lite170", "qcom,csid-lite175",
+              "qcom,csid-lite480" or "qcom,csid-custom480".
 
 - cell-index
   Usage: required
diff --git a/kona-camera.dtsi b/kona-camera.dtsi
index e9931d2..7058993 100644
--- a/kona-camera.dtsi
+++ b/kona-camera.dtsi
@@ -430,7 +430,7 @@
 				<&apps_smmu 0x2420 0x400>,
 				<&apps_smmu 0x2421 0x400>;
 			label = "icp";
-			qcom,iommu-dma-addr-pool = <0xda00000 0xace00000>;
+			qcom,iommu-dma-addr-pool = <0x10c00000 0xcf300000>;
 			icp_iova_mem_map: iova-mem-map {
 				iova-mem-region-firmware {
 					/* Firmware region is 5MB */
@@ -564,14 +564,15 @@
 			<0 0 0 80000000 0 0 400000000 0>,
 			<0 0 0 80000000 0 0 400000000 0>,
 			<0 0 0 80000000 0 0 400000000 0>,
+			<0 0 0 80000000 0 0 400000000 0>,
 			<0 0 0 80000000 0 0 480000000 0>;
 		clock-cntl-level = "suspend", "minsvs", "lowsvs", "svs",
-			"svs_l1", "nominal", "turbo";
+			"svs_l1", "nominal", "nominal_l1", "turbo";
 		control-camnoc-axi-clk;
 		camnoc-bus-width = <32>;
 		camnoc-axi-clk-bw-margin-perc = <20>;
 		qcom,msm-bus,name = "cam_ahb";
-		qcom,msm-bus,num-cases = <7>;
+		qcom,msm-bus,num-cases = <8>;
 		qcom,msm-bus,num-paths = <1>;
 		qcom,msm-bus,vectors-KBps =
 			<MSM_BUS_MASTER_AMPSS_M0
@@ -587,6 +588,8 @@
 			<MSM_BUS_MASTER_AMPSS_M0
 			MSM_BUS_SLAVE_CAMERA_CFG 0 300000>,
 			<MSM_BUS_MASTER_AMPSS_M0
+			MSM_BUS_SLAVE_CAMERA_CFG 0 300000>,
+			<MSM_BUS_MASTER_AMPSS_M0
 			MSM_BUS_SLAVE_CAMERA_CFG 0 300000>;
 		vdd-corners = <RPMH_REGULATOR_LEVEL_RETENTION
 			RPMH_REGULATOR_LEVEL_MIN_SVS
diff --git a/lito-camera.dtsi b/lito-camera.dtsi
index 4478009..10751f4 100644
--- a/lito-camera.dtsi
+++ b/lito-camera.dtsi
@@ -1068,14 +1068,15 @@
 			<0 0 0 80000000 0 240000000 0>,
 			<0 0 0 80000000 0 320000000 0>,
 			<0 0 0 80000000 0 400000000 0>,
+			<0 0 0 80000000 0 400000000 0>,
 			<0 0 0 80000000 0 480000000 0>;
 		clock-cntl-level = "suspend", "lowsvs", "svs",
-			"svs_l1", "nominal", "turbo";
+			"svs_l1", "nominal", "nominal_l1", "turbo";
 		control-camnoc-axi-clk;
 		camnoc-bus-width = <32>;
 		camnoc-axi-clk-bw-margin-perc = <20>;
 		qcom,msm-bus,name = "cam_ahb";
-		qcom,msm-bus,num-cases = <7>;
+		qcom,msm-bus,num-cases = <8>;
 		qcom,msm-bus,num-paths = <1>;
 		qcom,msm-bus,vectors-KBps =
 			<MSM_BUS_MASTER_AMPSS_M0
@@ -1091,6 +1092,8 @@
 			<MSM_BUS_MASTER_AMPSS_M0
 			MSM_BUS_SLAVE_CAMERA_CFG 0 250000>,
 			<MSM_BUS_MASTER_AMPSS_M0
+			MSM_BUS_SLAVE_CAMERA_CFG 0 250000>,
+			<MSM_BUS_MASTER_AMPSS_M0
 			MSM_BUS_SLAVE_CAMERA_CFG 0 250000>;
 		vdd-corners = <RPMH_REGULATOR_LEVEL_RETENTION
 			RPMH_REGULATOR_LEVEL_MIN_SVS