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

Commit 76e17c37 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Handle shared gpio among multiple I2C flash nodes" into camera-kernel.lnx.4.0

parents 9318b2e0 4eb3030c

blair-camera-sensor-cdp.dtsi

+0 −12
Original line number Diff line number Diff line
@@ -110,10 +110,6 @@ 
		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

		gpios = <&tlmm 52 0>;

		gpio-custom1 = <0>;

		gpio-req-tbl-num = <0>;
@@ -133,10 +129,6 @@ 
		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

		gpios = <&tlmm 52 0>;

		gpio-custom1 = <0>;

		gpio-req-tbl-num = <0>;
@@ -156,10 +148,6 @@ 
		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

		gpios = <&tlmm 52 0>;

		gpio-custom1 = <0>;

		gpio-req-tbl-num = <0>;

blair-camera-sensor-mtp.dtsi

+0 −12
Original line number Diff line number Diff line
@@ -110,10 +110,6 @@ 
		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

		gpios = <&tlmm 52 0>;

		gpio-custom1 = <0>;

		gpio-req-tbl-num = <0>;
@@ -133,10 +129,6 @@ 
		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

		gpios = <&tlmm 52 0>;

		gpio-custom1 = <0>;

		gpio-req-tbl-num = <0>;
@@ -156,10 +148,6 @@ 
		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

		gpios = <&tlmm 52 0>;

		gpio-custom1 = <0>;

		gpio-req-tbl-num = <0>;

blair-camera-sensor-qrd.dtsi

+0 −12
Original line number Diff line number Diff line
@@ -110,10 +110,6 @@ 
		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

		gpios = <&tlmm 52 0>;

		gpio-custom1 = <0>;

		gpio-req-tbl-num = <0>;
@@ -133,10 +129,6 @@ 
		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

		gpios = <&tlmm 52 0>;

		gpio-custom1 = <0>;

		gpio-req-tbl-num = <0>;
@@ -156,10 +148,6 @@ 
		rgltr-min-voltage = <1800000>;

		rgltr-max-voltage = <1800000>;

		rgltr-load-current = <120000>;

		gpio-no-mux = <0>;

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

		pinctrl-0 = <&cam_flash_hwen_active>;

		pinctrl-1 = <&cam_flash_hwen_suspend>;

		gpios = <&tlmm 52 0>;

		gpio-custom1 = <0>;

		gpio-req-tbl-num = <0>;