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

Commit 0dbc8674 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: camera dtsi changes for 3.18 bringup"

parents c1b7221a 8d93546f

arch/arm/boot/dts/qcom/msm8952-camera-sensor-mtp.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
		qcom,cam-power-seq-val = "cam_vio";

		qcom,cam-power-seq-cfg-val = <1>;

		qcom,cam-power-seq-delay = <1>;

		status = "disabled";

		status = "ok";

	};



	qcom,camera@0 {
@@ -97,7 +97,7 @@ 
		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "disabled";

		status = "ok";

		clocks = <&clock_gcc clk_mclk0_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk0_clk>;

		clock-names = "cam_src_clk", "cam_clk";
@@ -135,7 +135,7 @@ 
		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "disabled";

		status = "ok";

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

		clock-names = "cam_src_clk", "cam_clk";
@@ -173,7 +173,7 @@ 
		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "disabled";

		status = "ok";

		clocks = <&clock_gcc clk_mclk2_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk2_clk>;

		clock-names = "cam_src_clk", "cam_clk";

arch/arm/boot/dts/qcom/msm8952-camera.dtsi

+33 −27
Original line number Diff line number Diff line
@@ -14,10 +14,15 @@ 
&soc {

	qcom,msm-cam@1b00000 {

		compatible = "qcom,msm-cam";

		reg = <0x8c0000 0x40000>;

		reg-names = "msm-cam";

		status = "ok";

		bus-vectors = "suspend", "svs", "nominal", "turbo";

		qcom,bus-votes = <0 320000000 640000000 640000000>;

	};



	qcom,csiphy@1b0ac00 {

		status = "disabled";

		status = "ok";

		cell-index = <0>;

		compatible = "qcom,csiphy-v3.1", "qcom,csiphy";

		reg = <0x1b0ac00 0x200>,
@@ -36,11 +41,11 @@ 
			"csiphy_timer_src_clk", "csiphy_timer_clk",

			"camss_ahb_src", "csi_phy_clk",

			"camss_ahb_clk";

		qcom,clock-rates = <0 61540000 200000000 0 0 0 0>;

		qcom,clock-rates = <0 61540000 160000000 0 0 0 0>;

	};



	qcom,csiphy@1b0b000 {

		status = "disabled";

		status = "ok";

		cell-index = <1>;

		compatible = "qcom,csiphy-v3.1", "qcom,csiphy";

		reg = <0x1b0b000 0x200>,
@@ -59,11 +64,11 @@ 
			"csiphy_timer_src_clk", "csiphy_timer_clk",

			"camss_ahb_src", "csi_phy_clk",

			"camss_ahb_clk";

		qcom,clock-rates = <0 61540000 200000000 0 0 0 0>;

		qcom,clock-rates = <0 61540000 160000000 0 0 0 0>;

	};



	qcom,csid@1b08000  {

		status = "disabled";

		status = "ok";

		cell-index = <0>;

		compatible = "qcom,csid-v3.4.1", "qcom,csid";

		reg = <0x1b08000 0x100>;
@@ -71,7 +76,7 @@ 
		interrupts = <0 51 0>;

		interrupt-names = "csid";

		qcom,csi-vdd-voltage = <1200000>;

		qcom,mipi-csi-vdd-supply = <&pm8950_l23>;

		qcom,mipi-csi-vdd-supply = <&pm8950_l2>;

		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,

			<&clock_gcc clk_gcc_camss_ispif_ahb_clk>,

			<&clock_gcc clk_gcc_camss_csi0_ahb_clk>,
@@ -84,11 +89,11 @@ 
			"ispif_ahb_clk", "csi_ahb_clk", "csi_src_clk",

			"csi_clk",  "csi_pix_clk",

			"csi_rdi_clk", "camss_ahb_clk";

		qcom,clock-rates = <0 61540000 0 200000000 0 0 0 0>;

		qcom,clock-rates = <0 61540000 0 160000000 0 0 0 0>;

	};



	qcom,csid@1b08400 {

		status = "disabled";

		status = "ok";

		cell-index = <1>;

		compatible = "qcom,csid-v3.4.1", "qcom,csid";

		reg = <0x1b08400 0x100>;
@@ -96,7 +101,7 @@ 
		interrupts = <0 52 0>;

		interrupt-names = "csid";

		qcom,csi-vdd-voltage = <1200000>;

		qcom,mipi-csi-vdd-supply = <&pm8950_l23>;

		qcom,mipi-csi-vdd-supply = <&pm8950_l2>;

		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,

			<&clock_gcc clk_gcc_camss_ispif_ahb_clk>,

			<&clock_gcc clk_gcc_camss_csi1_ahb_clk>,
@@ -109,11 +114,11 @@ 
			"ispif_ahb_clk", "csi_ahb_clk", "csi_src_clk",

			"csi_clk", "csi_pix_clk",

			"csi_rdi_clk", "camss_ahb_clk";

		qcom,clock-rates = <0 61540000 0 200000000 0 0 0 0>;

		qcom,clock-rates = <0 61540000 0 160000000 0 0 0 0>;

	};



	qcom,csid@1b08800 {

		status = "disabled";

		status = "ok";

		cell-index = <2>;

		compatible = "qcom,csid-v3.4.1", "qcom,csid";

		reg = <0x1b08800 0x100>;
@@ -121,7 +126,7 @@ 
		interrupts = <0 153 0>;

		interrupt-names = "csid";

		qcom,csi-vdd-voltage = <1200000>;

		qcom,mipi-csi-vdd-supply = <&pm8950_l23>;

		qcom,mipi-csi-vdd-supply = <&pm8950_l2>;

		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,

			<&clock_gcc clk_gcc_camss_ispif_ahb_clk>,

			<&clock_gcc clk_gcc_camss_csi2_ahb_clk>,
@@ -134,7 +139,7 @@ 
			"ispif_ahb_clk", "csi_ahb_clk", "csi_src_clk",

			"csi_clk", "csi_pix_clk",

			"csi_rdi_clk", "camss_ahb_clk";

		qcom,clock-rates = <0 61540000 0 200000000 0 0 0 0>;

		qcom,clock-rates = <0 61540000 0 160000000 0 0 0 0>;

	};



	qcom,ispif@1b0a000 {
@@ -295,13 +300,14 @@ 
		};

	};

	qcom,cam_smmu {

		status = "disabled";

		status = "ok";

		compatible = "qcom,msm-cam-smmu";

		msm_cam_smmu_cb1: msm_cam_smmu_cb1 {

			compatible = "qcom,qsmmu-cam-cb";

			iommus = <&apps_iommu 0x400>,

						<&apps_iommu 0x3000>;

			label = "vfe";

			qcom,scratch-buf-support;

		};



		msm_cam_smmu_cb2: msm_cam_smmu_cb2 {
@@ -324,7 +330,7 @@ 
	};



	qcom,jpeg@1b1c000 {

		status = "disabled";

		status = "ok";

		cell-index = <0>;

		compatible = "qcom,jpeg";

		reg = <0x1b1c000 0x400>,
@@ -348,7 +354,7 @@ 
	};



	qcom,irqrouter@1b00000 {

		status = "disabled";

		status = "ok";

		cell-index = <0>;

		compatible = "qcom,irqrouter";

		reg = <0x1b00000 0x100>;
@@ -356,7 +362,7 @@ 
	};



	qcom,cpp@1b04000 {

		status = "disabled";

		status = "ok";

		cell-index = <0>;

		compatible = "qcom,cpp";

		reg = <0x1b04000 0x100>,
@@ -390,7 +396,7 @@ 
	};



	cci: qcom,cci@1b0c000 {

		status = "disabled";

		status = "ok";

		cell-index = <0>;

		compatible = "qcom,cci";

		reg = <0x1b0c000 0x1000>;
@@ -399,17 +405,17 @@ 
		reg-names = "cci";

		interrupts = <0 50 0>;

		interrupt-names = "cci";

		clocks = <&clock_gcc clk_gcc_camss_top_ahb_clk>,

		clocks = <&clock_gcc clk_gcc_camss_ispif_ahb_clk>,

			<&clock_gcc clk_cci_clk_src>,

			<&clock_gcc clk_gcc_camss_cci_ahb_clk>,

			<&clock_gcc clk_gcc_camss_cci_clk>,

			<&clock_gcc clk_gcc_camss_ahb_clk>,

			<&clock_gcc clk_gcc_camss_ispif_ahb_clk>;

		clock-names = "camss_top_ahb_clk", "cci_src_clk",

			<&clock_gcc clk_gcc_camss_top_ahb_clk>;

		clock-names = "ispif_ahb_clk", "cci_src_clk",

			"cci_ahb_clk", "camss_cci_clk",

			"camss_ahb_clk", "ispif_ahb_clk";

		qcom,clock-rates = <0 19200000 0 0 0 61540000>,

				<0 37500000 0 0 0 61540000>;

			"camss_ahb_clk", "camss_top_ahb_clk";

		qcom,clock-rates = <61540000 19200000 0 0 0 0>,

				<61540000 37500000 0 0 0 0>;

		pinctrl-names = "cci_default", "cci_suspend";

			pinctrl-0 = <&cci0_active &cci1_active>;

			pinctrl-1 = <&cci0_suspend &cci1_suspend>;
@@ -465,7 +471,7 @@ 
	qcom,hw-scl-stretch-en = <0>;

	qcom,hw-trdhld = <6>;

	qcom,hw-tsp = <3>;

	status = "disabled";

	status = "ok";

};



&i2c_freq_custom {
@@ -479,7 +485,7 @@ 
	qcom,hw-scl-stretch-en = <1>;

	qcom,hw-trdhld = <6>;

	qcom,hw-tsp = <3>;

	status = "disabled";

	status = "ok";

};



&i2c_freq_1Mhz {
@@ -494,5 +500,5 @@ 
	qcom,hw-trdhld = <3>;

	qcom,hw-tsp = <3>;

	qcom,cci-clk-src = <37500000>;

	status = "disabled";

	status = "ok";

};

arch/arm/boot/dts/qcom/msm8952-pinctrl.dtsi

+95 −47
Original line number Diff line number Diff line
@@ -896,127 +896,175 @@ 
		};

		/*sensors */

		cam_sensor_mclk0_default: cam_sensor_mclk0_default {

			cam_sensor_mclk0_default {

			/* MCLK0 */

			mux {

				/* CLK, DATA */

				pins = "gpio26";

				function = "cam_mclk";

				drive-strength = <2>; /* 2 MA */

			};



			config {

				pins = "gpio26";

				bias-disable; /* No PULL */

				drive-strength = <2>; /* 2 MA */

			};

		};



		cam_sensor_mclk0_sleep: cam_sensor_mclk0_sleep {

			/*suspended state */

			cam_sensor_mclk0_sleep {

			/* MCLK0 */

			mux {

				/* CLK, DATA */

				pins = "gpio26";

				function = "cam_mclk";

				drive-strength = <2>; /* 2 MA */

			};



			config {

				pins = "gpio26";

				bias-pull-down; /* PULL DOWN */

				drive-strength = <2>; /* 2 MA */

			};

		};



		cam_sensor_rear_default: cam_sensor_rear_default {

			/* active state */

			cam_sensor_rear_default {

			/* RESET, STANDBY */

			mux {

				pins = "gpio36", "gpio35";

			};



			config {

				pins = "gpio36","gpio35";

				drive-strength = <2>; /* 2 MA */

				bias-disable; /* No PULL */

				drive-strength = <2>; /* 2 MA */

			};

		};



		cam_sensor_rear_sleep: cam_sensor_rear_sleep {

			/*suspended state */

			cam_sensor_rear_sleep {

			/* RESET, STANDBY */

			mux {

				pins = "gpio36","gpio35";

				function = "gpio";

			};



			config {

				pins = "gpio36","gpio35";

				drive-strength = <2>; /* 2 MA */

				bias-disable; /* No PULL */

				drive-strength = <2>; /* 2 MA */

			};

		};



		cam_sensor_mclk1_default: cam_sensor_mclk1_default {

			/* active state */

			cam_sensor_mclk1_default {

			/* MCLK1 */

			mux {

				/* CLK, DATA */

				pins = "gpio27";

				function = "cam_mclk";

				drive-strength = <2>; /* 2 MA */

			};



			config {

				pins = "gpio27";

				bias-disable; /* No PULL */

				drive-strength = <2>; /* 2 MA */

			};

		};



		cam_sensor_mclk1_sleep: cam_sensor_mclk1_sleep {

			/*suspended state */

			cam_sensor_mclk1_sleep {

			/* MCLK1 */

			mux {

				/* CLK, DATA */

				pins = "gpio27";

				function = "cam_mclk";

			};



			config {

				pins = "gpio27";

				function = "gpio";

				drive-strength = <2>; /* 2 MA */

				bias-pull-down; /* PULL DOWN */

				drive-strength = <2>; /* 2 MA */

			};

		};



		cam_sensor_front_default: cam_sensor_front_default {

			/* active state */

			cam_sensor_front_default {

			/* RESET, STANDBY */

			mux {

				pins = "gpio38","gpio37";

				function = "cam2_rst";

				drive-strength = <2>; /* 2 MA */

			};



			config {

				pins = "gpio38","gpio37";

				bias-disable; /* No PULL */

				drive-strength = <2>; /* 2 MA */

			};

		};



		cam_sensor_front_sleep: cam_sensor_front_sleep {

			/*suspended state */

			cam_sensor_front_sleep {

			/* RESET, STANDBY */

			mux {

				pins = "gpio38","gpio37";

				function = "cam2_rst";

				drive-strength = <2>; /* 2 MA */

			};



			config {

				pins = "gpio38","gpio37";

				bias-disable; /* No PULL */

				drive-strength = <2>; /* 2 MA */

			};

		};



		cam_sensor_mclk2_default: cam_sensor_mclk2_default {

			cam_sensor_mclk2_default {

				/* MCLK2 active state*/

			/* MCLK2 */

			mux {

				/* CLK, DATA */

				pins = "gpio28";

				function = "cam_mclk";

				drive-strength = <2>; /* 2 MA */

			};



			config {

				pins = "gpio28";

				bias-disable; /* No PULL */

				drive-strength = <2>; /* 2 MA */

			};

		};



		cam_sensor_mclk2_sleep: cam_sensor_mclk2_sleep {

			/* MCLK2 suspended state */

			cam_sensor_mclk2_sleep {

			/* MCLK2 */

			mux {

				/* CLK, DATA */

				pins = "gpio28";

				function = "cam_mclk";

				drive-strength = <2>; /* 2 MA */

			};



			config {

				pins = "gpio28";

				bias-pull-down; /* PULL DOWN */

				drive-strength = <2>; /* 2 MA */

			};

		};



		cam_sensor_front1_default: cam_sensor_front1_default {

			cam_sensor_front1_default {

				/* RESET, STANDBY active state */

			/* RESET, STANDBY */

			mux {

				pins = "gpio40", "gpio39";

				function = "webcam_rst";

				drive-strength = <2>; /* 2 MA */

			};



			config {

				pins = "gpio40", "gpio39";

				bias-disable; /* No PULL */

				drive-strength = <2>; /* 2 MA */

			};

		};



		cam_sensor_front1_sleep: cam_sensor_front1_sleep {

			cam_sensor_front1_sleep {

				/* RESET, STANDBY suspended state */

			/* RESET, STANDBY */

			mux {

				pins = "gpio40", "gpio39";

				function = "webcam_rst";

				drive-strength = <2>; /* 2 MA */

			};



			config {

				pins = "gpio40", "gpio39";

				bias-disable; /* No PULL */

				drive-strength = <2>; /* 2 MA */

			};

		};

arch/arm/boot/dts/qcom/msm8996-camera.dtsi

+3 −9
Original line number Diff line number Diff line
@@ -428,16 +428,10 @@ 
		msm_cam_smmu_cb1 {

			compatible = "qcom,msm-cam-smmu-cb";

			iommus = <&vfe_smmu 0>,

					<&vfe_smmu 2>;

			label = "vfe_image";

			qcom,scratch-buf-support;

		};



		msm_cam_smmu_cb2 {

			compatible = "qcom,msm-cam-smmu-cb";

			iommus = <&vfe_smmu 1>,

					<&vfe_smmu 1>,

					<&vfe_smmu 2>,

					<&vfe_smmu 3>;

			label = "vfe_stats";

			label = "vfe";

			qcom,scratch-buf-support;

		};