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

Commit a9ec3bd6 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: Front camera config for msmfalcon interposer"

parents 12c33fab 403cd709

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

+116 −0
Original line number Diff line number Diff line
@@ -12,6 +12,24 @@ 
 */



&soc {

	led_flash0: qcom,camera-flash@0 {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		qcom,flash-source = <&pm2falcon_flash0 &pm2falcon_flash1>;

		qcom,torch-source = <&pm2falcon_torch0 &pm2falcon_torch1>;

		qcom,switch-source = <&pm2falcon_switch0>;

		status = "ok";

	};



	led_flash1: qcom,camera-flash@1 {

		cell-index = <1>;

		compatible = "qcom,camera-flash";

		qcom,flash-source = <&pm2falcon_flash2>;

		qcom,torch-source = <&pm2falcon_torch2>;

		qcom,switch-source = <&pm2falcon_switch1>;

		status = "ok";

	};



	qcom,csiphy@ca34000 {

		qcom,clock-rates = <0 0 0 0 0 0 384000000 0 0 269333333 0

			0 384000000 0>;
@@ -164,6 +182,46 @@ 
		qcom,clock-rates = <24000000 0>;

	};



	eeprom2: qcom,eeprom@2 {

		cell-index = <2>;

		reg = <0x2>;

		compatible = "qcom,eeprom";

		cam_vio-supply = <&pmfalcon_l11>;

		cam_vana-supply = <&pm2falcon_bob>;

		cam_vdig-supply = <&pmfalcon_s5>;

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

		qcom,cam-vreg-min-voltage = <0 3300000 1350000>;

		qcom,cam-vreg-max-voltage = <0 3600000 1350000>;

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

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

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

		pinctrl-0 = <&cam_sensor_mclk1_active

				 &cam_sensor_front_active>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

				 &cam_sensor_front_suspend>;

		gpios = <&tlmm 14 0>,

			<&tlmm 28 0>,

			<&pmfalcon_gpios 3 0>,

			<&tlmm 29 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vdig = <2>;

		qcom,gpio-vana = <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_MCLK2",

					"CAM_RESET2",

					"CAM_VDIG",

					"CAM_VANA";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <1>;

		status = "ok";

		clocks = <&clock_mmss clk_mclk1_clk_src>,

			<&clock_mmss clk_mmss_camss_mclk1_clk>;

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

		qcom,clock-rates = <24000000 0>;

	};



	qcom,camera@0 {

		cell-index = <0>;

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

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

		qcom,mount-angle = <270>;

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

		qcom,actuator-src = <&actuator0>;

		qcom,ois-src = <&ois0>;

		qcom,eeprom-src = <&eeprom0>;
@@ -209,8 +268,55 @@ 
		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};



	qcom,camera@2 {

		cell-index = <2>;

		compatible = "qcom,camera";

		reg = <0x02>;

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

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

		qcom,mount-angle = <90>;

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

		qcom,eeprom-src = <&eeprom2>;

		qcom,actuator-src = <&actuator1>;

		cam_vio-supply = <&pmfalcon_l11>;

		cam_vana-supply = <&pm2falcon_bob>;

		cam_vdig-supply = <&pmfalcon_s5>;

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

		qcom,cam-vreg-min-voltage = <0 3300000 1350000>;

		qcom,cam-vreg-max-voltage = <0 3600000 1350000>;

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

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

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

		pinctrl-0 = <&cam_sensor_mclk1_active

				 &cam_sensor_front_active>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

				 &cam_sensor_front_suspend>;

		gpios = <&tlmm 14 0>,

			<&tlmm 28 0>,

			<&pmfalcon_gpios 3 0>,

			<&tlmm 29 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vdig = <2>;

		qcom,gpio-vana = <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_MCLK2",

					"CAM_RESET2",

					"CAM_VDIG",

					"CAM_VANA";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <1>;

		status = "ok";

		clocks = <&clock_mmss clk_mclk1_clk_src>,

			<&clock_mmss clk_mmss_camss_mclk1_clk>;

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

		qcom,clock-rates = <24000000 0>;

	};

};





&pmfalcon_gpios {

	gpio@c300 { /* GPIO4 -CAMERA SENSOR 0 VDIG*/

		qcom,mode = <1>;                /* Output */
@@ -221,4 +327,14 @@ 
		qcom,master-en = <1>;           /* Enable GPIO */

		status = "ok";

	};



	gpio@c200 { /* GPIO3 -CAMERA SENSOR 1 VDIG*/

		qcom,mode = <1>;                /* Output */

		qcom,pull = <5>;                /* No Pull */

		qcom,vin-sel = <0>;             /* VIN1 GPIO_LV */

		qcom,src-sel = <0>;             /* GPIO */

		qcom,invert = <0>;              /* Invert */

		qcom,master-en = <1>;           /* Enable GPIO */

		status = "ok";

	};

};

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

+116 −0
Original line number Diff line number Diff line
@@ -12,6 +12,24 @@ 
 */



