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

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

Merge "ARM: dts: msm: Correct eeprom node in SDM670 Camera CDP/MTP dtsi" into dev/msm-4.9-camx

parents 3c1652e1 c02d911a

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -197,7 +197,7 @@ 
		rgltr-cntrl-support;

		rgltr-cntrl-support;

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

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

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

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

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

		rgltr-load-current = <105000 0 80000 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
@@ -234,7 +234,7 @@ 
		rgltr-cntrl-support;

		rgltr-cntrl-support;

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

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

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

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

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

		rgltr-load-current = <0 80000 105000 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_mclk2_active

		pinctrl-0 = <&cam_sensor_mclk2_active

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -197,7 +197,7 @@ 
		rgltr-cntrl-support;

		rgltr-cntrl-support;

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

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

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

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

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

		rgltr-load-current = <105000 0 80000 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
@@ -234,7 +234,7 @@ 
		rgltr-cntrl-support;

		rgltr-cntrl-support;

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

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

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

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

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

		rgltr-load-current = <0 80000 105000 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_mclk2_active

		pinctrl-0 = <&cam_sensor_mclk2_active