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

Commit 02d4f24f authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I9cc67abf,Ifd912067 into dev/msm-4.14-camx 

* changes:
  ARM: dts: msm: Add new sensor node for imx258
  ARM: dts: msm: Add actuator node for rear aux
parents 330b4af8 3e50a774

arch/arm64/boot/dts/qcom/sm6150-camera-sensor-idp.dtsi

+58 −1
Original line number Diff line number Diff line
@@ -109,8 +109,21 @@ 
		rgltr-load-current = <100000>;

	};



	actuator_front: qcom,actuator@1 {

	actuator_rear_aux: qcom,actuator@1 {

		cell-index = <1>;

		reg = <0x0>;

		compatible = "qcom,actuator";

		cci-master = <1>;

		cam_vaf-supply = <&pm6150_l19>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2800000>;

		rgltr-max-voltage = <2800000>;

		rgltr-load-current = <100000>;

	};



	actuator_front: qcom,actuator@2 {

		cell-index = <2>;

		reg = <0x1>;

		compatible = "qcom,actuator";

		cci-master = <1>;
@@ -300,6 +313,7 @@ 
		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear_aux>;

		actuator-src = <&actuator_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vio-supply = <&pm6150_l13>;

		cam_vana-supply = <&camera_vana1_2_ldo>;
@@ -375,4 +389,47 @@ 
		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor@3 {

		cell-index = <3>;

		compatible = "qcom,cam-sensor";

		reg = <0x3>;

		csiphy-sd-index = <2>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear_aux>;

		actuator-src = <&actuator_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vio-supply = <&pm6150_l13>;

		cam_vana-supply = <&camera_vana0_ldo>;

		cam_vdig-supply = <&camera_ldo>;

		cam_clk-supply = <&titan_top_gdsc>;

		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 2850000 1200000 0>;

		rgltr-max-voltage = <1800000 2850000 1200000 0>;

		rgltr-load-current = <105000 0 80000 0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active

				&cam_sensor_rear2_active>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

				&cam_sensor_rear2_suspend>;

		gpios = <&tlmm 29 0>,

			<&tlmm 45 0>;

		gpio-reset = <1>;

		gpio-req-tbl-num = <0 1>;

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

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

					"CAM_RESET1";

		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK1_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};

};