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

Commit cd8b9179 authored by Wanghao Wei's avatar Wanghao Wei Committed by Baojian Liu
Browse files

ARM: dts: msm: Add camera sensor DTSI for RB1 & RB2 

- Bring up cam0a. cam1, cam0b, Gmsl, cam2 on RB2.
- Bring up cam0a. cam1, cam0b, Gmsl on RB1.

CRs-Fixed: 3077713
Change-Id: Id22b585688ff1b99272c4ecf14759fb2b6dd17ad
parent 76e17c37

bengal-camera-sensor-idp.dtsi

+134 −262
Original line number Diff line number Diff line 
#include <dt-bindings/clock/qcom,gcc-bengal.h>

&soc {

	led_flash_rear: qcom,camera-flash@0 {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		flash-source  = <&pmi632_flash0 &pmi632_flash1>;

		torch-source  = <&pmi632_torch0 &pmi632_torch1>;

		switch-source = <&pmi632_switch0 &pmi632_switch0>;

	qcom,cam-res-mgr {

		compatible = "qcom,cam-res-mgr";

		status = "ok";

		gpios-shared-pinctrl = <480>;

		shared-pctrl-gpio-names = "gmsl";

		pinctrl-names = "gmsl_active", "gmsl_suspend";

		pinctrl-0 = <&cam_sensor_gmsl_active>;

		pinctrl-1 = <&cam_sensor_gmsl_suspend>;

	};



	led_flash_rear_aux: qcom,camera-flash@1 {

		cell-index = <1>;

		compatible = "qcom,camera-flash";

		flash-source  = <&pmi632_flash0 &pmi632_flash1>;

		torch-source  = <&pmi632_torch0 &pmi632_torch1>;

		switch-source = <&pmi632_switch0 &pmi632_switch0>;

		status = "ok";

};



	led_flash_rear_aux2: qcom,camera-flash@2 {

		cell-index = <2>;

		compatible = "qcom,camera-flash";

		flash-source  = <&pmi632_flash0 &pmi632_flash1>;

		torch-source  = <&pmi632_torch0 &pmi632_torch1>;

		switch-source = <&pmi632_switch0 &pmi632_switch0>;

		status = "ok";

&tlmm {

	cam_sensor_gmsl_active: cam_sensor_active_gmsl {

		/* RESET */

		mux {

			pins = "gpio81";

			function = "gpio";

		};



	qcom,cam-res-mgr {

		compatible = "qcom,cam-res-mgr";

		status = "ok";

		config {

			pins = "gpio81";

			bias-pull-up;

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

			output-high;

		};

	};



&cam_cci0 {

	actuator_rear: qcom,actuator0 {

		cell-index = <0>;

		compatible = "qcom,actuator";

		cci-master = <0>;

		cam_vaf-supply = <&L5P>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2800000>;

		rgltr-max-voltage = <2800000>;

		rgltr-load-current = <100000>;

		status = "ok";

	cam_sensor_gmsl_suspend: cam_sensor_suspend_gmsl {

		/* RESET */

		mux {

			pins = "gpio81";

			function = "gpio";

		};



	actuator_rear_aux: qcom,actuator1 {

		cell-index = <1>;

		compatible = "qcom,actuator";

		cci-master = <1>;

		cam_vaf-supply = <&L5P>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <2800000>;

		rgltr-max-voltage = <2800000>;

		rgltr-load-current = <100000>;

		status = "ok";

		config {

			pins = "gpio81";

			bias-pull-down; /* PULL DOWN */

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

			output-low;

		};

	};



	eeprom_rear: qcom,eeprom0 {

		cell-index = <0>;

		compatible = "qcom,eeprom";

		cam_vio-supply = <&L7P>;

		cam_vana-supply = <&L4P>;

		cam_vdig-supply = <&L2P>;

		cam_vaf-supply = <&L5P>;

		cam_clk-supply = <&gcc_camss_top_gdsc>;

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

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		pwm-switch;

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

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

		rgltr-load-current = <120000 80000 1200000 0 100000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active

				&cam_sensor_rear0_reset_active>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend

				&cam_sensor_rear0_reset_suspend>;

		gpios = <&tlmm 20 0>,

			<&tlmm 18 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET0";

		sensor-mode = <0>;

		cci-master = <0>;

		status = "ok";

		clocks = <&gcc GCC_CAMSS_MCLK0_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <19200000>;

};



	eeprom_rear_aux: qcom,eeprom1 {

		cell-index = <1>;

		compatible = "qcom,eeprom";

&cam_cci0 {



	/* CAM0A */

	qcom,cam-sensor0 {

		cell-index = <0>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <0>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		cam_vio-supply = <&L7P>;

		cam_vana-supply = <&L3P>;

		cam_vdig-supply = <&L1P>;

		cam_vaf-supply = <&L5P>;

		cam_clk-supply = <&gcc_camss_top_gdsc>;

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

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		pwm-switch;

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

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

		rgltr-load-current = <120000 80000 1200000 0 100000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active

				&cam_sensor_rear1_reset_active>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

				&cam_sensor_rear1_reset_suspend>;

		gpios = <&tlmm 21 0>,

			<&tlmm 19 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 = <&gcc GCC_CAMSS_MCLK1_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <19200000>;

	};



	eeprom_front: qcom,eeprom2 {

		cell-index = <2>;

		compatible = "qcom,eeprom";

		cam_vio-supply = <&L7P>;

		cam_vana-supply = <&L6P>;

		cam_vdig-supply = <&L2P>;

		cam_clk-supply = <&gcc_camss_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

		pwm-switch;

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

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

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

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

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

		rgltr-load-current = <120000 80000 1200000 0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active

				&cam_sensor_front0_reset_active>;

		pinctrl-1 = <&cam_sensor_mclk2_suspend

				&cam_sensor_front0_reset_suspend>;

		gpios = <&tlmm 27 0>,

			<&tlmm 24 0>;

		pinctrl-0 = <&cam_sensor_mclk3_active

				&cam_sensor_active_rst0>;

		pinctrl-1 = <&cam_sensor_mclk3_suspend

				&cam_sensor_suspend_rst0>;

		gpios = <&tlmm 28 0>,

			<&tlmm 18 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET2";

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

					"CAM_RESET0";

		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";

		clocks = <&gcc GCC_CAMSS_MCLK2_CLK>;

		clocks = <&gcc GCC_CAMSS_MCLK3_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	eeprom_rear_aux2: qcom,eeprom3 {

		cell-index = <3>;

		compatible = "qcom,eeprom";

	/* CAM1 */

	qcom,cam-sensor1 {

		cell-index = <1>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <1>;

		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		cam_vio-supply = <&L7P>;

		cam_vana-supply = <&L6P>;

		cam_vdig-supply = <&L1P>;

		cam_vana-supply = <&L5P>;

		cam_vdig-supply = <&L2P>;



		cam_clk-supply = <&gcc_camss_top_gdsc>;

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

			"cam_clk";
@@ -186,56 +109,54 @@ 
		rgltr-load-current = <120000 80000 1200000 0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk3_active

				&cam_sensor_rear2_reset_active>;

		pinctrl-1 = <&cam_sensor_mclk3_suspend

				&cam_sensor_rear2_reset_suspend>;

		gpios = <&tlmm 28 0>,

			<&tlmm 65 0>;

		pinctrl-0 = <&cam_sensor_mclk1_active

				&cam_sensor_active_rst1>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

				&cam_sensor_suspend_rst1>;

		gpios = <&tlmm 21 0>,

				<&tlmm 24 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET3";

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

					"CAM_RESET1";

		sensor-mode = <0>;

		cci-master = <0>;

		status = "ok";

		clocks = <&gcc GCC_CAMSS_MCLK3_CLK>;

		clocks = <&gcc GCC_CAMSS_MCLK1_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <19200000>;

		clock-rates = <24000000>;

	};



	 /* Rear*/

	qcom,cam-sensor0 {

		cell-index = <0>;

	/* CAM0B */

	qcom,cam-sensor2 {

		cell-index = <2>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <0>;

		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		actuator-src = <&actuator_rear>;

		led-flash-src = <&led_flash_rear>;

		eeprom-src = <&eeprom_rear>;

		cam_vio-supply = <&L7P>;

		cam_vana-supply = <&L4P>;

		cam_vdig-supply = <&L2P>;

		cam_vdig-supply = <&L1P>;



		cam_clk-supply = <&gcc_camss_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

		pwm-switch;

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

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

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

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

		rgltr-load-current = <120000 80000 1200000 0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active

				&cam_sensor_rear0_reset_active>;

				&cam_sensor_active_rst2>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend

				&cam_sensor_rear0_reset_suspend>;

				&cam_sensor_suspend_rst2>;

		gpios = <&tlmm 20 0>,

			<&tlmm 18 0>;

				<&tlmm 44 0>;

		gpio-reset = <1>;

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

		gpio-req-tbl-flags = <1 0>;
@@ -247,118 +168,79 @@ 
		clocks = <&gcc GCC_CAMSS_MCLK0_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <19200000>;

		clock-rates = <24000000>;

	};



	/*Rear Aux*/

	qcom,cam-sensor1 {

		cell-index = <1>;

		/* GMSL-1 */

	qcom,cam-sensor3 {

		cell-index = <3>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <1>;

		csiphy-sd-index = <0>;

		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		actuator-src = <&actuator_rear_aux>;

		led-flash-src = <&led_flash_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_vio-supply = <&L7P>;

		cam_vana-supply = <&L3P>;

		cam_vdig-supply = <&L1P>;

		sensor-position-yaw = <0>;

		cam_clk-supply = <&gcc_camss_top_gdsc>;

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

			"cam_clk";

		regulator-names = "cam_clk";

		rgltr-cntrl-support;

		pwm-switch;

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

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

		rgltr-load-current = <120000 80000 1200000 0>;

		rgltr-min-voltage  = <0>;

		rgltr-max-voltage  = <0>;

		rgltr-load-current = <0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active

				&cam_sensor_rear1_reset_active>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

				&cam_sensor_rear1_reset_suspend>;

		gpios = <&tlmm 21 0>,

			<&tlmm 19 0>;

		gpio-reset = <1>;

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

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

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

					"CAM_RESET1";

		pinctrl-0 = <&cam_sensor_gmsl_active>;

		pinctrl-1 = <&cam_sensor_gmsl_suspend>;

		gpios = <&tlmm 81 0>;

		gpio-reset = <0>;

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

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

		gpio-req-tbl-label = "CAM_RESET2";

		sensor-mode = <0>;

		cci-master = <1>;

		cci-master = <0>;

		status = "ok";

		clocks = <&gcc GCC_CAMSS_MCLK1_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <19200000>;

	};



	/*Front*/

	qcom,cam-sensor2 {

		cell-index = <2>;

	/* GMSL-2 */

	qcom,cam-sensor4 {

		cell-index = <4>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <2>;

		csiphy-sd-index = <1>;

		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <0>;

		eeprom-src = <&eeprom_front>;

		cam_vio-supply = <&L7P>;

		cam_vana-supply = <&L6P>;

		cam_vdig-supply = <&L2P>;

		cam_clk-supply = <&gcc_camss_top_gdsc>;

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

			"cam_clk";

		regulator-names = "cam_clk";

		rgltr-cntrl-support;

		pwm-switch;

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

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

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

		rgltr-min-voltage  = <0>;

		rgltr-max-voltage  = <0>;

		rgltr-load-current = <0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active

				&cam_sensor_front0_reset_active

				&cam_sensor_csi_mux_oe_active

				&cam_sensor_csi_mux_sel_active>;

		pinctrl-1 = <&cam_sensor_mclk2_suspend

				&cam_sensor_front0_reset_suspend

				&cam_sensor_csi_mux_oe_suspend

				&cam_sensor_csi_mux_sel_suspend>;

		gpios = <&tlmm 27 0>,

			<&tlmm 24 0>,

			<&tlmm 66 0>,

			<&tlmm 67 0>;

		gpio-reset = <1>;

		gpio-custom1 = <2>;

		gpio-custom2 = <3>;

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

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

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

					"CAM_RESET2",

					"CAM_CSIMUX_OE0",

					"CAM_CSIMUX_SEL0";

		pinctrl-0 = <&cam_sensor_gmsl_active>;

		pinctrl-1 = <&cam_sensor_gmsl_suspend>;

		gpios = <&tlmm 81 0>;

		gpio-reset = <0>;

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

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

		gpio-req-tbl-label = "CAM_RESET2";

		sensor-mode = <0>;

		cci-master = <1>;

		cci-master = <0>;

		status = "ok";

		clocks = <&gcc GCC_CAMSS_MCLK2_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	/*Rear Aux2*/

	qcom,cam-sensor3 {

		cell-index = <3>;

	/* CAM2 */

	qcom,cam-sensor5 {

		cell-index = <5>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <2>;

		sensor-position-roll = <270>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_rear_aux2>;

		eeprom-src = <&eeprom_rear_aux2>;

		cam_vio-supply = <&L7P>;

		cam_vana-supply = <&L6P>;

		cam_vdig-supply = <&L1P>;

		cam_vdig-supply = <&L2P>;



		cam_clk-supply = <&gcc_camss_top_gdsc>;

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

			"cam_clk";
@@ -369,33 +251,23 @@ 
		rgltr-load-current = <120000 80000 1200000 0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk3_active

				&cam_sensor_rear2_reset_active

				&cam_sensor_csi_mux_oe_active

				&cam_sensor_csi_mux_sel_active>;

		pinctrl-1 = <&cam_sensor_mclk3_suspend

				&cam_sensor_rear2_reset_suspend

				&cam_sensor_csi_mux_oe_suspend

				&cam_sensor_csi_mux_sel_suspend>;

		gpios = <&tlmm 28 0>,

			<&tlmm 65 0>,

			<&tlmm 66 0>,

			<&tlmm 67 0>;

		pinctrl-0 = <&cam_sensor_mclk2_active

				&cam_sensor_active_rst5>;

		pinctrl-1 = <&cam_sensor_mclk2_suspend

				&cam_sensor_suspend_rst5>;

		gpios = <&tlmm 27 0>,

				<&tlmm 19 0>;

		gpio-reset = <1>;

		gpio-custom1 = <2>;

		gpio-custom2 = <3>;

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

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

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

					"CAM_RESET3",

					"CAM_CSIMUX_OE1",

					"CAM_CSIMUX_SEL1";

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

					"CAM_RESET2";

		sensor-mode = <0>;

		cci-master = <0>;

		cci-master = <1>;

		status = "ok";

		clocks = <&gcc GCC_CAMSS_MCLK3_CLK>;

		clocks = <&gcc GCC_CAMSS_MCLK2_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <19200000>;

		clock-rates = <24000000>;

	};

};

bengal-camera.dtsi

+51 −84
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
			<240000000 0 200000000 0>,

			<341330000 0 200000000 0>,

			<384000000 0 268800000 0>;

		qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>;

		status = "ok";

	};
@@ -69,7 +68,6 @@ 
			<240000000 0 200000000 0>,

			<341330000 0 200000000 0>,

			<384000000 0 268800000 0>;

		qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>;

		status = "ok";

	};
@@ -100,7 +98,6 @@ 
			<240000000 0 200000000 0>,

			<341330000 0 200000000 0>,

			<384000000 0 268800000 0>;

		qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>;

		status = "ok";

	};
@@ -277,13 +274,13 @@ 
		reg = <0x5c11000 0x1000>,

			<0x5c13000 0x4000>;

		reg-cam-base = <0x11000 0x13000>;

		cam_hw_fuse = <CAM_CPAS_SECURE_CAMERA_ENABLE 0x01B401E4 100 CAM_CPAS_FEATURE_TYPE_ENABLE 0xFF>;

		interrupt-names = "cpas_camnoc";

		interrupts = <GIC_SPI 159 IRQ_TYPE_EDGE_RISING>;

		camnoc-axi-min-ib-bw = <3000000000>;  /*Need to be verified*/

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

		regulator-names = "camss-vdd";

		camss-vdd-supply = <&gcc_camss_top_gdsc>;

		clock-names =

			"gcc_camss_ahb_clk",

			"gcc_camss_top_ahb_clk",

			"gcc_camss_top_ahb_clk_src",

			"gcc_camss_axi_clk",
@@ -291,7 +288,6 @@ 
			"gcc_camss_nrt_axi_clk",

			"gcc_camss_rt_axi_clk";

		clocks =

			<&gcc GCC_CAMERA_AHB_CLK>,

			<&gcc GCC_CAMSS_TOP_AHB_CLK>,

			<&gcc GCC_CAMSS_TOP_AHB_CLK_SRC>,

			<&gcc GCC_CAMSS_AXI_CLK>,
@@ -300,47 +296,37 @@ 
			<&gcc GCC_CAMSS_RT_AXI_CLK>;

		src-clock-name = "gcc_camss_axi_clk_src";

		clock-rates =

			<0 0        0 0         0 0 0>,

			<0 0 80000000 0  19200000 0 0>,

			<0 0 80000000 0 150000000 0 0>,

			<0 0 80000000 0 200000000 0 0>,

			<0 0 80000000 0 300000000 0 0>,

			<0 0 80000000 0 300000000 0 0>,

			<0 0 80000000 0 300000000 0 0>;

		clock-cntl-level = "suspend", "minsvs", "lowsvs", "svs",

			"svs_l1", "nominal", "turbo";

		qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>;

			<0        0 0         0 0 0>,

			<0 19200000 0  19200000 0 0>,

			<0 80000000 0 150000000 0 0>,

			<0 80000000 0 200000000 0 0>,

			<0 80000000 0 300000000 0 0>,

			<0 80000000 0 300000000 0 0>,

			<0 80000000 0 300000000 0 0>;

		clock-cntl-level = "suspend", "lowsvs", "svs",

			"svs_l1", "nominal", "nominal_l1", "turbo";

		control-camnoc-axi-clk;

		camnoc-bus-width = <32>;

		camnoc-axi-clk-bw-margin-perc = <20>;

		qcom,msm-bus,name = "cam_ahb";

		qcom,msm-bus,num-cases = <7>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps =

			<MSM_BUS_MASTER_AMPSS_M0

			MSM_BUS_SLAVE_CAMERA_CFG 0 0>,

			<MSM_BUS_MASTER_AMPSS_M0

			MSM_BUS_SLAVE_CAMERA_CFG 0 133333>,

			<MSM_BUS_MASTER_AMPSS_M0

			MSM_BUS_SLAVE_CAMERA_CFG 0 133333>,

			<MSM_BUS_MASTER_AMPSS_M0

			MSM_BUS_SLAVE_CAMERA_CFG 0 150000>,

			<MSM_BUS_MASTER_AMPSS_M0

			MSM_BUS_SLAVE_CAMERA_CFG 0 150000>,

			<MSM_BUS_MASTER_AMPSS_M0

			MSM_BUS_SLAVE_CAMERA_CFG 0 300000>,

			<MSM_BUS_MASTER_AMPSS_M0

			MSM_BUS_SLAVE_CAMERA_CFG 0 300000>;

		vdd-corners = <RPMH_REGULATOR_LEVEL_RETENTION

			RPMH_REGULATOR_LEVEL_MIN_SVS

			RPMH_REGULATOR_LEVEL_LOW_SVS

			RPMH_REGULATOR_LEVEL_SVS

			RPMH_REGULATOR_LEVEL_SVS_L1

			RPMH_REGULATOR_LEVEL_NOM

			RPMH_REGULATOR_LEVEL_NOM_L1

			RPMH_REGULATOR_LEVEL_NOM_L2

			RPMH_REGULATOR_LEVEL_TURBO

			RPMH_REGULATOR_LEVEL_TURBO_L1>;

		interconnect-names = "cam_ahb";

		interconnects =<&bimc MASTER_AMPSS_M0

			&config_noc SLAVE_CAMERA_CFG>;

		cam-ahb-num-cases = <7>;

		cam-ahb-bw-KBps =

			<0 0>, <0 133333>, <0 150000>, <0 150000>,

			<0 300000>, <0 300000>, <0 300000>;

		vdd-corners = <RPM_SMD_REGULATOR_LEVEL_NONE

			RPM_SMD_REGULATOR_LEVEL_RETENTION

			RPM_SMD_REGULATOR_LEVEL_RETENTION_PLUS

			RPM_SMD_REGULATOR_LEVEL_MIN_SVS

			RPM_SMD_REGULATOR_LEVEL_LOW_SVS

			RPM_SMD_REGULATOR_LEVEL_SVS

			RPM_SMD_REGULATOR_LEVEL_SVS_PLUS

			RPM_SMD_REGULATOR_LEVEL_NOM

			RPM_SMD_REGULATOR_LEVEL_NOM_PLUS

			RPM_SMD_REGULATOR_LEVEL_TURBO

			RPM_SMD_REGULATOR_LEVEL_TURBO_NO_CPR

			RPM_SMD_REGULATOR_LEVEL_BINNING>;

		vdd-corner-ahb-mapping = "suspend", "minsvs",

			"lowsvs", "svs", "svs_l1",

			"nominal", "nominal", "nominal",
@@ -360,19 +346,12 @@ 
					node-name = "level2-rt0-rd-wr-sum";

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM>;

					qcom,axi-port-name = "cam_hf_0";

					ib-bw-voting-needed;

					qcom,axi-port-mnoc {

						qcom,msm-bus,name =

						"cam_hf_0_mnoc";

						qcom,msm-bus-vector-dyn-vote;

						qcom,msm-bus,num-cases = <2>;

						qcom,msm-bus,num-paths = <1>;

						qcom,msm-bus,vectors-KBps =

						<MSM_BUS_MASTER_CAMNOC_HF

						MSM_BUS_SLAVE_EBI_CH0 0 0>,

						<MSM_BUS_MASTER_CAMNOC_HF

						MSM_BUS_SLAVE_EBI_CH0 0 0>;

						interconnect-names = "cam_hf_0";

						interconnects =

						<&mmrt_virt MASTER_CAMNOC_HF

						&bimc SLAVE_EBI_CH0>;

					};

				};
@@ -381,18 +360,11 @@ 
					node-name = "level2-nrt0-rd-wr-sum";

					traffic-merge-type =

					<CAM_CPAS_TRAFFIC_MERGE_SUM>;

					qcom,axi-port-name = "cam_sf_0";

					qcom,axi-port-mnoc {

						qcom,msm-bus,name =

						"cam_sf_0_mnoc";

						qcom,msm-bus-vector-dyn-vote;

						qcom,msm-bus,num-cases = <2>;

						qcom,msm-bus,num-paths = <1>;

						qcom,msm-bus,vectors-KBps =

						<MSM_BUS_MASTER_CAMNOC_SF

						MSM_BUS_SLAVE_EBI_CH0 0 0>,

						<MSM_BUS_MASTER_CAMNOC_SF

						MSM_BUS_SLAVE_EBI_CH0 0 0>;

						interconnect-names = "cam_sf_0";

						interconnects =

						<&mmnrt_virt MASTER_CAMNOC_SF

						&bimc SLAVE_EBI_CH0>;

					};

				};

			};
@@ -622,7 +594,6 @@ 
		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_csid_clk_src";

		clock-control-debugfs = "true";

		qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>;

		status = "ok";

	};
@@ -649,7 +620,6 @@ 
		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_clk_src";

		clock-control-debugfs = "true";

		qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>;

		cam_hw_pid = <4>;

		status = "ok";

	};
@@ -687,7 +657,6 @@ 
		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_csid_clk_src";

		clock-control-debugfs = "true";

		qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>;

		status = "ok";

	};
@@ -714,7 +683,6 @@ 
		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_clk_src";

		clock-control-debugfs = "true";

		qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>;

		cam_hw_pid = <5>;

		status = "ok";

	};
@@ -752,7 +720,6 @@ 
		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_csid_clk_src";

		clock-control-debugfs = "true";

		qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>;

		status = "ok";

	};
@@ -779,7 +746,6 @@ 
		clock-cntl-level = "svs", "svs_l1", "turbo";

		src-clock-name = "tfe_clk_src";

		clock-control-debugfs = "true";

		qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>;

		cam_hw_pid = <6>;

		status = "ok";

	};
@@ -814,7 +780,7 @@ 
	cam_tfe_tpg1: qcom,tpg1@5c68000 {

		cell-index = <1>;

		compatible = "qcom,tpg101";

		reg-names = "tpg0", "top";

		reg-names = "tpg1", "top";

		reg = <0x5c68000 0x400>,

				<0x5c11000 0x1000>;

		reg-cam-base = <0x68000 0x11000>;
@@ -868,21 +834,22 @@ 
		regulator-names = "camss";

		camss-supply = <&gcc_camss_top_gdsc>;

		clock-names =

			"ope_ahb_clk_src",

			"ope_ahb_clk",

			"ope_clk_src",

			"ope_clk";

		clocks =

			<&gcc GCC_CAMSS_OPE_AHB_CLK_SRC>,

			<&gcc GCC_CAMSS_OPE_AHB_CLK>,

			<&gcc GCC_CAMSS_OPE_CLK_SRC>,

			<&gcc GCC_CAMSS_OPE_CLK>;

		clock-rates =

			<171428571 200000000 0>,

			<171428571 266600000 0>,

			<240000000 465000000 0>,

			<240000000 580000000 0>;

			<19200000 0 19200000 0>,

			<171428571 0 200000000 0>,

			<240000000 0 465000000 0>,

			<240000000 0 580000000 0>;

		clock-cntl-level = "svs", "svs_l1", "nominal", "turbo";

		src-clock-name = "ope_clk_src";

		qcom,cam-cx-ipeak = <&cx_ipeak_lm 8>;

		status = "ok";

	};

};

qrb2210-rb1-camera-sensor-idp.dtsi

deleted100644 → 0
+0 −293

File deleted.

Preview size limit exceeded, changes collapsed.

qrb2210-rb1-camera.dtsi

deleted100644 → 0
+0 −747

File deleted.

Preview size limit exceeded, changes collapsed.

scuba-camera-sensor-idp.dtsi

+120 −201

File changed.

Preview size limit exceeded, changes collapsed.