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

Commit c27deae9 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge dcf89fb9 on remote branch 

Change-Id: If58329c7d1e0767dbeb464f00852320d789b5968
parents f6433cbb dcf89fb9

lagoon-camera-sensor-cdp.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -164,8 +164,8 @@ 
			"cam_clk", "cam_v_custom1";

		rgltr-cntrl-support;

		pwm-switch;

		rgltr-min-voltage = <1800000 2904000 1104000 0 2096000>;

		rgltr-max-voltage = <1800000 2904000 1104000 0 2096000>;

		rgltr-min-voltage = <1800000 2904000 1104000 0 1856000>;

		rgltr-max-voltage = <1800000 2904000 1104000 0 2048000>;

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

		gpio-no-mux = <0>;

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

lagoon-camera-sensor-mtp.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -164,8 +164,8 @@ 
			"cam_clk", "cam_v_custom1";

		rgltr-cntrl-support;

		pwm-switch;

		rgltr-min-voltage = <1800000 2904000 1104000 0 2096000>;

		rgltr-max-voltage = <1800000 2904000 1104000 0 2096000>;

		rgltr-min-voltage = <1800000 2904000 1104000 0 1856000>;

		rgltr-max-voltage = <1800000 2904000 1104000 0 2048000>;

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

		gpio-no-mux = <0>;

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

lagoon-camera.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1258,7 +1258,7 @@ 
					traffic-data =

					<CAM_CPAS_PATH_DATA_IFE_RDI_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_READ>;

					<CAM_CPAS_TRANSACTION_WRITE>;

					constituent-paths =

					<CAM_CPAS_PATH_DATA_IFE_RDI0

					CAM_CPAS_PATH_DATA_IFE_RDI1
@@ -1274,7 +1274,7 @@ 
					traffic-data =

					<CAM_CPAS_PATH_DATA_IFE_RDI_ALL>;

					traffic-transaction-type =

					<CAM_CPAS_TRANSACTION_READ>;

					<CAM_CPAS_TRANSACTION_WRITE>;

					constituent-paths =

					<CAM_CPAS_PATH_DATA_IFE_RDI0

					CAM_CPAS_PATH_DATA_IFE_RDI1