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

Commit e1c4668a authored by Sridhar Gujje's avatar Sridhar Gujje
Browse files

Merge remote-tracking branch 'dev/msm-4.14-camx' into msm-4.14 12/13 



UPSTREAM commit 'c4271fde'
* commit 'c4271fde':
  msm: camera: isp: Define csi2_rx_phy_num_mask for csid lite
  ARM: dts: msm: Add new sensor node for imx258

Change-Id: Iadcf0be76e3c611753326c40e1b0fb60dd077a10
Signed-off-by: default avatarSridhar Gujje <sgujje@codeaurora.org>
parents 7e86f427 c4271fde

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

+42 −0
Original line number Diff line number Diff line
@@ -306,6 +306,48 @@ 
		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>;

		eeprom-src = <&eeprom_rear_aux>;

		actuator-src = <&actuator_rear_aux>;

		cam_vio-supply = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l4>;

		cam_clk-supply = <&titan_top_gdsc>;

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

				"cam_clk";

		rgltr-cntrl-support;

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

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

		rgltr-load-current = <0 80000 105000 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 14 0>,

				<&pm8009_gpios 2 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>;

	};



	qcom,cam-sensor@4 {

		cell-index = <4>;

		compatible = "qcom,cam-sensor";

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_lite17x.h

+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ static const struct cam_ife_csid_csi2_rx_reg_offset 
	.csi2_capture_short_pkt_vc_shift              = 15,

	.csi2_capture_cphy_pkt_dt_shift               = 20,

	.csi2_capture_cphy_pkt_vc_shift               = 26,

	.csi2_rx_phy_num_mask                         = 0x3,

};