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

Commit 367b1d84 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 57c9ad74 on remote branch 

Change-Id: I968e07966e03d399ac1068cb1ff8a8b033266280
parents ff7e4854 57c9ad74

yupik-camera-sensor-idp.dtsi

+44 −0
Original line number Diff line number Diff line
@@ -383,4 +383,48 @@ 
		clock-cntl-level = "nominal";

		clock-rates = <24000000>;

	};

	/* Rear */

	qcom,cam-sensor4 {

		cell-index = <1>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <1>;

		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		eeprom-src = <&eeprom_triple_uw>;

		actuator-src = <&actuator_triple_uw>;

		cam_vio-supply = <&L3J>;

		cam_vana-supply = <&L6I>;

		cam_vdig-supply = <&L2I>;

		cam_clk-supply = <&cam_cc_titan_top_gdsc>;

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

		rgltr-cntrl-support;

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

		rgltr-max-voltage = <1800000 2900000 1150000 0>;

		rgltr-load-current = <3000 52000 257000 0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active

				&cam_sensor_active_rst2

				&cam_sensor_active_mux>;

		pinctrl-1 = <&cam_sensor_mclk2_suspend

				&cam_sensor_suspend_rst2

				&cam_sensor_suspend_mux>;

		gpios = <&tlmm 66 0>,

			<&tlmm 77 0>,

			<&tlmm 1 0>;

		gpio-reset = <1>;

		gpio-custom1 = <2>;

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

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

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

					"CAM_RESET2",

					"CAM_MUX";

		cci-master = <0>;

		status = "ok";

		clocks = <&camcc CAM_CC_MCLK2_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};

};

yupik-camera.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -1135,7 +1135,8 @@ 
		cam_hw_fuse = <CAM_CPAS_ISP_FUSE 0x7801FC 0x10 CAM_CPAS_FEATURE_TYPE_DISABLE 0x4>,

			      <CAM_CPAS_ISP_LITE_FUSE 0x7801FC 0x20 CAM_CPAS_FEATURE_TYPE_DISABLE 0x10>,

			      <CAM_CPAS_SHDR_FUSE 0x7801FC 0x40 CAM_CPAS_FEATURE_TYPE_DISABLE 0xFF>,

			      <CAM_CPAS_QCFA_BINNING_ENABLE 0x7801FC 0x80 CAM_CPAS_FEATURE_TYPE_DISABLE 0xFF>;

			      <CAM_CPAS_QCFA_BINNING_ENABLE 0x7801FC 0x80 CAM_CPAS_FEATURE_TYPE_DISABLE 0xFF>,

			      <CAM_CPAS_CSIPHY_FUSE 0x7801FC 0x100 CAM_CPAS_FEATURE_TYPE_DISABLE 0x10>;

		interrupt-names = "cpas_camnoc";

		interrupts = <GIC_SPI 459 IRQ_TYPE_EDGE_RISING>;

		camnoc-axi-min-ib-bw = <3000000000>;