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

Commit 0325dbe9 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: support IMX214 eeprom on 8994"

parents 7be63993 080dd804

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

+113 −0
Original line number Diff line number Diff line
@@ -47,6 +47,118 @@ 
		qcom,cam-vreg-op-mode = <100000>;

	};



	eeprom0: qcom,eeprom@0 {

		cell-index = <0>;

		reg = <0x0>;

		qcom,eeprom-name = "sony_imx214";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0x20>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <14>;

		qcom,page0 = <1 0x0a02 2 0x00 1 5>;

		qcom,pageen0 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll0 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem0 = <64 0x0a04 2 0 1 0>;



		qcom,page1 = <1 0x0a02 2 0x01 1 5>;

		qcom,pageen1 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll1 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem1 = <64 0x0a04 2 0 1 0>;



		qcom,page2 = <1 0x0a02 2 0x02 1 5>;

		qcom,pageen2 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll2 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem2 = <64 0x0a04 2 0 1 0>;



		qcom,page3 = <1 0x0a02 2 0x03 1 5>;

		qcom,pageen3 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll3 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem3 = <64 0x0a04 2 0 1 0>;



		qcom,page4 = <1 0x0a02 2 0x04 1 5>;

		qcom,pageen4 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll4 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem4 = <64 0x0a04 2 0 1 0>;



		qcom,page5 = <1 0x0a02 2 0x05 1 5>;

		qcom,pageen5 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll5 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem5 = <64 0x0a04 2 0 1 0>;



		qcom,page6 = <1 0x0a02 2 0x06 1 5>;

		qcom,pageen6 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll6 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem6 = <64 0x0a04 2 0 1 0>;



		qcom,page7 = <1 0x0a02 2 0x07 1 5>;

		qcom,pageen7 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll7 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem7 = <64 0x0a04 2 0 1 0>;



		qcom,page8 = <1 0x0a02 2 0x08 1 5>;

		qcom,pageen8 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll8 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem8 = <64 0x0a04 2 0 1 0>;



		qcom,page9 = <1 0x0a02 2 0x09 1 5>;

		qcom,pageen9 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll9 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem9 = <64 0x0a04 2 0 1 0>;



		qcom,page10 = <1 0x0a02 2 0x0A 1 5>;

		qcom,pageen10 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll10 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem10 = <64 0x0a04 2 0 1 0>;



		qcom,page11 = <1 0x0a02 2 0x0B 1 5>;

		qcom,pageen11 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll11 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem11 = <64 0x0a04 2 0 1 0>;



		qcom,page12 = <1 0x0a02 2 0x0C 1 5>;

		qcom,pageen12 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll12 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem12 = <64 0x0a04 2 0 1 0>;



		qcom,page13 = <1 0x0a02 2 0x0D 1 5>;

		qcom,pageen13 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll13 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem13 = <64 0x0a04 2 0 1 0>;



		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

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

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

		qcom,cam-vreg-min-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2700000>;

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

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

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

		pinctrl-0 = <&cam_sensor_mclk0_active &cam_sensor_rear_active>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend &cam_sensor_rear_suspend>;

		gpios = <&msm_gpio 13 0>,

			<&msm_gpio 92 0>,

			<&msm_gpio 91 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_MCLK0",

					  "CAM_RESET0",

					  "CAM_STANDBY0";

		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_mclk0_clk_src>,

				<&clock_mmss clk_camss_mclk0_clk>;

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

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";
@@ -54,6 +166,7 @@ 
		qcom,csiphy-sd-index = <0>;

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

		qcom,mount-angle = <90>;

		qcom,eeprom-src = <&eeprom0>;

		qcom,actuator-src = <&actuator0>;

		qcom,led-flash-src = <&led_flash0>;

		cam_vdig-supply = <&pm8994_l27>;

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

+113 −0
Original line number Diff line number Diff line
@@ -48,6 +48,118 @@ 
		qcom,cam-vreg-op-mode = <100000>;

	};



	eeprom0: qcom,eeprom@0 {

		cell-index = <0>;

		reg = <0x0>;

		qcom,eeprom-name = "sony_imx214";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0x20>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <14>;

		qcom,page0 = <1 0x0a02 2 0x00 1 5>;

		qcom,pageen0 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll0 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem0 = <64 0x0a04 2 0 1 0>;



		qcom,page1 = <1 0x0a02 2 0x01 1 5>;

		qcom,pageen1 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll1 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem1 = <64 0x0a04 2 0 1 0>;



		qcom,page2 = <1 0x0a02 2 0x02 1 5>;

		qcom,pageen2 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll2 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem2 = <64 0x0a04 2 0 1 0>;



		qcom,page3 = <1 0x0a02 2 0x03 1 5>;

		qcom,pageen3 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll3 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem3 = <64 0x0a04 2 0 1 0>;



		qcom,page4 = <1 0x0a02 2 0x04 1 5>;

		qcom,pageen4 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll4 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem4 = <64 0x0a04 2 0 1 0>;



		qcom,page5 = <1 0x0a02 2 0x05 1 5>;

		qcom,pageen5 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll5 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem5 = <64 0x0a04 2 0 1 0>;



		qcom,page6 = <1 0x0a02 2 0x06 1 5>;

		qcom,pageen6 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll6 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem6 = <64 0x0a04 2 0 1 0>;



		qcom,page7 = <1 0x0a02 2 0x07 1 5>;

		qcom,pageen7 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll7 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem7 = <64 0x0a04 2 0 1 0>;



		qcom,page8 = <1 0x0a02 2 0x08 1 5>;

		qcom,pageen8 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll8 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem8 = <64 0x0a04 2 0 1 0>;



		qcom,page9 = <1 0x0a02 2 0x09 1 5>;

		qcom,pageen9 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll9 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem9 = <64 0x0a04 2 0 1 0>;



		qcom,page10 = <1 0x0a02 2 0x0A 1 5>;

		qcom,pageen10 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll10 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem10 = <64 0x0a04 2 0 1 0>;



		qcom,page11 = <1 0x0a02 2 0x0B 1 5>;

		qcom,pageen11 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll11 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem11 = <64 0x0a04 2 0 1 0>;



		qcom,page12 = <1 0x0a02 2 0x0C 1 5>;

		qcom,pageen12 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll12 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem12 = <64 0x0a04 2 0 1 0>;



		qcom,page13 = <1 0x0a02 2 0x0D 1 5>;

		qcom,pageen13 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll13 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem13 = <64 0x0a04 2 0 1 0>;



		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

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

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

		qcom,cam-vreg-min-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2700000>;

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

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

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

		pinctrl-0 = <&cam_sensor_mclk0_active &cam_sensor_rear_active>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend &cam_sensor_rear_suspend>;

		gpios = <&msm_gpio 13 0>,

			<&msm_gpio 92 0>,

			<&msm_gpio 91 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_MCLK0",

					  "CAM_RESET0",

					  "CAM_STANDBY0";

		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_mclk0_clk_src>,

				<&clock_mmss clk_camss_mclk0_clk>;

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

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";
@@ -55,6 +167,7 @@ 
		qcom,csiphy-sd-index = <0>;

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

		qcom,mount-angle = <0>;

                qcom,eeprom-src = <&eeprom0>;

		qcom,actuator-src = <&actuator0>;

		qcom,led-flash-src = <&led_flash0>;

		cam_vdig-supply = <&pm8994_l27>;

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

+113 −0
Original line number Diff line number Diff line
@@ -47,6 +47,118 @@ 
		qcom,cam-vreg-op-mode = <100000>;

	};



	eeprom0: qcom,eeprom@0 {

		cell-index = <0>;

		reg = <0x0>;

		qcom,eeprom-name = "sony_imx214";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0x20>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <14>;

		qcom,page0 = <1 0x0a02 2 0x00 1 5>;

		qcom,pageen0 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll0 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem0 = <64 0x0a04 2 0 1 0>;



		qcom,page1 = <1 0x0a02 2 0x01 1 5>;

		qcom,pageen1 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll1 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem1 = <64 0x0a04 2 0 1 0>;



		qcom,page2 = <1 0x0a02 2 0x02 1 5>;

		qcom,pageen2 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll2 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem2 = <64 0x0a04 2 0 1 0>;



		qcom,page3 = <1 0x0a02 2 0x03 1 5>;

		qcom,pageen3 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll3 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem3 = <64 0x0a04 2 0 1 0>;



		qcom,page4 = <1 0x0a02 2 0x04 1 5>;

		qcom,pageen4 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll4 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem4 = <64 0x0a04 2 0 1 0>;



		qcom,page5 = <1 0x0a02 2 0x05 1 5>;

		qcom,pageen5 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll5 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem5 = <64 0x0a04 2 0 1 0>;



		qcom,page6 = <1 0x0a02 2 0x06 1 5>;

		qcom,pageen6 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll6 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem6 = <64 0x0a04 2 0 1 0>;



		qcom,page7 = <1 0x0a02 2 0x07 1 5>;

		qcom,pageen7 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll7 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem7 = <64 0x0a04 2 0 1 0>;



		qcom,page8 = <1 0x0a02 2 0x08 1 5>;

		qcom,pageen8 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll8 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem8 = <64 0x0a04 2 0 1 0>;



		qcom,page9 = <1 0x0a02 2 0x09 1 5>;

		qcom,pageen9 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll9 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem9 = <64 0x0a04 2 0 1 0>;



		qcom,page10 = <1 0x0a02 2 0x0A 1 5>;

		qcom,pageen10 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll10 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem10 = <64 0x0a04 2 0 1 0>;



		qcom,page11 = <1 0x0a02 2 0x0B 1 5>;

		qcom,pageen11 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll11 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem11 = <64 0x0a04 2 0 1 0>;



		qcom,page12 = <1 0x0a02 2 0x0C 1 5>;

		qcom,pageen12 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll12 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem12 = <64 0x0a04 2 0 1 0>;



		qcom,page13 = <1 0x0a02 2 0x0D 1 5>;

		qcom,pageen13 = <1 0x0a00 2 0x01 1 5>;

		qcom,poll13 = <1 0x0a01 2 0x01 1 5>;

		qcom,mem13 = <64 0x0a04 2 0 1 0>;



		cam_vdig-supply = <&pm8994_l27>;

		cam_vio-supply = <&pm8994_lvs1>;

		cam_vana-supply = <&pm8994_l17>;

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

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

		qcom,cam-vreg-min-voltage = <1050000 0 2700000>;

		qcom,cam-vreg-max-voltage = <1050000 0 2700000>;

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

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

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

		pinctrl-0 = <&cam_sensor_mclk0_active &cam_sensor_rear_active>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend &cam_sensor_rear_suspend>;

		gpios = <&msm_gpio 13 0>,

			<&msm_gpio 92 0>,

			<&msm_gpio 91 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_MCLK0",

					  "CAM_RESET0",

					  "CAM_STANDBY0";

		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_mclk0_clk_src>,

				<&clock_mmss clk_camss_mclk0_clk>;

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

	};



	qcom,camera@0 {

		cell-index = <0>;

		compatible = "qcom,camera";
@@ -54,6 +166,7 @@ 
		qcom,csiphy-sd-index = <0>;

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

		qcom,mount-angle = <270>;

		qcom,eeprom-src = <&eeprom0>;

		qcom,actuator-src = <&actuator0>;

		qcom,led-flash-src = <&led_flash0>;

		cam_vdig-supply = <&pm8994_l27>;