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

Commit a92aaeac 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: enable eeprom for camera ID 1 on Spyro WDP"

parents e1f1dbc8 6d7e8194

arch/arm64/boot/dts/qcom/sdm429-spyro-qrd-evt-camera.dtsi

+30 −71
Original line number Diff line number Diff line
@@ -203,82 +203,40 @@ 
	eeprom_spyro1: qcom,eeprom@1 {

		cell-index = <1>;

		reg = <0x1>;

		qcom,eeprom-name = "sunny_8865";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0x6c>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <8>;



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

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

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



		qcom,page1 = <1 0x5002 2 0x00 1 0>;

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

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



		qcom,page2 = <1 0x3d84 2 0xc0 1 0>;

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

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



		qcom,page3 = <1 0x3d88 2 0x70 1 0>;

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

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



		qcom,page4 = <1 0x3d89 2 0x10 1 0>;

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

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



		qcom,page5 = <1 0x3d8a 2 0x70 1 0>;

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

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



		qcom,page6 = <1 0x3d8b 2 0xf4 1 0>;

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

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



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

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

		qcom,mem7 = <1536 0x7010 2 0 1 0>;

		qcom,cci-master = <1>;



		cam_vdig-supply = <&pm660_l3>;

		cam_vana-supply = <&pm660_l7>;

		cam_vio-supply = <&pm660_l6>;

		cam_vio-supply = <&pm660_l14>;

		cam_vana-supply = <&pm660_s5>;

		cam_vaf-supply = <&pm660_l17>;

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

				"cam_vana", "cam_vaf";

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

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

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

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

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

		qcom,cam-vreg-min-voltage = <1200000 1800000 1420000>;

		qcom,cam-vreg-max-voltage = <1200000 1800000 1420000>;

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

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

		pinctrl-0 = <&cam_sensor_mclk2_default

			&cam_sensor_front1_default>;

		pinctrl-1 = <&cam_sensor_mclk2_sleep

			&cam_sensor_front1_sleep>;

		gpios = <&tlmm 28 0>,

			<&tlmm 40 0>,

			<&tlmm 39 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 = "disabled";

		clocks = <&clock_gcc clk_mclk2_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk2_clk>;

		pinctrl-0 = <&cam_sensor_mclk1_default

			&cam_sensor_front_default>;

		pinctrl-1 = <&cam_sensor_mclk1_sleep

			&cam_sensor_front_sleep>;

		gpios = <&tlmm 27 0>,

			<&tlmm 33 0>,

			<&tlmm 66 0>,

			<&tlmm 38 0>;

		qcom,gpio-vana= <1>;

		qcom,gpio-vdig= <2>;

		qcom,gpio-reset = <3>;

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

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

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

								"CAM_AVDD1",

								"CAM_DVDD1",

								"CAM_RESET1";

		status = "ok";

		clocks = <&clock_gcc clk_mclk1_clk_src>,

					<&clock_gcc clk_gcc_camss_mclk1_clk>;

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

		qcom,clock-rates = <19200000 0>;

		qcom,clock-rates = <24000000 0>;

	};



	qcom,camera@0 {
@@ -337,6 +295,8 @@ 
		qcom,csiphy-sd-index = <1>;

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

		qcom,mount-angle = <270>;

		qcom,eeprom-src = <&eeprom_spyro1>;



		cam_vdig-supply = <&pm660_l3>;

		cam_vio-supply = <&pm660_l14>;

		cam_vana-supply = <&pm660_s5>;
@@ -378,7 +338,6 @@ 
		qcom,csiphy-sd-index = <1>;

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

		qcom,mount-angle = <270>;

		qcom,eeprom-src = <&eeprom_spyro1>;

		qcom,actuator-src = <&actuator_spyro1>;

		cam_vdig-supply = <&pm660_l3>;

		cam_vana-supply = <&pm660_l7>;

arch/arm64/boot/dts/qcom/sdm429w-camera-sensor-spyro.dtsi

+29 −70
Original line number Diff line number Diff line
@@ -109,82 +109,40 @@ 
	eeprom_spyro1: qcom,eeprom@1 {

		cell-index = <1>;

		reg = <0x1>;

		qcom,eeprom-name = "sunny_8865";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0x6c>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <8>;



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

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

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



		qcom,page1 = <1 0x5002 2 0x00 1 0>;

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

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



		qcom,page2 = <1 0x3d84 2 0xc0 1 0>;

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

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



		qcom,page3 = <1 0x3d88 2 0x70 1 0>;

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

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



		qcom,page4 = <1 0x3d89 2 0x10 1 0>;

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

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



		qcom,page5 = <1 0x3d8a 2 0x70 1 0>;

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

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



		qcom,page6 = <1 0x3d8b 2 0xf4 1 0>;

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

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



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

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

		qcom,mem7 = <1536 0x7010 2 0 1 0>;

		qcom,cci-master = <1>;



		cam_vdig-supply = <&pm660_l3>;

		cam_vana-supply = <&pm660_l7>;

		cam_vio-supply = <&pm660_l6>;

		cam_vio-supply = <&pm660_l14>;

		cam_vana-supply = <&pm660_s5>;

		cam_vaf-supply = <&pm660_l17>;

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

				"cam_vana", "cam_vaf";

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

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

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

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

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

		qcom,cam-vreg-min-voltage = <1200000 1800000 1420000>;

		qcom,cam-vreg-max-voltage = <1200000 1800000 1420000>;

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

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

		pinctrl-0 = <&cam_sensor_mclk2_default

			&cam_sensor_front1_default>;

		pinctrl-1 = <&cam_sensor_mclk2_sleep

			&cam_sensor_front1_sleep>;

		gpios = <&tlmm 28 0>,

			<&tlmm 40 0>,

			<&tlmm 39 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>;

		pinctrl-0 = <&cam_sensor_mclk1_default

			&cam_sensor_front_default>;

		pinctrl-1 = <&cam_sensor_mclk1_sleep

			&cam_sensor_front_sleep>;

		gpios = <&tlmm 27 0>,

			<&tlmm 33 0>,

			<&tlmm 66 0>,

			<&tlmm 38 0>;

		qcom,gpio-vana= <1>;

		qcom,gpio-vdig= <2>;

		qcom,gpio-reset = <3>;

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

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

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

								"CAM_AVDD1",

								"CAM_DVDD1",

								"CAM_RESET1";

		status = "ok";

		clocks = <&clock_gcc clk_mclk2_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk2_clk>;

		clocks = <&clock_gcc clk_mclk1_clk_src>,

					<&clock_gcc clk_gcc_camss_mclk1_clk>;

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

		qcom,clock-rates = <19200000 0>;

		qcom,clock-rates = <24000000 0>;

	};



	qcom,camera@0 {
@@ -244,6 +202,8 @@ 
		qcom,csiphy-sd-index = <1>;

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

		qcom,mount-angle = <270>;

		qcom,eeprom-src = <&eeprom_spyro1>;



		cam_vdig-supply = <&pm660_l3>;

		cam_vio-supply = <&pm660_l14>;

		cam_vaf-supply = <&pm660_l19>;
@@ -286,7 +246,6 @@ 
		qcom,csiphy-sd-index = <1>;

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

		qcom,mount-angle = <270>;

		qcom,eeprom-src = <&eeprom_spyro1>;

		qcom,actuator-src = <&actuator_spyro1>;

		cam_vdig-supply = <&pm660_l3>;

		cam_vana-supply = <&pm660_l7>;