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

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

Merge changes I220c2b0a,Ia61332d5 into camera-kernel.lnx.4.0 

* changes:
  ARM: dts: msm: Add support for PHY-TPG in Lahaina and Bengal
  dt-bindings: camera: Add support for new TPG version
parents 8d51f3ee 9ef5a489

bengal-camera.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ 


	cam_tfe_tpg0: qcom,tpg0@5c66000 {

		cell-index = <0>;

		compatible = "qcom,tpgv1";

		compatible = "qcom,tpg101";

		reg-names = "tpg0", "top";

		reg = <0x5c66000 0x400>,

				<0x5c11000 0x1000>;
@@ -796,9 +796,9 @@ 
		status = "ok";

	};



	cam_tfe_tpg1: qcom,tpg0@5c68000 {

	cam_tfe_tpg1: qcom,tpg1@5c68000 {

		cell-index = <1>;

		compatible = "qcom,tpgv1";

		compatible = "qcom,tpg101";

		reg-names = "tpg0", "top";

		reg = <0x5c68000 0x400>,

				<0x5c11000 0x1000>;

bindings/msm-cam-tpg.txt

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Required properties: 
  Usage: required

  Value type: <string>

  Definition: Should specify the compatibility string for matching the

	driver. e.g. "qcom,tpgv1"

	driver. e.g. "qcom,tpg101", "qcom,tpg102"



- cell-index

  Usage: required
@@ -89,7 +89,7 @@ Required properties: 
Example:

	cam_tfe_tpg0: qcom,tpg0@5c66000 {

		cell-index = <0>;

		compatible = "qcom,tpgv1";

		compatible = "qcom,tpg101";

		reg-names = "tpg0", "top";

		reg = <0x5c66000 0x400>,

				<0x5c11000 0x1000>;

lahaina-camera.dtsi

+54 −1
Original line number Diff line number Diff line
@@ -585,7 +585,8 @@ 
			"csid0", "csid1", "csid2", "csid3",

			"csid4", "ife0", "ife1", "ife2", "ife3", "ife4",

			"custom0", "custom1", "ipe0", "cam-cdm-intf0",

			"cpas-cdm0", "bps0", "icp0", "jpeg-dma0", "jpeg-enc0";

			"cpas-cdm0", "bps0", "icp0", "jpeg-dma0", "jpeg-enc0",

			"tpg0", "tpg1";



		camera-bus-nodes {

			level3-nodes {
@@ -1568,6 +1569,58 @@ 
		status = "ok";

	};



	cam_csiphy_tpg0: qcom,tpg0@ac97000 {

		cell-index = <0>;

		compatible = "qcom,tpg102";

		reg-names = "tpg0", "cam_cpas_top";

		reg = <0xac97000 0x100>,

			<0xac40000 0x1000>;

		reg-cam-base = <0x97000 0x40000>;

		regulator-names = "camss";

		camss-supply = <&cam_cc_titan_top_gdsc>;

		clock-names =

			"cphy_rx_clk_src",

			"csiphy0_clk",

			"csi0phytimer_clk_src",

			"csi0phytimer_clk";

		clocks =

			<&clock_camcc CAM_CC_CPHY_RX_CLK_SRC>,

			<&clock_camcc CAM_CC_CSIPHY0_CLK>,

			<&clock_camcc CAM_CC_CSI0PHYTIMER_CLK_SRC>,

			<&clock_camcc CAM_CC_CSI0PHYTIMER_CLK>;

		clock-rates =

			<400000000 0 300000000 0>;

		clock-cntl-level = "nominal";

		src-clock-name = "csi0phytimer_clk_src";

		status = "ok";

	};



	cam_csiphy_tpg1: qcom,tpg1@ac98000 {

		cell-index = <1>;

		compatible = "qcom,tpg102";

		reg-names = "tpg1", "cam_cpas_top";

		reg = <0xac98000 0x100>,

			<0xac40000 0x1000>;

		reg-cam-base = <0x98000 0x40000>;

		regulator-names = "camss";

		camss-supply = <&cam_cc_titan_top_gdsc>;

		clock-names =

			"cphy_rx_clk_src",

			"csiphy1_clk",

			"csi1phytimer_clk_src",

			"csi1phytimer_clk";

		clocks =

			<&clock_camcc CAM_CC_CPHY_RX_CLK_SRC>,

			<&clock_camcc CAM_CC_CSIPHY1_CLK>,

			<&clock_camcc CAM_CC_CSI1PHYTIMER_CLK_SRC>,

			<&clock_camcc CAM_CC_CSI1PHYTIMER_CLK>;

		clock-rates =

			<400000000 0 300000000 0>;

		clock-cntl-level = "nominal";

		src-clock-name = "csi1phytimer_clk_src";

		status = "ok";

	};



	qcom,cam-icp {

		compatible = "qcom,cam-icp";

		compat-hw-name = "qcom,a5",