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

Commit a58ab739 authored by yutingshih(97855)'s avatar yutingshih(97855)
Browse files

Revert "Modified setting for the front camera S5K4H7YX" 

This reverts commit a53602a4.

Change-Id: I87121add7be8fe57ab03137a26b8e6d65ee10f7f
parent a53602a4

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

+87 −80
Original line number Diff line number Diff line
@@ -74,66 +74,85 @@ 
		qcom,clock-rates = <19200000 0>;

	};



/*<2018/10/18-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][][]Modified for new front camera device driver S5K4H7YX. */

	eeprom1: qcom,eeprom@1 {

		cell-index = <1>;

		compatible = "qcom,eeprom";

		qcom,cci-master = <1>;

		reg = <0x1>;

		qcom,eeprom-name = "sunny_8865";

		compatible = "qcom,eeprom";

		qcom,slave-addr = <0x6c>;

		qcom,cci-master = <0>;

		qcom,num-blocks = <8>;



		/* cam_vio-supply = <&cam_vio_gpio_regulator>; */ /* IOVDD */

		cam_vana-supply = <&pm8953_l22>; /* AVDD */

		/* cam_vdig-supply = <&cam_front_dvdd_gpio_regulator>; */ /* DVDD */

		/* cam_vaf-supply = <&pm8953_l17>; */ /* AFVDD is not usage */

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

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

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

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

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

		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>;



		cam_vdig-supply = <&pm8953_l23>;

		cam_vana-supply = <&pm8953_l22>;

		cam_vio-supply = <&pm8953_l6>;

		cam_vaf-supply = <&pm8953_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 2850000>;

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

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

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

		pinctrl-0 = <&cam_sensor_mclk1_default

				&cam_sensor_front1_default

				&cam_sensor_front1_vdig_default

				&cam_sensor_front1_vio_default>;

		pinctrl-1 = <&cam_sensor_mclk1_sleep

				&cam_sensor_front1_sleep

				&cam_sensor_front1_vdig_sleep

				&cam_sensor_front1_vio_sleep>;



			&cam_sensor_front1_default>;

		pinctrl-1 = <&cam_sensor_mclk1_sleep &cam_sensor_front1_sleep>;

		gpios = <&tlmm 27 0>,

			<&tlmm 129 0>,

				<&tlmm 46 0>,

				<&tlmm 123 0>;

			<&tlmm 130 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vdig = <2>;

		qcom,gpio-vio = <3>;

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

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

		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_VDIG2",

				"CAM_VIO2";



		status = "ok";

#if 1

		qcom,cam-power-seq-val = "sensor_gpio_reset",

				"cam_vana", "sensor_gpio_vdig",

				"sensor_gpio_vio", "sensor_gpio_reset",

					  "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-type = "sensor_gpio",

				"sensor_vreg", "sensor_gpio",

				"sensor_gpio", "sensor_gpio",

				"sensor_clk";

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

		qcom,cam-power-seq-delay = <5 1 1 3 3 10>; /* <1 1 1 1 1 10>; */

#endif

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

		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_gcc clk_mclk1_clk_src>,

			<&clock_gcc clk_gcc_camss_mclk1_clk>;

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

		qcom,clock-rates = <19200000 0>;

	};

/*>2018/10/18-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][][]. */



	eeprom2: qcom,eeprom@2 {

		cell-index = <2>;
@@ -263,59 +282,47 @@ 
		qcom,clock-rates = <24000000 0>;

	};



/*<2018/10/18-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][][]Modified for new front camera device driver S5K4H7YX. */

	camera2: qcom,camera@2 {

	qcom,camera@2 {

		cell-index = <2>;

		compatible = "qcom,camera";

		reg = <0x02>;

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

		qcom,csid-sd-index = <1>; /* SDM450 support 2 CSID cores. MSM8953 is 3 CSID cores */

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

		qcom,mount-angle = <90>;

		qcom,eeprom-src = <&eeprom1>;

		/* qcom,actuator-src = <&actuator1>; */ /* The auto focus is not support */



		/* cam_vio-supply = <&cam_vio_gpio_regulator>; */

		qcom,actuator-src = <&actuator1>;

		cam_vdig-supply = <&pm8953_l23>;

		cam_vio-supply = <&pm8953_l6>;

		cam_vana-supply = <&pm8953_l22>;

		/* cam_vdig-supply = <&cam_front_dvdd_gpio_regulator>; */

		/* cam_vaf-supply = <&pm8953_l17>; */ /* The AFVDD is not support */

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

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

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

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

		cam_vaf-supply = <&pm8953_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 2850000>;

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

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



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

		pinctrl-0 = <&cam_sensor_mclk1_default

				&cam_sensor_front1_default

				&cam_sensor_front1_vdig_default

				&cam_sensor_front1_vio_default>;

				&cam_sensor_front1_default>;

		pinctrl-1 = <&cam_sensor_mclk1_sleep

				&cam_sensor_front1_sleep

				&cam_sensor_front1_vdig_sleep

				&cam_sensor_front1_vio_sleep>;



				&cam_sensor_front1_sleep>;

		gpios = <&tlmm 27 0>,

			<&tlmm 129 0>,

				<&tlmm 46 0>,

				<&tlmm 123 0>;

			<&tlmm 130 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vdig = <2>;

		qcom,gpio-vio = <3>;

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

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

		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_VDIG2",

				"CAM_VIO2";



					  "CAM_STANDBY2";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <1>;

		status = "ok";

		clock-names = "cam_src_clk", "cam_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 = <24000000 0>;

	};

/*>2018/10/18-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][][]. */

};

