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

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

Merge "msm: camera: Enable ov2685 on msm8937"

parents affd31e4 aa22fdea

arch/arm/boot/dts/qcom/msm8937-camera-sensor-cdp.dtsi

+4 −5
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ 
				&cam_sensor_front_sleep>;

		gpios = <&tlmm 27 0>,

			<&tlmm 38 0>,

			<&tlmm 37 0>;

			<&tlmm 50 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;
@@ -225,10 +225,9 @@ 
		qcom,gpio-req-tbl-label = "CAMIF_MCLK1",

			"CAM_RESET1",

			"CAM_STANDBY1";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "disabled";

		qcom,sensor-position = <0x100>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <1>;

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

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

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

+4 −5
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ 
				&cam_sensor_front_sleep>;

		gpios = <&tlmm 27 0>,

			<&tlmm 38 0>,

			<&tlmm 37 0>;

			<&tlmm 50 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;
@@ -225,10 +225,9 @@ 
		qcom,gpio-req-tbl-label = "CAMIF_MCLK1",

			"CAM_RESET1",

			"CAM_STANDBY1";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;

		status = "disabled";

		qcom,sensor-position = <0x100>;

		qcom,sensor-mode = <1>;

		qcom,cci-master = <1>;

		clocks = <&clock_gcc clk_mclk1_clk_src>,

				<&clock_gcc clk_gcc_camss_mclk1_clk>;

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

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

+4 −4
Original line number Diff line number Diff line
@@ -1342,12 +1342,12 @@ 
		cam_sensor_front_default: cam_sensor_front_default {

			/* RESET, STANDBY */

			mux {

				pins = "gpio38","gpio37";

				pins = "gpio38","gpio50";

				function = "gpio";

			};



			config {

				pins = "gpio38","gpio37";

				pins = "gpio38","gpio50";

				bias-disable; /* No PULL */

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

			};
@@ -1356,12 +1356,12 @@ 
		cam_sensor_front_sleep: cam_sensor_front_sleep {

			/* RESET, STANDBY */

			mux {

				pins = "gpio38","gpio37";

				pins = "gpio38","gpio50";

				function = "gpio";

			};



			config {

				pins = "gpio38","gpio37";

				pins = "gpio38","gpio50";

				bias-disable; /* No PULL */

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

			};

drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_3_4_2_hwreg.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ struct csiphy_reg_parms_t csiphy_v3_4_2 = { 
	.mipi_csiphy_interrupt_status0_addr = 0x8B0,

	.mipi_csiphy_interrupt_clear0_addr = 0x858,

	.mipi_csiphy_glbl_irq_cmd_addr = 0x828,

	.combo_clk_mask = 0x10,

};



struct csiphy_reg_3ph_parms_t csiphy_v3_4_2_3ph = {

drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_3_5_hwreg.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ struct csiphy_reg_parms_t csiphy_v3_5 = { 
	.mipi_csiphy_interrupt_status0_addr = 0x8B0,

	.mipi_csiphy_interrupt_clear0_addr = 0x858,

	.mipi_csiphy_glbl_irq_cmd_addr = 0x828,

	.combo_clk_mask = 0x8,

};



struct csiphy_reg_3ph_parms_t csiphy_v3_5_3ph = {