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

Commit f0f2ff52 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: add eeprom support for front camera"

parents 8b956fec dd18b4c7

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

+68 −0
Original line number Diff line number Diff line
@@ -169,6 +169,73 @@ 
		clock-names = "cam_src_clk", "cam_clk";

	};



	eeprom1: qcom,eeprom@1 {

		cell-index = <1>;

		reg = <0x1>;

		qcom,eeprom-name = "ov4688";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0x6c>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <6>;

		qcom,page0 = <1 0x0100 2 0x01 1 10>;

		qcom,poll0 = <0 0x0 2 0 1 1>;

		qcom,mem0 = <0 0x0 2 0 1 0>;



		qcom,page1 = <1 0x3d84 2 0xc0 1 5>;

		qcom,poll1 = <0 0x0 2 0 1 1>;

		qcom,mem1 = <0 0x0 2 0 1 0>;



		qcom,page2 = <1 0x3d88 2 0x71 1 5>;

		qcom,poll2 = <0 0x0 2 0 1 1>;

		qcom,mem2 = <0 0x0 2 0 1 0>;



		qcom,page3 = <1 0x3d89 2 0x10 1 5>;

		qcom,poll3 = <0 0x0 2 0 1 1>;

		qcom,mem3 = <0 0x0 2 0 1 0>;



		qcom,page4 = <1 0x3d89 2 0x71 1 5>;

		qcom,poll4 = <0 0x0 2 0 1 1>;

		qcom,mem4 = <0 0x0 2 0 1 0>;



		qcom,page5 = <1 0x3d8b 2 0x69 1 1>;

		qcom,pageen5 = <1 0x3d81 2 0x01 1 10>;

		qcom,poll5 = <0 0x0 2 0 1 1>;

		qcom,mem5 = <90 0x7110 2 0 1 0>;



		cam_vdig-supply = <&pm8994_l3>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l29>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-type = <0 1 0>;

		qcom,cam-vreg-min-voltage = <1200000 0 2800000>;

		qcom,cam-vreg-max-voltage = <1200000 0 2800000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;

		qcom,gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_front_active>;

		pinctrl-1 = <&cam_sensor_mclk2_suspend &cam_sensor_front_suspend>;

		gpios = <&msm_gpio 15 0>,

			<&msm_gpio 104 0>,

			<&msm_gpio 105 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK2",

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,cam-power-seq-type = "sensor_vreg", "sensor_vreg", "sensor_vreg",

			"sensor_gpio", "sensor_gpio" , "sensor_clk";

		qcom,cam-power-seq-val = "cam_vdig", "cam_vana", "cam_vio",

			"sensor_gpio_reset", "sensor_gpio_standby","sensor_cam_mclk";

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

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

		status = "ok";

		clocks = <&clock_mmss clk_mclk2_clk_src>,

				<&clock_mmss clk_camss_mclk2_clk>;

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

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";
@@ -294,6 +361,7 @@ 
		qcom,csiphy-sd-index = <2>;

		qcom,csid-sd-index = <2>;

		qcom,mount-angle = <90>;

		qcom,eeprom-src = <&eeprom1>;

		qcom,actuator-src = <&actuator1>;

		cam_vdig-supply = <&pm8994_l3>;

		cam_vio-supply = <&pm8994_lvs1>;

arch/arm/boot/dts/qcom/msm8994-camera-sensor-liquid.dtsi

+68 −0
Original line number Diff line number Diff line
@@ -169,6 +169,73 @@ 
		clock-names = "cam_src_clk", "cam_clk";

	};



	eeprom1: qcom,eeprom@1 {

		cell-index = <1>;

		reg = <0x1>;

		qcom,eeprom-name = "ov4688";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0x6c>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <6>;

		qcom,page0 = <1 0x0100 2 0x01 1 10>;

		qcom,poll0 = <0 0x0 2 0 1 1>;

		qcom,mem0 = <0 0x0 2 0 1 0>;



		qcom,page1 = <1 0x3d84 2 0xc0 1 5>;

		qcom,poll1 = <0 0x0 2 0 1 1>;

		qcom,mem1 = <0 0x0 2 0 1 0>;



		qcom,page2 = <1 0x3d88 2 0x71 1 5>;

		qcom,poll2 = <0 0x0 2 0 1 1>;

		qcom,mem2 = <0 0x0 2 0 1 0>;



		qcom,page3 = <1 0x3d89 2 0x10 1 5>;

		qcom,poll3 = <0 0x0 2 0 1 1>;

		qcom,mem3 = <0 0x0 2 0 1 0>;



		qcom,page4 = <1 0x3d89 2 0x71 1 5>;

		qcom,poll4 = <0 0x0 2 0 1 1>;

		qcom,mem4 = <0 0x0 2 0 1 0>;



		qcom,page5 = <1 0x3d8b 2 0x69 1 1>;

		qcom,pageen5 = <1 0x3d81 2 0x01 1 10>;

		qcom,poll5 = <0 0x0 2 0 1 1>;

		qcom,mem5 = <90 0x7110 2 0 1 0>;



		cam_vdig-supply = <&pm8994_l3>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l29>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-type = <0 1 0>;

		qcom,cam-vreg-min-voltage = <1200000 0 2800000>;

		qcom,cam-vreg-max-voltage = <1200000 0 2800000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;

		qcom,gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_front_active>;

		pinctrl-1 = <&cam_sensor_mclk2_suspend &cam_sensor_front_suspend>;

		gpios = <&msm_gpio 15 0>,

			<&msm_gpio 104 0>,

			<&msm_gpio 105 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK2",

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,cam-power-seq-type = "sensor_vreg", "sensor_vreg", "sensor_vreg",

			"sensor_gpio", "sensor_gpio" , "sensor_clk";

		qcom,cam-power-seq-val = "cam_vdig", "cam_vana", "cam_vio",

			"sensor_gpio_reset", "sensor_gpio_standby","sensor_cam_mclk";

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

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

		status = "ok";

		clocks = <&clock_mmss clk_mclk2_clk_src>,

				<&clock_mmss clk_camss_mclk2_clk>;

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

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";
@@ -251,6 +318,7 @@ 
		qcom,csiphy-sd-index = <2>;

		qcom,csid-sd-index = <2>;

		qcom,mount-angle = <0>;

		qcom,eeprom-src = <&eeprom1>;

		qcom,actuator-src = <&actuator1>;

		cam_vdig-supply = <&pm8994_l3>;

		cam_vio-supply = <&pm8994_lvs1>;

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

+68 −0
Original line number Diff line number Diff line
@@ -170,6 +170,73 @@ 
		clock-names = "cam_src_clk", "cam_clk";

	};



	eeprom1: qcom,eeprom@1 {

		cell-index = <1>;

		reg = <0x1>;

		qcom,eeprom-name = "ov4688";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0x6c>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <6>;

		qcom,page0 = <1 0x0100 2 0x01 1 10>;

		qcom,poll0 = <0 0x0 2 0 1 1>;

		qcom,mem0 = <0 0x0 2 0 1 0>;



		qcom,page1 = <1 0x3d84 2 0xc0 1 5>;

		qcom,poll1 = <0 0x0 2 0 1 1>;

		qcom,mem1 = <0 0x0 2 0 1 0>;



		qcom,page2 = <1 0x3d88 2 0x71 1 5>;

		qcom,poll2 = <0 0x0 2 0 1 1>;

		qcom,mem2 = <0 0x0 2 0 1 0>;



		qcom,page3 = <1 0x3d89 2 0x10 1 5>;

		qcom,poll3 = <0 0x0 2 0 1 1>;

		qcom,mem3 = <0 0x0 2 0 1 0>;



		qcom,page4 = <1 0x3d89 2 0x71 1 5>;

		qcom,poll4 = <0 0x0 2 0 1 1>;

		qcom,mem4 = <0 0x0 2 0 1 0>;



		qcom,page5 = <1 0x3d8b 2 0x69 1 1>;

		qcom,pageen5 = <1 0x3d81 2 0x01 1 10>;

		qcom,poll5 = <0 0x0 2 0 1 1>;

		qcom,mem5 = <90 0x7110 2 0 1 0>;



		cam_vdig-supply = <&pm8994_l3>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l29>;

		qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";

		qcom,cam-vreg-type = <0 1 0>;

		qcom,cam-vreg-min-voltage = <1200000 0 2800000>;

		qcom,cam-vreg-max-voltage = <1200000 0 2800000>;

		qcom,cam-vreg-op-mode = <105000 0 80000>;

		qcom,gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk2_active &cam_sensor_front_active>;

		pinctrl-1 = <&cam_sensor_mclk2_suspend &cam_sensor_front_suspend>;

		gpios = <&msm_gpio 15 0>,

			<&msm_gpio 104 0>,

			<&msm_gpio 105 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-standby = <2>;

		qcom,gpio-req-tbl-num = <0 1 2>;

		qcom,gpio-req-tbl-flags = <1 0 0>;

		qcom,gpio-req-tbl-label = "CAMIF_MCLK2",

					  "CAM_RESET2",

					  "CAM_STANDBY2";

		qcom,cam-power-seq-type = "sensor_vreg", "sensor_vreg", "sensor_vreg",

			"sensor_gpio", "sensor_gpio" , "sensor_clk";

		qcom,cam-power-seq-val = "cam_vdig", "cam_vana", "cam_vio",

			"sensor_gpio_reset", "sensor_gpio_standby","sensor_cam_mclk";

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

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

		status = "ok";

		clocks = <&clock_mmss clk_mclk2_clk_src>,

				<&clock_mmss clk_camss_mclk2_clk>;

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

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";
@@ -255,6 +322,7 @@ 
		qcom,csiphy-sd-index = <2>;

		qcom,csid-sd-index = <2>;

		qcom,mount-angle = <90>;

		qcom,eeprom-src = <&eeprom1>;

		qcom,actuator-src = <&actuator1>;

		cam_vdig-supply = <&pm8994_l3>;

		cam_vio-supply = <&pm8994_lvs1>;