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

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

Merge "ARM: dts: msm: Add support for PWM for BoB regulator for SM8150" into dev/msm-4.14-camx

parents 0e9ddcf5 b2a53507

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

+28 −20
Original line number Diff line number Diff line
@@ -152,8 +152,8 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

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

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

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

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

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";
@@ -190,8 +190,8 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

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

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

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

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

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";
@@ -229,15 +229,17 @@ 
		ois-src = <&ois_rear>;

		eeprom-src = <&eeprom_rear>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active
@@ -271,16 +273,18 @@ 
		actuator-src = <&actuator_rear_aux>;

		led-flash-src = <&led_flash_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_vana-supply = <&pm8009_l6>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

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

		rgltr-max-voltage = <0 2856000 1200000 0 4000000>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -314,15 +318,17 @@ 
		eeprom-src = <&eeprom_front>;

		actuator-src = <&actuator_front>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l6>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

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

		rgltr-max-voltage = <0 2856000 1200000 0 4000000>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active
@@ -355,15 +361,17 @@ 
		sensor-position-yaw = <0>;

		led-flash-src = <&led_flash_iris>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk3_active

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

+28 −20
Original line number Diff line number Diff line
@@ -152,8 +152,8 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

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

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

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

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

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";
@@ -190,8 +190,8 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

			"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

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

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

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

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

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

		gpio-no-mux = <0>;

		pinctrl-names = "cam_default", "cam_suspend";
@@ -229,15 +229,17 @@ 
		ois-src = <&ois_rear>;

		eeprom-src = <&eeprom_rear>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active
@@ -271,16 +273,18 @@ 
		actuator-src = <&actuator_rear_aux>;

		led-flash-src = <&led_flash_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_vana-supply = <&pm8009_l6>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

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

		rgltr-max-voltage = <0 2856000 1200000 0 4000000>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -314,15 +318,17 @@ 
		eeprom-src = <&eeprom_front>;

		actuator-src = <&actuator_front>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l6>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

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

		rgltr-max-voltage = <0 2856000 1200000 0 4000000>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active
@@ -355,15 +361,17 @@ 
		sensor-position-yaw = <0>;

		led-flash-src = <&led_flash_iris>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk3_active

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

+24 −16
Original line number Diff line number Diff line
@@ -236,15 +236,17 @@ 
		ois-src = <&ois_rear>;

		eeprom-src = <&eeprom_rear>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk0_active
@@ -279,16 +281,18 @@ 
		actuator-src = <&actuator_rear_aux>;

		led-flash-src = <&led_flash_rear_aux>;

		eeprom-src = <&eeprom_rear_aux>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_vana-supply = <&pm8009_l6>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

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

		rgltr-max-voltage = <0 2856000 1200000 0 4000000>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk1_active
@@ -323,15 +327,17 @@ 
		eeprom-src = <&eeprom_front>;

		actuator-src = <&actuator_front>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l6>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

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

		rgltr-max-voltage = <0 2856000 1200000 0 4000000>;

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk2_active
@@ -365,15 +371,17 @@ 
		sensor-position-yaw = <0>;

		led-flash-src = <&led_flash_iris>;

		cam_vio-supply = <&pm8150l_l1>;

		cam_bob-supply = <&pm8150l_bob>;

		cam_vana-supply = <&pm8009_l5>;

		cam_vdig-supply = <&pm8009_l2>;

		cam_clk-supply = <&titan_top_gdsc>;

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

			"cam_clk";

			"cam_clk", "cam_bob";

		rgltr-cntrl-support;

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

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

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

		pwm-switch;

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

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

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

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_sensor_mclk3_active