Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cfb1bf7 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: camera: Add hw pid info to ife nodes for lahaina and... 

Merge "ARM: dts: msm: camera: Add hw pid info to ife nodes for lahaina and shima" into camera-kernel.lnx.4.0
parents fb56679b 3f7c648b

bindings/msm-cam-vfe.txt

+6 −0
Original line number Diff line number Diff line
@@ -115,6 +115,11 @@ Optional properties: 
  Definition: Scalable clock names to identify which clocks needs to update

	along with source clock.



- cam_hw_pid:

  Usage: optional

  Value type: <u32>

  Definition: HW unique Pid values



Example:

	qcom,vfe0@acaf000 {

		cell-index = <0>;
@@ -152,5 +157,6 @@ Example: 
		scl-clk-en;

		scl-clk-names = "ife_axi_clk";

		qcom,cam-cx-ipeak = <&cx_ipeak_lm 2>;

		cam_hw_pid = < 28 4 16 8 >;

		status = "ok";

	};

lahaina-camera.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -1380,6 +1380,7 @@ 
		clocks-option = <&clock_camcc CAM_CC_IFE_0_DSP_CLK>;

		clock-rates-option = <720000000>;

		ubwc-static-cfg = <0x1026 0x1036>;

		cam_hw_pid = < 28 4 16 8 >;

		status = "ok";

	};
@@ -1466,6 +1467,7 @@ 
		clocks-option = <&clock_camcc CAM_CC_IFE_1_DSP_CLK>;

		clock-rates-option = <720000000>;

		ubwc-static-cfg = <0x1026 0x1036>;

		cam_hw_pid = < 29 5 17 9 >;

		status = "ok";

	};
@@ -1549,6 +1551,7 @@ 
		scl-clk-names = "ife_2_areg";

		clock-control-debugfs = "true";

		ubwc-static-cfg = <0x1026 0x1036>;

		cam_hw_pid = < 23 6 20 10>;

		status = "ok";

	};
@@ -1621,6 +1624,7 @@ 
			"turbo";

		src-clock-name = "ife_clk_src";

		clock-control-debugfs = "true";

		cam_hw_pid = < 7 >;

		status = "ok";

	};
@@ -1693,6 +1697,7 @@ 
			"turbo";

		src-clock-name = "ife_clk_src";

		clock-control-debugfs = "true";

		cam_hw_pid = < 21 >;

		status = "ok";

	};

shima-camera.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -756,6 +756,7 @@ 
		clocks-option = <&camcc CAM_CC_IFE_0_DSP_CLK>;

		clock-rates-option = <720000000>;

		ubwc-static-cfg = <0x1026 0x1036>;

		cam_hw_pid = < 28 4 16 8 >;

		status = "ok";

	};
@@ -842,6 +843,7 @@ 
		clocks-option = <&camcc CAM_CC_IFE_1_DSP_CLK>;

		clock-rates-option = <720000000>;

		ubwc-static-cfg = <0x1026 0x1036>;

		cam_hw_pid = < 29 5 17 9 >;

		status = "ok";

	};
@@ -925,6 +927,7 @@ 
		scl-clk-names = "ife_2_areg";

		clock-control-debugfs = "true";

		ubwc-static-cfg = <0x1026 0x1036>;

		cam_hw_pid = < 23 6 18 10>;

		status = "ok";

	};
@@ -997,6 +1000,7 @@ 
			"turbo";

		src-clock-name = "ife_clk_src";

		clock-control-debugfs = "true";

		cam_hw_pid = < 20 >;

		status = "ok";

	};
@@ -1069,6 +1073,7 @@ 
			"turbo";

		src-clock-name = "ife_clk_src";

		clock-control-debugfs = "true";

		cam_hw_pid = < 19 >;

		status = "ok";

	};