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

Commit 0e4f7837 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Added automotive camera ldos"

parents f53a888c 39bc5651

arch/arm64/boot/dts/qcom/sa6155-pmic.dtsi

+19 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

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

 *

 * 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
@@ -91,15 +91,30 @@ 
};



&cam_csiphy0 {

	/delete-property/ mipi-csi-vdd-supply;

	mipi-csi-vdd-supply = <&pm6155_1_l11>;

	regulator-names = "gdscr", "mipi-csi-vdd";

	rgltr-cntrl-support;

	rgltr-min-voltage = <0 1232000>;

	rgltr-max-voltage = <0 1232000>;

	rgltr-load-current = <0 21800>;

};



&cam_csiphy1 {

	/delete-property/ mipi-csi-vdd-supply;

	mipi-csi-vdd-supply = <&pm6155_1_l11>;

	regulator-names = "gdscr", "mipi-csi-vdd";

	rgltr-cntrl-support;

	rgltr-min-voltage = <0 1232000>;

	rgltr-max-voltage = <0 1232000>;

	rgltr-load-current = <0 21800>;

};



&cam_csiphy2 {

	/delete-property/ mipi-csi-vdd-supply;

	mipi-csi-vdd-supply = <&pm6155_1_l11>;

	regulator-names = "gdscr", "mipi-csi-vdd";

	rgltr-cntrl-support;

	rgltr-min-voltage = <0 1232000>;

	rgltr-max-voltage = <0 1232000>;

	rgltr-load-current = <0 21800>;

};



&bluetooth {

arch/arm64/boot/dts/qcom/sa8155.dtsi

+29 −4
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
	/delete-node/ rpmh-regulator-ldoc6;

	/delete-node/ rpmh-regulator-ldoc7;

	/delete-node/ rpmh-regulator-ldoc8;

	/delete-node/ rpmh-regulator-ldoc18;

	/delete-node/ rpmh-regulator-ldoc9;

	/delete-node/ rpmh-regulator-ldoc10;

	/delete-node/ rpmh-regulator-ldoc11;
@@ -71,19 +72,43 @@ 
};



&cam_csiphy0 {

	mipi-csi-vdd-supply = <&pm8150_2_l8>;

	mipi-csi-vdd-supply = <&pm8150_2_l18>;

	mipi-csi-vdd1p2-supply = <&pm8150_2_l8>;

	regulator-names = "gdscr", "mipi-csi-vdd", "mipi-csi-vdd1p2";

	rgltr-cntrl-support;

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

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

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

};



&cam_csiphy1 {

	mipi-csi-vdd-supply = <&pm8150_2_l8>;

	mipi-csi-vdd-supply = <&pm8150_2_l18>;

	mipi-csi-vdd1p2-supply = <&pm8150_2_l8>;

	regulator-names = "gdscr", "mipi-csi-vdd", "mipi-csi-vdd1p2";

	rgltr-cntrl-support;

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

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

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

};



&cam_csiphy2 {

	mipi-csi-vdd-supply = <&pm8150_2_l8>;

	mipi-csi-vdd-supply = <&pm8150_2_l18>;

	mipi-csi-vdd1p2-supply = <&pm8150_2_l8>;

	regulator-names = "gdscr", "mipi-csi-vdd", "mipi-csi-vdd1p2";

	rgltr-cntrl-support;

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

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

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

};



&cam_csiphy3 {

	mipi-csi-vdd-supply = <&pm8150_2_l8>;

	mipi-csi-vdd-supply = <&pm8150_2_l18>;

	mipi-csi-vdd1p2-supply = <&pm8150_2_l8>;

	regulator-names = "gdscr", "mipi-csi-vdd", "mipi-csi-vdd1p2";

	rgltr-cntrl-support;

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

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

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

};



&pcie0 {

arch/arm64/boot/dts/qcom/sa8195p.dtsi

+28 −4
Original line number Diff line number Diff line
@@ -452,19 +452,43 @@ 
};



&cam_csiphy0 {

	mipi-csi-vdd-supply = <&pm8195_1_l9>;

	mipi-csi-vdd-supply = <&pm8195_3_l5>;

	mipi-csi-vdd1p2-supply = <&pm8195_1_l9>;

	regulator-names = "gdscr", "mipi-csi-vdd", "mipi-csi-vdd1p2";

	rgltr-cntrl-support;

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

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

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

};



&cam_csiphy1 {

	mipi-csi-vdd-supply = <&pm8195_1_l9>;

	mipi-csi-vdd-supply = <&pm8195_3_l5>;

	mipi-csi-vdd1p2-supply = <&pm8195_1_l9>;

	regulator-names = "gdscr", "mipi-csi-vdd", "mipi-csi-vdd1p2";

	rgltr-cntrl-support;

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

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

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

};



&cam_csiphy2 {

	mipi-csi-vdd-supply = <&pm8195_1_l9>;

	mipi-csi-vdd-supply = <&pm8195_3_l5>;

	mipi-csi-vdd1p2-supply = <&pm8195_1_l9>;

	regulator-names = "gdscr", "mipi-csi-vdd", "mipi-csi-vdd1p2";

	rgltr-cntrl-support;

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

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

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

};



&cam_csiphy3 {

	mipi-csi-vdd-supply = <&pm8195_1_l9>;

	mipi-csi-vdd-supply = <&pm8195_3_l5>;

	mipi-csi-vdd1p2-supply = <&pm8195_1_l9>;

	regulator-names = "gdscr", "mipi-csi-vdd", "mipi-csi-vdd1p2";

	rgltr-cntrl-support;

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

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

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

};



&cam_cci0 {