&soc {

	led_flash0: qcom,camera-flash@0 {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		qcom,flash-source = <&pm2falcon_flash0 &pm2falcon_flash1>;

		qcom,torch-source = <&pm2falcon_torch0 &pm2falcon_torch1>;

		qcom,switch-source = <&pm2falcon_switch0>;

		status = "ok";

	};



	led_flash1: qcom,camera-flash@1 {

		cell-index = <1>;

		compatible = "qcom,camera-flash";

		qcom,flash-source = <&pm2falcon_flash2>;

		qcom,torch-source = <&pm2falcon_torch2>;

		qcom,switch-source = <&pm2falcon_switch1>;

		status = "ok";

	};



	qcom,csiphy@ca34000 {

		qcom,clock-rates = <0 0 0 0 0 0 384000000 0 0 269333333 0

			0 384000000 0>;
@@ -164,6 +182,46 @@ 
		qcom,clock-rates = <24000000 0>;

	};



	eeprom2: qcom,eeprom@2 {

		cell-index = <2>;

		reg = <0x2>;

		compatible = "qcom,eeprom";

		cam_vio-supply = <&pmfalcon_l11>;

		cam_vana-supply = <&pm2falcon_bob>;

		cam_vdig-supply = <&pmfalcon_s5>;

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

		qcom,cam-vreg-min-voltage = <0 3300000 1350000>;

		qcom,cam-vreg-max-voltage = <0 3600000 1350000>;

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

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

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

		pinctrl-0 = <&cam_sensor_mclk1_active

				 &cam_sensor_front_active>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

				 &cam_sensor_front_suspend>;

		gpios = <&tlmm 14 0>,

			<&tlmm 28 0>,

			<&pmfalcon_gpios 3 0>,

			<&tlmm 29 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vdig = <2>;

		qcom,gpio-vana = <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_MCLK2",

					"CAM_RESET2",

					"CAM_VDIG",

					"CAM_VANA";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <1>;

		status = "ok";

		clocks = <&clock_mmss clk_mclk1_clk_src>,

			<&clock_mmss clk_mmss_camss_mclk1_clk>;

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

		qcom,clock-rates = <24000000 0>;

	};



	qcom,camera@0 {

		cell-index = <0>;

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

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

		qcom,mount-angle = <270>;

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

		qcom,actuator-src = <&actuator0>;

		qcom,ois-src = <&ois0>;

		qcom,eeprom-src = <&eeprom0>;
@@ -209,8 +268,55 @@ 
		clock-names = "cam_src_clk", "cam_clk";

		qcom,clock-rates = <24000000 0>;

	};



	qcom,camera@2 {

		cell-index = <2>;

		compatible = "qcom,camera";

		reg = <0x02>;

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

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

		qcom,mount-angle = <90>;

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

		qcom,eeprom-src = <&eeprom2>;

		qcom,actuator-src = <&actuator1>;

		cam_vio-supply = <&pmfalcon_l11>;

		cam_vana-supply = <&pm2falcon_bob>;

		cam_vdig-supply = <&pmfalcon_s5>;

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

		qcom,cam-vreg-min-voltage = <0 3300000 1350000>;

		qcom,cam-vreg-max-voltage = <0 3600000 1350000>;

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

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

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

		pinctrl-0 = <&cam_sensor_mclk1_active

				 &cam_sensor_front_active>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

				 &cam_sensor_front_suspend>;

		gpios = <&tlmm 14 0>,

			<&tlmm 28 0>,

			<&pmfalcon_gpios 3 0>,

			<&tlmm 29 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vdig = <2>;

		qcom,gpio-vana = <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_MCLK2",

					"CAM_RESET2",

					"CAM_VDIG",

					"CAM_VANA";

		qcom,sensor-position = <1>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <1>;

		status = "ok";

		clocks = <&clock_mmss clk_mclk1_clk_src>,

			<&clock_mmss clk_mmss_camss_mclk1_clk>;

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

		qcom,clock-rates = <24000000 0>;

	};

};





&pmfalcon_gpios {

	gpio@c300 { /* GPIO4 -CAMERA SENSOR 0 VDIG*/

		qcom,mode = <1>;                /* Output */
@@ -221,4 +327,14 @@ 
		qcom,master-en = <1>;           /* Enable GPIO */

		status = "ok";

	};



	gpio@c200 { /* GPIO3 -CAMERA SENSOR 1 VDIG*/

		qcom,mode = <1>;                /* Output */

		qcom,pull = <5>;                /* No Pull */

		qcom,vin-sel = <0>;             /* VIN1 GPIO_LV */

		qcom,src-sel = <0>;             /* GPIO */

		qcom,invert = <0>;              /* Invert */

		qcom,master-en = <1>;           /* Enable GPIO */

		status = "ok";

	};

};

arch/arm/boot/dts/qcom/msm8998-pinctrl.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -1347,14 +1347,14 @@ 
		};



		cam_sensor_front_active: cam_sensor_front_active {

			/* RESET */

			/* RESET  VANA*/

			mux {

				pins = "gpio28";

				pins = "gpio28", "gpio29";

				function = "gpio";

			};



			config {

				pins = "gpio28";

				pins = "gpio28", "gpio29";

				bias-disable; /* No PULL */

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

			};