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

Commit 9834fe7f authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: update camera node for sdm670 qrd devices" into dev/msm-4.9-camx

parents c9527c4a fe88fe78

arch/arm64/boot/dts/qcom/sdm670-camera-sensor-qrd.dtsi

+26 −23
Original line number Diff line number Diff line
@@ -229,12 +229,13 @@ 
		cam_vana-supply = <&cam_rear_avdd_gpio_regulator>;

		cam_vdig-supply = <&cam_rear_dvdd_gpio_regulator>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&actuator_regulator>;

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

			"cam_clk";

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 0 0 0>;

		rgltr-max-voltage = <0 0 0 0>;

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

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active
@@ -266,12 +267,13 @@ 
		cam_vana-supply = <&cam_avdd_gpio_regulator>;

		cam_vdig-supply = <&cam_dvdd_gpio_regulator>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

		cam_vaf-supply = <&actuator_regulator>;

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

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 0 0 0>;

		rgltr-max-voltage = <0 0 0 0>;

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

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -303,12 +305,13 @@ 
		cam_vana-supply = <&cam_avdd_gpio_regulator>;

		cam_vdig-supply = <&cam_dvdd_gpio_regulator>;

		cam_clk-supply = <&titan_top_gdsc>;

		cam_vaf-supply = <&actuator_regulator>;

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

			"cam_clk";

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 0 0 0>;

		rgltr-max-voltage = <0 0 0 0>;

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

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active
@@ -350,9 +353,9 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 0 0 0>;

		rgltr-max-voltage = <0 0 0 0>;

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

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active
@@ -390,12 +393,12 @@ 
		cam_vana-supply = <&cam_avdd_gpio_regulator>;

		cam_vdig-supply = <&cam_dvdd_gpio_regulator>;

		cam_clk-supply = <&titan_top_gdsc>;

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

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

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 0 0 0>;

		rgltr-max-voltage = <0 0 0 0>;

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

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -435,9 +438,9 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-min-voltage = <0 0 0 0>;

		rgltr-max-voltage = <0 0 0 0>;

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

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active