arch/arm64/boot/dts/qcom/msm8953-pinctrl.dtsi

+0 −74
Original line number Diff line number Diff line
@@ -342,80 +342,15 @@ 
			};

		};



/*<2018/10/18-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][][]Modified for new front camera device driver S5K4H7YX. */

		cam_sensor_front1_vio_default: cam_sensor_front1_vio_default {

			/* CAM IOVDD */

			mux {

				pins = "gpio123";

				function = "gpio";

			};



			config {

				pins = "gpio123";

				bias-disable; /* No PULL */

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

			};

		};



		cam_sensor_front1_vio_sleep: cam_sensor_front1_vio_sleep {

			/* CAM IOVDD */

			mux {

				pins = "gpio123";

				function = "gpio";

			};



			config {

				pins = "gpio123";

				bias-disable; /* No PULL */

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

			};

		};



		cam_sensor_front1_vdig_default: cam_sensor_front1_vdig_default {

			/* CAM DVDD */

			mux {

				pins = "gpio46";

				function = "gpio";

			};



			config {

				pins = "gpio46";

				bias-disable; /* No PULL */

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

			};

		};



		cam_sensor_front1_vdig_sleep: cam_sensor_front1_vdig_sleep {

			/* CAM DVDD */

			mux {

				pins = "gpio46";

				function = "gpio";

			};



			config {

				pins = "gpio46";

				bias-disable; /* No PULL */

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

			};

		};



		cam_sensor_front1_default: cam_sensor_front1_default {

			/* RESET, STANDBY */

			mux {

			#if 1

				pins = "gpio129";   /* Only Reset,Non-standby GPIO */

			#else /* Qualcomm default */

				pins = "gpio129", "gpio130";

			#endif

				function = "gpio";

			};



			config {

			#if 1

				pins = "gpio129";   /* Only Reset,Non-standby GPIO */

			#else /* Qualcomm default */

				pins = "gpio129", "gpio130";

			#endif

				bias-disable; /* No PULL */

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

			};
@@ -424,25 +359,16 @@ 
		cam_sensor_front1_sleep: cam_sensor_front1_sleep {

			/* RESET, STANDBY */

			mux {

			#if 1

				pins = "gpio129";   /* Only Reset,Non-standby GPIO */

			#else /* Qualcomm default */

				pins = "gpio129", "gpio130";

			#endif

				function = "gpio";

			};



			config {

			#if 1

				pins = "gpio129";   /* Only Reset,Non-standby GPIO */

			#else /* Qualcomm default */

				pins = "gpio129", "gpio130";

			#endif

				bias-disable; /* No PULL */

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

			};

		};

/*>2018/10/18-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][][]. */



		pmx_adv7533_int: pmx_adv7533_int {

			adv7533_int_active: adv7533_int_active {

arch/arm64/boot/dts/qcom/sdm450-pmi632-mtp-s3.dtsi

+0 −10
Original line number Diff line number Diff line
@@ -21,16 +21,6 @@ 
	cam_vdig-supply = <&pm8953_l23>;

};



/*<2018/10/18-Yutng Shih.[FAIRPHONE][MISC][COMMON][CAMERA][][]Add and modified for new front camera device driver S5K4H7YX. */

//&eeprom1 {

//	/* */

//};



//&camera2 {

//	qcom,csid-sd-index = <1>; /* SDM450 support 2 CSID cores. MSM8953 is 3 CSID cores */

//};

/*>2018/10/18-Yuting Shih.[FAIRPHONE][MISC][COMMON][CAMERA][][]. */



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_hx8399c_truly_vid>;

	pinctrl-names = "mdss_default", "mdss_sleep";