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

Commit 252d57a6 authored by Package Warehouse Build User's avatar Package Warehouse Build User Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 7853aae6 6d1b3d3b

Documentation/devicetree/bindings/media/video/msm-cam-ife-csid.txt

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ First Level Node - CAM IFE CSID device 
- compatible

  Usage: required

  Value type: <string>

  Definition: Should be "qcom,csid170", "qcom,csid175", "qcom,csid-lite170"

  Definition: Should be "qcom,csid170", "qcom,csid175", "qcom,csid175_200", "qcom,csid-lite170"

              or "qcom,csid-lite175".



- cell-index

Documentation/devicetree/bindings/media/video/msm-cam-vfe.txt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Required properties: 
  Usage: required

  Value type: <string>

  Definition: Should specify the compatibility string for matching the

	driver. e.g. "qcom,vfe175", "qcom,vfe170", "qcom,vfe-lite175", "qcom,vfe-lite170".

	driver. e.g. "qcom,vfe175", "qcom,vfe170", "qcom,vfe175_130",  "qcom,vfe-lite175", "qcom,vfe-lite175_130", "qcom,vfe-lite170".



- cell-index

  Usage: required

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

+11 −12
Original line number Diff line number Diff line
@@ -71,17 +71,17 @@ 
		cell-index = <0>;

		reg = <0>;

		compatible = "qcom,eeprom";

		actuator-src = <&actuator_rear>;

		cam_vio-supply = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l1>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&pm8009_s2>;

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

			"cam_clk";

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

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

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

		rgltr-min-voltage = <1800000 2800000 1100000 0 2900000>;

		rgltr-max-voltage = <1800000 2800000 1100000 0 2900000>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active
@@ -108,17 +108,17 @@ 
		cell-index = <1>;

		reg = <0x1>;

		compatible = "qcom,eeprom";

		actuator-src = <&actuator_rear_aux>;

		cam_vio-supply = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l6>;

		cam_vdig-supply = <&pm8009_l4>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&pm8009_s2>;

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

			"cam_clk";

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

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

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

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -132,7 +132,6 @@ 
		gpio-req-tbl-flags = <1 0>;

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

					"CAM_RESET1";

		sensor-position = <0>;

		sensor-mode = <0>;

		cci-master = <1>;

		status = "ok";
@@ -155,7 +154,7 @@ 
		rgltr-cntrl-support;

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

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active

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

