Merge 6d46298cb7 on remote branch

Change-Id: I3f5c99a2ed1d21bbee469840a961a65fbafbe0ad
This commit is contained in:
Linux Build Service Account 2021-03-26 13:01:43 -07:00
commit e9797befca

View file

@ -141,7 +141,7 @@
regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk";
rgltr-cntrl-support;
rgltr-min-voltage = <1800000 3200000 1000000 0>;
rgltr-max-voltage = <1800000 3960000 1200000 0>;
rgltr-max-voltage = <1800000 3960000 1500000 0>;
rgltr-load-current = <15000 2000000 805000 0>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";
@ -269,7 +269,7 @@
regulator-names = "cam_vio", "cam_vana", "cam_vdig", "cam_clk";
rgltr-cntrl-support;
rgltr-min-voltage = <1800000 3200000 1000000 0>;
rgltr-max-voltage = <1800000 3960000 1200000 0>;
rgltr-max-voltage = <1800000 3960000 1500000 0>;
rgltr-load-current = <15000 2000000 805000 0>;
gpio-no-mux = <0>;
pinctrl-names = "cam_default", "cam_suspend";