Merge 0f9219c145d1c2c8c491dc23f03325c02edba427 on remote branch (86186a27) · Commits · e / devices / android_kernel_fairphone_FP4

kona-camera-sensor-rb5.dtsi

+112 −34

Original line number	Diff line number	Diff line
		@@ -114,57 +114,94 @@

		qcom,cam-sensor3 {
		cell-index = <3>;
		compatible = "qcom,cam-sensor";
		csiphy-sd-index = <0>;
		sensor-position-roll = <90>;
		sensor-position-pitch = <0>;
		sensor-position-yaw = <180>;
		status = "disable";
		};

		qcom,cam-sensor4 {
		cell-index = <4>;
		status = "disable";
		};

		qcom,cam-sensor5 {
		cell-index = <5>;
		status = "disable";
		};
		};

		&cam_cci1 {
		eeprom_tof: qcom,eeprom3 {
		cell-index = <3>;
		compatible = "qcom,eeprom";
		cam_vio-supply = <&pm8009_l7>;
		cam_bob-supply = <&pm8150a_bob>;
		cam_vana-supply = <&pm8009_l5>;
		cam_vdig-supply = <&pm8009_l1>;
		cam_vdig-supply = <&pm8150_s4>;
		cam_clk-supply = <&titan_top_gdsc>;
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",
		"cam_clk", "cam_bob";
		regulator-names = "cam_vio", "cam_vdig",
		"cam_clk";
		rgltr-cntrl-support;
		pwm-switch;
		rgltr-min-voltage = <1800000 2800000 1104000 0 3008000>;
		rgltr-max-voltage = <1800000 3000000 1104000 0 3960000>;
		rgltr-load-current = <120000 80000 1200000 0 2000000>;
		rgltr-min-voltage = <1800000 1800000 0>;
		rgltr-max-voltage = <1800000 1800000 0>;
		rgltr-load-current = <120000 1200000 0>;
		gpio-no-mux = <0>;
		pinctrl-names = "cam_default", "cam_suspend";
		pinctrl-0 = <&cam_sensor_mclk0_active
		&cam_sensor_active_rear>;
		pinctrl-1 = <&cam_sensor_mclk0_suspend
		&cam_sensor_suspend_rear>;
		gpios = <&tlmm 94 0>,
		<&tlmm 93 0>;
		pinctrl-0 = <&cam_sensor_mclk3_active
		&cam_sensor_active_3>;
		pinctrl-1 = <&cam_sensor_mclk3_suspend
		&cam_sensor_suspend_3>;
		gpios = <&tlmm 97 0>,
		<&tlmm 144 0>;
		gpio-reset = <1>;
		gpio-req-tbl-num = <0 1>;
		gpio-req-tbl-flags = <1 0>;
		gpio-req-tbl-label = "CAMIF_MCLK0",
		"CAM_RESET0";
		gpio-req-tbl-label = "CAMIF_MCLK3",
		"CAM_RESET3";
		sensor-position = <1>;
		sensor-mode = <0>;
		cci-master = <0>;
		cci-master = <1>;
		qcom,cam-power-seq-type ="cam_reset","cam_vio","cam_clk","cam_reset";
		qcom,cam-power-seq-val = "cam_reset","cam_vio"
		,"cam_mclk","cam_reset";
		qcom,cam-power-seq-cfg-val = <0 1 24000000 1>;
		qcom,cam-power-seq-delay = <1 0 1 18>;
		status = "ok";
		clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;
		clocks = <&clock_camcc CAM_CC_MCLK3_CLK>;
		clock-names = "cam_clk";
		clock-cntl-level = "turbo";
		clock-rates = <24000000>;
		};

		qcom,cam-sensor4 {
		cell-index = <4>;
		status = "disable";
		};

		qcom,cam-sensor5 {
		cell-index = <5>;
		status = "disable";
		};
		eeprom_rb5_rear: qcom,eeprom0 {
		cell-index = <2>;
		compatible = "qcom,eeprom";
		cam_vio-supply = <&pm8009_l7>;
		cam_clk-supply = <&titan_top_gdsc>;
		regulator-names = "cam_vio", "cam_clk";
		rgltr-cntrl-support;
		pwm-switch;
		rgltr-min-voltage = <1800000 0>;
		rgltr-max-voltage = <1800000 0>;
		rgltr-load-current = <120000 0>;
		gpio-no-mux = <0>;
		pinctrl-names = "cam_default", "cam_suspend";
		pinctrl-0 = <&cam_sensor_mclk2_active
		&cam_sensor_active_rst2>;
		pinctrl-1 = <&cam_sensor_mclk2_suspend
		&cam_sensor_suspend_rst2>;
		gpios = <&tlmm 96 0>,
		<&tlmm 78 0>;
		gpio-reset = <1>;
		gpio-req-tbl-num = <0 1>;
		gpio-req-tbl-flags = <1 0>;
		gpio-req-tbl-label = "CAMIF_MCLK2",
		"CAM_RESET2";
		sensor-mode = <0>;
		cci-master = <0>;
		status = "ok";
		clocks = <&clock_camcc CAM_CC_MCLK2_CLK>;
		clock-names = "cam_clk";
		clock-cntl-level = "turbo";
		clock-rates = <24000000>;
		};

		&cam_cci1 {
		qcom,cam-sensor2 {
		cell-index = <2>;
		compatible = "qcom,cam-sensor";
		@@ -172,6 +209,7 @@
		sensor-position-roll = <270>;
		sensor-position-pitch = <0>;
		sensor-position-yaw = <0>;
		eeprom-src = <&eeprom_rb5_rear>;
		cam_vio-supply = <&pm8009_l7>;
		cam_clk-supply = <&titan_top_gdsc>;
		regulator-names = "cam_vio", "cam_clk";
		@@ -202,6 +240,46 @@
		clock-rates = <24000000>;
		};

		qcom,cam-sensor3 {
		cell-index = <3>;
		compatible = "qcom,cam-sensor";
		csiphy-sd-index = <3>;
		eeprom-src = <&eeprom_tof>;
		sensor-position-roll = <90>;
		sensor-position-pitch = <0>;
		sensor-position-yaw = <180>;
		cam_vio-supply = <&pm8009_l7>;
		cam_vdig-supply = <&pm8150_s4>;
		cam_clk-supply = <&titan_top_gdsc>;
		regulator-names = "cam_vio", "cam_vdig",
		"cam_clk";
		rgltr-cntrl-support;
		pwm-switch;
		rgltr-min-voltage = <1800000 1800000 0>;
		rgltr-max-voltage = <1800000 1800000 0>;
		rgltr-load-current = <120000 1200000 0>;
		gpio-no-mux = <0>;
		pinctrl-names = "cam_default", "cam_suspend";
		pinctrl-0 = <&cam_sensor_mclk3_active
		&cam_sensor_active_rear>;
		pinctrl-1 = <&cam_sensor_mclk3_suspend
		&cam_sensor_suspend_rear>;
		gpios = <&tlmm 97 0>,
		<&tlmm 144 0>;
		gpio-reset = <1>;
		gpio-req-tbl-num = <0 1>;
		gpio-req-tbl-flags = <1 0>;
		gpio-req-tbl-label = "CAMIF_MCLK3",
		"CAM_RESET3";
		sensor-mode = <0>;
		cci-master = <1>;
		status = "ok";
		clocks = <&clock_camcc CAM_CC_MCLK3_CLK>;
		clock-names = "cam_clk";
		clock-cntl-level = "turbo";
		clock-rates = <24000000>;
		};

		qcom,cam-sensor4 {
		cell-index = <4>;
		compatible = "qcom,cam-sensor";

kona-camera-sensor-xr.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -289,7 +289,7 @@
		csiphy-sd-index = <2>;
		sensor-position-roll = <270>;
		sensor-position-pitch = <0>;
		sensor-position-yaw = <0>;
		sensor-position-yaw = <180>;
		eeprom-src = <&eeprom_front>;
		cam_vio-supply = <&pm8009_l7>;
		cam_bob-supply = <&pm8150a_bob>;
		@@ -341,7 +341,7 @@
		csiphy-sd-index = <3>;
		sensor-position-roll = <270>;
		sensor-position-pitch = <0>;
		sensor-position-yaw = <0>;
		sensor-position-yaw = <180>;
		cam_vio-supply = <&pm8009_l7>;
		cam_bob-supply = <&pm8150a_bob>;
		cam_vana-supply = <&pm8009_l6>;