From 4eb3030cafd5326787bb69753cddc96b894e4a9a Mon Sep 17 00:00:00 2001 From: Robin Singh Rana Date: Tue, 31 Aug 2021 19:30:07 +0530 Subject: [PATCH] ARM: dts: msm: Handle shared gpio among multiple I2C flash nodes Adding shared gpio pinctrl for I2C flash only in cam_res_mgr so that in multicamera use case individual flash nodes do not try to set it active again. CRs-Fixed: 3040316 External Impact: No. Change-Id: I25d50eda091ba5547951f52ef1b1f56bb55a68f3 --- blair-camera-sensor-cdp.dtsi | 12 ------------ blair-camera-sensor-mtp.dtsi | 12 ------------ blair-camera-sensor-qrd.dtsi | 12 ------------ 3 files changed, 36 deletions(-) diff --git a/blair-camera-sensor-cdp.dtsi b/blair-camera-sensor-cdp.dtsi index 9791ae7279bd..fd1a30b61b90 100644 --- a/blair-camera-sensor-cdp.dtsi +++ b/blair-camera-sensor-cdp.dtsi @@ -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>; diff --git a/blair-camera-sensor-mtp.dtsi b/blair-camera-sensor-mtp.dtsi index 8c387e2ef242..50d1318e8a8b 100644 --- a/blair-camera-sensor-mtp.dtsi +++ b/blair-camera-sensor-mtp.dtsi @@ -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>; diff --git a/blair-camera-sensor-qrd.dtsi b/blair-camera-sensor-qrd.dtsi index fc513998c44c..7385d04fb9fb 100644 --- a/blair-camera-sensor-qrd.dtsi +++ b/blair-camera-sensor-qrd.dtsi @@ -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>;