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

Commit 86d96e09 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Update sensor device node for SDM660 QRD"

parents 4bdee994 3dc4455f

arch/arm/boot/dts/qcom/sdm660-camera-sensor-qrd.dtsi

+41 −43
Original line number Diff line number Diff line
@@ -40,6 +40,16 @@ 
		gpio = <&tlmm 50 0>;

		vin-supply = <&pm660l_bob>;

	};



	cam_rear_dvdd_gpio_regulator: cam_rear_dvdd_fixed_regulator {

		compatible = "regulator-fixed";

		regulator-name = "cam_rear_dvdd_gpio_regulator";

		regulator-min-microvolt = <1350000>;

		regulator-max-microvolt = <1350000>;

		enable-active-high;

		gpio = <&pm660l_gpios 4 0>;

		vin-supply = <&pm660_s5>;

	};

};



&tlmm {
@@ -172,10 +182,10 @@ 
		compatible = "qcom,eeprom";

		cam_vio-supply = <&pm660_l11>;

		cam_vana-supply = <&cam_avdd_gpio_regulator>;

		cam_vdig-supply = <&pm660_s5>;

		cam_vdig-supply = <&cam_rear_dvdd_gpio_regulator>;

		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";

		qcom,cam-vreg-min-voltage = <1780000 0 1350000>;

		qcom,cam-vreg-max-voltage = <1950000 0 1350000>;

		qcom,cam-vreg-min-voltage = <1780000 0 0>;

		qcom,cam-vreg-max-voltage = <1950000 0 0>;

		qcom,cam-vreg-op-mode = <105000 0 105000>;

		qcom,gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";
@@ -184,15 +194,12 @@ 
		pinctrl-1 = <&cam_sensor_mclk0_suspend

				&cam_sensor_rear_suspend>;

		gpios = <&tlmm 32 0>,

			<&tlmm 46 0>,

			<&pm660l_gpios 4 0>;

			<&tlmm 46 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vdig = <2>;

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

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

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

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

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

					"CAM_RESET0",

					"CAM_VDIG";

					"CAM_RESET0";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;
@@ -209,11 +216,11 @@ 
		compatible = "qcom,eeprom";

		cam_vio-supply = <&pm660_l11>;

		cam_vana-supply = <&cam_avdd_gpio_regulator>;

		cam_vdig-supply = <&pm660_s5>;

		cam_vdig-supply = <&cam_rear_dvdd_gpio_regulator>;

		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";

		qcom,cam-vreg-min-voltage = <1780000 0 1350000>;

		qcom,cam-vreg-max-voltage = <1950000 0 1350000>;

		qcom,cam-vreg-op-mode = <105000 0 105000>;

		qcom,cam-vreg-min-voltage = <1780000 0 0>;

		qcom,cam-vreg-max-voltage = <1950000 0 0>;

		qcom,cam-vreg-op-mode = <105000 0 0>;

		qcom,gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active
@@ -221,15 +228,12 @@ 
		pinctrl-1 = <&cam_sensor_mclk2_suspend

				 &cam_sensor_rear2_suspend>;

		gpios = <&tlmm 34 0>,

			<&tlmm 48 0>,

			<&pm660l_gpios 4 0>;

			<&tlmm 48 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vdig = <2>;

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

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

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

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

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

					  "CAM_RESET1",

					  "CAM_VDIG";

					  "CAM_RESET1";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <1>;
@@ -290,11 +294,11 @@ 
		qcom,eeprom-src = <&eeprom0>;

		cam_vio-supply = <&pm660_l11>;

		cam_vana-supply = <&cam_avdd_gpio_regulator>;

		cam_vdig-supply = <&pm660_s5>;

		cam_vdig-supply = <&cam_rear_dvdd_gpio_regulator>;

		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";

		qcom,cam-vreg-min-voltage = <1780000 0 1350000>;

		qcom,cam-vreg-max-voltage = <1950000 0 1350000>;

		qcom,cam-vreg-op-mode = <105000 0 105000>;

		qcom,cam-vreg-min-voltage = <1780000 0 0>;

		qcom,cam-vreg-max-voltage = <1950000 0 0>;

		qcom,cam-vreg-op-mode = <105000 0 0>;

		qcom,gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active
@@ -302,15 +306,12 @@ 
		pinctrl-1 = <&cam_sensor_mclk0_suspend

				 &cam_sensor_rear_suspend>;

		gpios = <&tlmm 32 0>,

			<&tlmm 46 0>,

			<&pm660l_gpios 4 0>;

			<&tlmm 46 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vdig = <2>;

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

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

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

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

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

					"CAM_RESET0",

					"CAM_VDIG";

					"CAM_RESET0";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <0>;
@@ -333,11 +334,11 @@ 
		qcom,eeprom-src = <&eeprom1>;

		cam_vio-supply = <&pm660_l11>;

		cam_vana-supply = <&cam_avdd_gpio_regulator>;

		cam_vdig-supply = <&pm660_s5>;

		cam_vdig-supply = <&cam_rear_dvdd_gpio_regulator>;

		qcom,cam-vreg-name = "cam_vio", "cam_vana", "cam_vdig";

		qcom,cam-vreg-min-voltage = <1780000 0 1350000>;

		qcom,cam-vreg-max-voltage = <1950000 0 1350000>;

		qcom,cam-vreg-op-mode = <105000 0 105000>;

		qcom,cam-vreg-min-voltage = <1780000 0 0>;

		qcom,cam-vreg-max-voltage = <1950000 0 0>;

		qcom,cam-vreg-op-mode = <105000 0 0>;

		qcom,gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active
@@ -345,15 +346,12 @@ 
		pinctrl-1 = <&cam_sensor_mclk2_suspend

				 &cam_sensor_rear2_suspend>;

		gpios = <&tlmm 34 0>,

			<&tlmm 48 0>,

			<&pm660l_gpios 4 0>;

			<&tlmm 48 0>;

		qcom,gpio-reset = <1>;

		qcom,gpio-vdig = <2>;

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

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

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

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

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

					  "CAM_RESET1",

					  "CAM_VDIG";

					  "CAM_RESET1";

		qcom,sensor-position = <0>;

		qcom,sensor-mode = <0>;

		qcom,cci-master = <1>;