+4 −4
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ 


	cam_csid0: qcom,csid0@acb3000 {

		cell-index = <0>;

		compatible = "qcom,csid175";

		compatible = "qcom,csid175_200";

		reg-names = "csid";

		reg = <0xacb3000 0x1000>;

		reg-cam-base = <0xb3000>;
@@ -592,7 +592,7 @@ 


	cam_vfe0: qcom,vfe0@acaf000 {

		cell-index = <0>;

		compatible = "qcom,vfe175";

		compatible = "qcom,vfe175_130";

		reg-names = "ife";

		reg = <0xacaf000 0x5200>;

		reg-cam-base = <0xaf000>;
@@ -625,7 +625,7 @@ 


	cam_csid1: qcom,csid1@acba000 {

		cell-index = <1>;

		compatible = "qcom,csid175";

		compatible = "qcom,csid175_200";

		reg-names = "csid";

		reg = <0xacba000 0x1000>;

		reg-cam-base = <0xba000>;
@@ -663,7 +663,7 @@ 


	cam_vfe1: qcom,vfe1@acb6000 {

		cell-index = <1>;

		compatible = "qcom,vfe175";

		compatible = "qcom,vfe175_130";

		reg-names = "ife";

		reg = <0xacb6000 0x5200>;

		reg-cam-base = <0xb6000>;

arch/arm64/boot/dts/qcom/sm8150-camera-sensor-cdp.dtsi

+362 −0
Original line number Diff line number Diff line
@@ -52,6 +52,72 @@ 
		switch-source = <&pm8150l_switch0>;

		status = "ok";

	};



	led_flash_triple_rear: qcom,camera-flash@4 {

		cell-index = <4>;

		reg = <0x04 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;

		torch-source = <&pm8150l_torch0 &pm8150l_torch1>;

		switch-source = <&pm8150l_switch2>;

		status = "ok";

	};



	led_flash_triple_rear_aux: qcom,camera-flash@5 {

		cell-index = <5>;

		reg = <0x05 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;

		torch-source = <&pm8150l_torch0 &pm8150l_torch1>;

		switch-source = <&pm8150l_switch2>;

		status = "ok";

	};



	led_flash_triple_rear_aux2: qcom,camera-flash@6 {

		cell-index = <6>;

		reg = <0x06 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm8150l_flash0 &pm8150l_flash1>;

		torch-source = <&pm8150l_torch0 &pm8150l_torch1>;

		switch-source = <&pm8150l_switch2>;

		status = "ok";

	};



	actuator_triple_rear_regulator: gpio-regulator@4 {

		compatible = "regulator-fixed";

		reg = <0x04 0x00>;

		regulator-name = "actuator_triple_rear_regulator";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-enable-ramp-delay = <135>;

		enable-active-high;

		gpio = <&tlmm 158 0>;

		vin-supply = <&pm8150l_bob>;

	};



	actuator_triple_rear_aux_regulator: gpio-regulator@5 {

		compatible = "regulator-fixed";

		reg = <0x05 0x00>;

		regulator-name = "actuator_triple_rear_aux_regulator";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-enable-ramp-delay = <135>;

		enable-active-high;

		gpio = <&tlmm 160 0>;

		vin-supply = <&pm8150l_bob>;

	};



	actuator_triple_rear_aux2_regulator: gpio-regulator@6 {

		compatible = "regulator-fixed";

		reg = <0x06 0x00>;

		regulator-name = "actuator_triple_rear_aux2_regulator";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-enable-ramp-delay = <135>;

		enable-active-high;

		gpio = <&tlmm 24 0>;

		vin-supply = <&pm8150l_bob>;

	};

};



&cam_cci0 {
@@ -99,6 +165,46 @@ 
		rgltr-load-current = <0>;

	};



	actuator_triple_rear: qcom,actuator@4 {

		cell-index = <4>;

		reg = <0x4>;

		compatible = "qcom,actuator";

		cci-master = <1>;

		cam_vaf-supply = <&actuator_triple_rear_regulator>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <3300000>;

		rgltr-max-voltage = <3300000>;

		rgltr-load-current = <0>;

	};



	actuator_triple_rear_aux: qcom,actuator@5 {

		cell-index = <5>;

		reg = <0x5>;

		compatible = "qcom,actuator";

		cci-device = <1>;

		cci-master = <1>;

		cam_vaf-supply = <&actuator_triple_rear_aux_regulator>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <3300000>;

		rgltr-max-voltage = <3300000>;

		rgltr-load-current = <0>;

	};



	actuator_triple_rear_aux2: qcom,actuator@6 {

		cell-index = <6>;

		reg = <0x6>;

		compatible = "qcom,actuator";

		cci-master = <0>;

		cam_vaf-supply = <&actuator_triple_rear_aux2_regulator>;

		regulator-names = "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <3300000>;

		rgltr-max-voltage = <3300000>;

		rgltr-load-current = <0>;

	};



	ois_rear: qcom,ois@0 {

		cell-index = <0>;

		reg = <0x0>;
@@ -227,6 +333,123 @@ 
		clock-rates = <24000000>;

	};



	eeprom_triple_rear: qcom,eeprom@4 {

		cell-index = <4>;

		reg = <4>;

		compatible = "qcom,eeprom";

		cam_vio-supply = <&pm8150l_l1>;

		cam_vana-supply = <&pm8150l_bob>;

		cam_vdig-supply = <&pm8009_s2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 3008000 2856000 0>;

		rgltr-max-voltage = <1800000 4000000 3008000 0>;

		rgltr-load-current = <180000 2000000 519000 0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active

				&cam_sensor_active_triple_rear>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

				&cam_sensor_suspend_triple_rear>;

		gpios = <&tlmm 14 0>,

			<&tlmm 30 0>,

			<&tlmm 157 0>;

		gpio-reset = <1>;

		gpio-vdig = <2>;

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

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

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

					"CAM_RESET4",

					"CAM_VDIG4";

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

	};



	eeprom_triple_rear_aux: qcom,eeprom@5 {

		cell-index = <5>;

		reg = <5>;

		compatible = "qcom,eeprom";

		cam_vio-supply = <&pm8150l_l1>;

		cam_vana-supply = <&pm8150l_bob>;

		cam_vdig-supply = <&pm8009_s2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 3008000 2856000 0>;

		rgltr-max-voltage = <1800000 4000000 3008000 0>;

		rgltr-load-current = <180000 2000000 519000 0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active

				&cam_sensor_active_triple_rear>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

				&cam_sensor_suspend_triple_rear>;

		gpios = <&tlmm 14 0>,

			<&tlmm 30 0>,

			<&tlmm 157 0>;

		gpio-reset = <1>;

		gpio-vdig = <2>;

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

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

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

					"CAM_RESET5",

					"CAM_VDIG5";

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

	};



	eeprom_triple_rear_aux2: qcom,eeprom@6 {

		cell-index = <6>;

		reg = <6>;

		compatible = "qcom,eeprom";

		cam_vio-supply = <&pm8150l_l1>;

		cam_vana-supply = <&pm8150l_bob>;

		cam_vdig-supply = <&pm8009_s2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 3008000 2856000 0>;

		rgltr-max-voltage = <1800000 4000000 3008000 0>;

		rgltr-load-current = <180000 2000000 519000 0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active

				&cam_sensor_active_triple_rear>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend

				&cam_sensor_suspend_triple_rear>;

		gpios = <&tlmm 14 0>,

			<&tlmm 30 0>,

			<&tlmm 157 0>;

		gpio-reset = <1>;

		gpio-vdig = <2>;

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

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

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

					"CAM_RESET6",

					"CAM_VDIG6";

		sensor-mode = <0>;

		cci-master = <0>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor@0 {

		cell-index = <0>;

		compatible = "qcom,cam-sensor";
@@ -405,4 +628,143 @@ 
		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};



	qcom,cam-sensor@4 {

		cell-index = <4>;

		compatible = "qcom,cam-sensor";

		reg = <0x4>;

		csiphy-sd-index = <1>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_triple_rear>;

		actuator-src = <&actuator_triple_rear>;

		eeprom-src = <&eeprom_triple_rear>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_vana-supply = <&pm8150l_bob>;

		cam_vdig-supply = <&pm8009_s2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 3008000 2856000 0>;

		rgltr-max-voltage = <1800000 4000000 3008000 0>;

		rgltr-load-current = <180000 2000000 519000 0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active

				&cam_sensor_active_triple_rear>;

		pinctrl-1 = <&cam_sensor_mclk1_suspend

				&cam_sensor_suspend_triple_rear>;

		gpios = <&tlmm 14 0>,

			<&tlmm 30 0>,

			<&tlmm 157 0>;

		gpio-reset = <1>;

		gpio-vdig = <2>;

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

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

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

					"CAM_RESET4",

					"CAM_VDIG4";

		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@5 {

		cell-index = <5>;

		compatible = "qcom,cam-sensor";

		reg = <0x5>;

		csiphy-sd-index = <3>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_triple_rear_aux>;

		actuator-src = <&actuator_triple_rear_aux>;

		eeprom-src = <&eeprom_triple_rear_aux>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_vana-supply = <&pm8150l_bob>;

		cam_vdig-supply = <&pm8009_s2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 3008000 2856000 0>;

		rgltr-max-voltage = <1800000 4000000 3008000 0>;

		rgltr-load-current = <180000 2000000 519000 0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk3_active

				&cam_sensor_active_triple_rear_aux>;

		pinctrl-1 = <&cam_sensor_mclk3_suspend

				&cam_sensor_suspend_triple_rear_aux>;

		gpios = <&tlmm 16 0>,

			<&tlmm 23 0>,

			<&tlmm 159 0>;

		gpio-reset = <1>;

		gpio-vdig = <2>;

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

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

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

					"CAM_RESET5",

					"CAM_VDIG5";

		sensor-mode = <0>;

		cci-device = <1>;

		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-sensor@6 {

		cell-index = <6>;

		compatible = "qcom,cam-sensor";

		reg = <0x06>;

		csiphy-sd-index = <0>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <180>;

		led-flash-src = <&led_flash_triple_rear_aux2>;

		actuator-src = <&actuator_triple_rear_aux2>;

		eeprom-src = <&eeprom_triple_rear_aux2>;

		cam_vdig-supply = <&pm8009_s2>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_vana-supply = <&pm8150l_bob>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <1800000 3008000 2856000 0>;

		rgltr-max-voltage = <1800000 4000000 3008000 0>;

		rgltr-load-current = <180000 2000000 519000 0>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active

				 &cam_sensor_active_triple_rear_aux2>;

		pinctrl-1 = <&cam_sensor_mclk0_suspend

				 &cam_sensor_suspend_triple_rear_aux2>;

		gpios = <&tlmm 13 0>,

			<&tlmm 28 0>,

			<&tlmm 25 0>;

		gpio-reset = <1>;

		gpio-vdig = <2>;

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

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

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

					"CAM_RESET6",

					"VDIG6";

		sensor-mode = <0>;

		cci-master = <0>;

		status = "ok";

		clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;

		clock-names = "cam_clk";

		clock-cntl-level = "turbo";

		clock-rates = <24000000>;

	};

};