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

Commit dd67ccd7 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: Change eeprom 1 node for msm8953 based targets"

parents c73cdda4 304ac0de

arch/arm64/boot/dts/qcom/msm8953-camera-sensor-cdp.dtsi

+8 −49
Original line number Diff line number Diff line
@@ -77,47 +77,11 @@ 
	eeprom1: 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 = <&pm8953_l23>;

		cam_vana-supply = <&pm8953_l22>;

		cam_vio-supply = <&pm8953_l6>;

		cam_vana-supply = <&pm8953_l22>;

		cam_vaf-supply = <&pm8953_l17>;

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

					"cam_vaf";
@@ -128,7 +92,8 @@ 
		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk1_default

				&cam_sensor_front1_default>;

		pinctrl-1 = <&cam_sensor_mclk1_sleep &cam_sensor_front1_sleep>;

		pinctrl-1 = <&cam_sensor_mclk1_sleep

				&cam_sensor_front1_sleep>;

		gpios = <&tlmm 27 0>,

			<&tlmm 129 0>,

			<&tlmm 130 0>;
@@ -139,14 +104,8 @@ 
		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>;

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		status = "ok";

		clocks = <&clock_gcc clk_mclk1_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk1_clk>;

arch/arm64/boot/dts/qcom/msm8953-camera-sensor-mtp.dtsi

+8 −49
Original line number Diff line number Diff line
@@ -77,47 +77,11 @@ 
	eeprom1: 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 = <&pm8953_l23>;

		cam_vana-supply = <&pm8953_l22>;

		cam_vio-supply = <&pm8953_l6>;

		cam_vana-supply = <&pm8953_l22>;

		cam_vaf-supply = <&pm8953_l17>;

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

					"cam_vaf";
@@ -128,7 +92,8 @@ 
		pinctrl-names = "cam_default", "cam_suspend";

		pinctrl-0 = <&cam_sensor_mclk1_default

				&cam_sensor_front1_default>;

		pinctrl-1 = <&cam_sensor_mclk1_sleep &cam_sensor_front1_sleep>;

		pinctrl-1 = <&cam_sensor_mclk1_sleep

				&cam_sensor_front1_sleep>;

		gpios = <&tlmm 27 0>,

			<&tlmm 129 0>,

			<&tlmm 130 0>;
@@ -139,14 +104,8 @@ 
		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>;

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		status = "ok";

		clocks = <&clock_gcc clk_mclk1_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk1_clk>;