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

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

Merge 8b3c55b2 on remote branch 

Change-Id: I53b998fc5f90eddb5af1b25d43beb43036ad458c
parents a9625842 8b3c55b2

bengal-camera-sensor-qrd.dtsi

0 → 100644
+403 −0
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>;

		status = "ok";

	};



	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";

	};



	qcom,cam-res-mgr {

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

		status = "ok";

	};

};



&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";

	};



	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";

	};



	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_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 1056000 0>;

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

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

		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 = <1>;

		status = "ok";

		clocks = <&gcc GCC_CAMSS_MCLK2_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	eeprom_rear_aux2: qcom,eeprom3 {

		cell-index = <3>;

		compatible = "qcom,eeprom";

		cam_vio-supply = <&L7P>;

		cam_vana-supply = <&L6P>;

		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 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_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>;

		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 = <0>;

		status = "ok";

		clocks = <&gcc GCC_CAMSS_MCLK3_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <19200000>;

	};



	 /* Rear*/

	qcom,cam-sensor0 {

		cell-index = <0>;

		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_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>;

	};



	/*Rear Aux*/

	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>;

		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>;

		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>;

	};



	/*Front*/

	qcom,cam-sensor2 {

		cell-index = <2>;

		compatible = "qcom,cam-sensor";

		csiphy-sd-index = <2>;

		sensor-position-roll = <90>;

		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";

		rgltr-cntrl-support;

		pwm-switch;

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

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

		rgltr-load-current = <0 80000 105000 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";

		sensor-mode = <0>;

		cci-master = <1>;

		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>;

		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_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 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_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>;

		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";

		sensor-mode = <0>;

		cci-master = <0>;

		status = "ok";

		clocks = <&gcc GCC_CAMSS_MCLK3_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <19200000>;

	};

};

bindings/msm-cam-ife-csid.txt

+4 −3
Original line number Diff line number Diff line
@@ -15,9 +15,10 @@ First Level Node - CAM IFE CSID device 
- compatible

  Usage: required

  Value type: <string>

  Definition: Should be "qcom,csid170", "qcom,csid175", "qcom,csid175_200",

              "qcom,csid480", "qcom,csid-lite170", "qcom,csid-lite175",

              "qcom,csid-lite480" or "qcom,csid-custom480".

  Definition: Should be "qcom,csid170", "qcom,csid170_200", "qcom,csid175",

		"qcom,csid175_200", "qcom,csid480", "qcom,csid-lite170",

		"qcom,csid-lite175", "qcom,csid-lite480" or

		"qcom,csid-custom480".



- cell-index

  Usage: required

bindings/msm-cam-vfe.txt

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ Required properties: 
  Value type: <string>

  Definition: Should specify the compatibility string for matching the

	driver. e.g. "qcom,vfe480", "qcom,vfe175", "qcom,vfe170", "qcom,vfe175_130",

	"qcom,vfe-lite480", "qcom,vfe-lite175", "qcom,vfe-lite175_130", "qcom,vfe-lite170".

	"qcom,vfe170_150", "qcom,vfe-lite480", "qcom,vfe-lite175", "qcom,vfe-lite175_130",

	"qcom,vfe-lite170".



- cell-index

  Usage: required

kona-camera.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1435,11 +1435,11 @@ 
		camss-supply = <&titan_top_gdsc>;

		clock-names =

			"ife_csid_clk_src",

			"ife_lite_ahb",

			"ife_csid_clk",

			"cphy_rx_clk_src",

			"ife_cphy_rx_clk",

			"ife_clk_src",

			"ife_lite_ahb",

			"ife_clk";

		clocks =

			<&clock_camcc CAM_CC_IFE_LITE_CSID_CLK_SRC>,