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

Commit 4137883d 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: change voltage supply for XR1 camera sensor"

parents 1d89fa40 2eae5840

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

+10 −10
Original line number Original line Diff line number Diff line
@@ -311,9 +311,9 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig","cam_clk",

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

				"cam_vaf";

				"cam_vaf";

		rgltr-cntrl-support;

		rgltr-cntrl-support;

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

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

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

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

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

		rgltr-load-current = <60000 80000 120000 0 0>;

		gpio-no-mux = <0>;

		gpio-no-mux = <0>;

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

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

		pinctrl-0 = <&cam_sensor_mclk0_active

		pinctrl-0 = <&cam_sensor_mclk0_active
@@ -367,8 +367,8 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

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

			"cam_clk";

			"cam_clk";

		rgltr-cntrl-support;

		rgltr-cntrl-support;

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

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

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

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

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

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

		gpio-no-mux = <0>;

		gpio-no-mux = <0>;

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

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

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

				"cam_clk";

				"cam_clk";

		rgltr-cntrl-support;

		rgltr-cntrl-support;

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

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

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

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

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

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

		gpio-no-mux = <0>;

		gpio-no-mux = <0>;

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

		pinctrl-names = "cam_default", "cam_suspend";
@@ -468,9 +468,9 @@ 
		regulator-names = "cam_vio", "cam_vana", "cam_vdig",

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

				"cam_clk", "cam_vaf";

				"cam_clk", "cam_vaf";

		rgltr-cntrl-support;

		rgltr-cntrl-support;

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

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

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

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

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

		rgltr-load-current = <60000 80000 120000 0 0>;

		gpio-no-mux = <0>;

		gpio-no-mux = <0>;

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

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

		pinctrl-0 = <&cam_sensor_mclk1_active

		pinctrl-0 = <&cam_sensor_mclk1_active

arch/arm64/boot/dts/qcom/sdm670-regulator.dtsi

+3 −3
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2017,2018 The Linux Foundation. All rights reserved.

/* Copyright (c) 2017,2020 The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -538,9 +538,9 @@ 
		pm660l_l3: regulator-pm660l-l3 {

		pm660l_l3: regulator-pm660l-l3 {

			regulator-name = "pm660l_l3";

			regulator-name = "pm660l_l3";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;

			qcom,set = <RPMH_REGULATOR_SET_ALL>;

			regulator-min-microvolt = <2850000>;

			regulator-min-microvolt = <2800000>;

			regulator-max-microvolt = <3008000>;

			regulator-max-microvolt = <3008000>;

			qcom,init-voltage = <2850000>;

			qcom,init-voltage = <2800000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

		};

	};

	};

arch/arm64/boot/dts/qcom/sdm670-stub-regulator.dtsi

+2 −2
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2020, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -255,7 +255,7 @@ 
		compatible = "qcom,stub-regulator";

		compatible = "qcom,stub-regulator";

		regulator-name = "pm660l_l3";

		regulator-name = "pm660l_l3";

		qcom,hpm-min-load = <10000>;

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <2850000>;

		regulator-min-microvolt = <2800000>;

		regulator-max-microvolt = <3008000>;

		regulator-max-microvolt = <3008000>;

	};

	};