Skip to content

Commit 534a609

Browse files
mvadlama-labmvadlama-lab
committed
QCLINUX: arm64: dts: qcom: Fix GPIO free and acquire logic
Prevent GPIOs managed by pinctrl from being requested and freed via the GPIO framework. Restrict GPIO request/free operations to non-pinctrl GPIOs by adding appropriate conditions.    Signed-off-by: Vadlamani Manjusha <mvadlama@qti.qualcomm.com>
1 parent 0136c1e commit 534a609

1 file changed

Lines changed: 95 additions & 151 deletions

File tree

‎arch/arm64/boot/dts/qcom/lemans-evk-camera-sensor.dtsi‎

Lines changed: 95 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -140,20 +140,16 @@
140140
rgltr-max-voltage = <1800000>;
141141
rgltr-load-current = <120000>;
142142
gpio-no-mux = <0>;
143-
pinctrl-0 = <&cam_sensor_mclk0_active
144-
&cam_sensor_active_rst0>;
145-
pinctrl-1 = <&cam_sensor_mclk0_suspend
146-
&cam_sensor_suspend_rst0>;
143+
pinctrl-0 = <&cam_sensor_mclk0_active>;
144+
pinctrl-1 = <&cam_sensor_mclk0_suspend>;
147145
pinctrl-names = "cam_default", "cam_suspend";
148-
gpios = <&tlmm 72 0>,
149-
<&tlmm 132 0>,
146+
gpios =<&tlmm 132 0>,
150147
<&pmm8654au_0_gpios 7 0>;
151-
gpio-reset = <1>;
152-
gpio-custom1 = <2>;
153-
gpio-req-tbl-num = <0 1 2>;
154-
gpio-req-tbl-flags = <1 0 0>;
155-
gpio-req-tbl-label = "CAM_MCLK0",
156-
"CAMIF_RESET0",
148+
gpio-reset = <0>;
149+
gpio-custom1 = <1>;
150+
gpio-req-tbl-num = <0 1>;
151+
gpio-req-tbl-flags = <0 0>;
152+
gpio-req-tbl-label = "CAMIF_RESET0",
157153
"CAM_CUSTOM1";
158154
cci-master = <0>;
159155
clocks = <&camcc CAM_CC_MCLK0_CLK>;
@@ -181,21 +177,17 @@
181177
rgltr-max-voltage = <1800000>;
182178
rgltr-load-current = <120000>;
183179
gpio-no-mux = <0>;
184-
pinctrl-0 = <&cam_sensor_mclk0_active
185-
&cam_sensor_active_rst0>;
186-
pinctrl-1 = <&cam_sensor_mclk0_suspend
187-
&cam_sensor_suspend_rst0>;
180+
pinctrl-0 = <&cam_sensor_mclk0_active>;
181+
pinctrl-1 = <&cam_sensor_mclk0_suspend>;
188182
pinctrl-names = "cam_default", "cam_suspend";
189-
gpios = <&tlmm 72 0>,
190-
<&tlmm 132 0>,
183+
gpios =<&tlmm 132 0>,
191184
<&pmm8654au_0_gpios 7 0>;
192-
gpio-reset = <1>;
193-
gpio-custom1 = <2>;
194-
gpio-req-tbl-num = <0 1 2>;
195-
gpio-req-tbl-flags = <1 0 0>;
196-
gpio-req-tbl-label = "CAM_MCLK0",
197-
"CAMIF_RESET0",
198-
"CAM_CUSTOM1";
185+
gpio-reset = <0>;
186+
gpio-custom1 = <1>;
187+
gpio-req-tbl-num = <0 1>;
188+
gpio-req-tbl-flags = <0 0>;
189+
gpio-req-tbl-label = "CAMIF_RESET0",
190+
"CAM_CUSTOM1";
199191
cci-master = <0>;
200192
clocks = <&camcc CAM_CC_MCLK0_CLK>;
201193
clock-names = "cam_clk";
@@ -222,20 +214,16 @@
222214
rgltr-max-voltage = <1800000>;
223215
rgltr-load-current = <120000>;
224216
gpio-no-mux = <0>;
225-
pinctrl-0 = <&cam_sensor_mclk0_active
226-
&cam_sensor_active_rst0>;
227-
pinctrl-1 = <&cam_sensor_mclk0_suspend
228-
&cam_sensor_suspend_rst0>;
217+
pinctrl-0 = <&cam_sensor_mclk0_active>;
218+
pinctrl-1 = <&cam_sensor_mclk0_suspend>;
229219
pinctrl-names = "cam_default", "cam_suspend";
230-
gpios = <&tlmm 72 0>,
231-
<&tlmm 132 0>,
220+
gpios =<&tlmm 132 0>,
232221
<&pmm8654au_0_gpios 7 0>;
233-
gpio-reset = <1>;
234-
gpio-custom1 = <2>;
235-
gpio-req-tbl-num = <0 1 2>;
236-
gpio-req-tbl-flags = <1 0 0>;
237-
gpio-req-tbl-label = "CAM_MCLK0",
238-
"CAMIF_RESET0",
222+
gpio-reset = <0>;
223+
gpio-custom1 = <1>;
224+
gpio-req-tbl-num = <0 1>;
225+
gpio-req-tbl-flags = <0 0>;
226+
gpio-req-tbl-label = "CAMIF_RESET0",
239227
"CAM_CUSTOM1";
240228
cci-master = <0>;
241229
clocks = <&camcc CAM_CC_MCLK0_CLK>;
@@ -257,21 +245,17 @@
257245
rgltr-max-voltage = <1800000>;
258246
rgltr-load-current = <120000>;
259247
gpio-no-mux = <0>;
260-
pinctrl-0 = <&cam_sensor_mclk0_active
261-
&cam_sensor_active_rst0>;
262-
pinctrl-1 = <&cam_sensor_mclk0_suspend
263-
&cam_sensor_suspend_rst0>;
248+
pinctrl-0 = <&cam_sensor_mclk0_active>;
249+
pinctrl-1 = <&cam_sensor_mclk0_suspend>;
264250
pinctrl-names = "cam_default", "cam_suspend";
265-
gpios = <&tlmm 72 0>,
266-
<&tlmm 132 0>,
251+
gpios =<&tlmm 132 0>,
267252
<&pmm8654au_0_gpios 7 0>;
268-
gpio-reset = <1>;
269-
gpio-custom1 = <2>;
270-
gpio-req-tbl-num = <0 1 2>;
271-
gpio-req-tbl-flags = <1 0 0>;
272-
gpio-req-tbl-label = "CAM_MCLK0",
273-
"CAMIF_RESET0",
274-
"CAM_CUSTOM1";
253+
gpio-reset = <0>;
254+
gpio-custom1 = <1>;
255+
gpio-req-tbl-num = <0 1>;
256+
gpio-req-tbl-flags = <0 0>;
257+
gpio-req-tbl-label = "CAMIF_RESET0",
258+
"CAM_CUSTOM1";
275259
cci-master = <0>;
276260
clocks = <&camcc CAM_CC_MCLK0_CLK>;
277261
clock-names = "cam_clk";
@@ -292,19 +276,16 @@
292276
rgltr-max-voltage = <1800000>;
293277
rgltr-load-current = <120000>;
294278
gpio-no-mux = <0>;
295-
pinctrl-0 = <&cam_sensor_mclk0_active
296-
&cam_sensor_active_rst0>;
297-
pinctrl-1 = <&cam_sensor_mclk0_suspend
298-
&cam_sensor_suspend_rst0>;
299-
gpios = <&tlmm 72 0>,
300-
<&tlmm 132 0>,
279+
pinctrl-0 = <&cam_sensor_mclk0_active>;
280+
pinctrl-1 = <&cam_sensor_mclk0_suspend>;
281+
pinctrl-names = "cam_default", "cam_suspend";
282+
gpios =<&tlmm 132 0>,
301283
<&pmm8654au_0_gpios 7 0>;
302-
gpio-reset = <1>;
303-
gpio-custom1 = <2>;
304-
gpio-req-tbl-num = <0 1 2>;
305-
gpio-req-tbl-flags = <1 0 0>;
306-
gpio-req-tbl-label = "CAM_MCLK0",
307-
"CAMIF_RESET0",
284+
gpio-reset = <0>;
285+
gpio-custom1 = <1>;
286+
gpio-req-tbl-num = <0 1>;
287+
gpio-req-tbl-flags = <0 0>;
288+
gpio-req-tbl-label = "CAMIF_RESET0",
308289
"CAM_CUSTOM1";
309290
sensor-mode = <0>;
310291
cci-master = <0>;
@@ -454,9 +435,6 @@
454435
rgltr-max-voltage = <1800000>;
455436
rgltr-load-current = <120000>;
456437
gpio-no-mux = <0>;
457-
pinctrl-0 = <&cam_sensor_active_rst1>;
458-
pinctrl-1 = <&cam_sensor_suspend_rst1>;
459-
pinctrl-names = "cam_default", "cam_suspend";
460438
gpios = <&tlmm 73 0>,
461439
<&tlmm 133 0>,
462440
<&pmm8654au_0_gpios 8 0>;
@@ -466,7 +444,7 @@
466444
gpio-req-tbl-flags = <1 0 0>;
467445
gpio-req-tbl-label = "CAM_MCLK1",
468446
"CAMIF_RESET1",
469-
"CAM_CUSTOM1";
447+
"CAM_CUSTOM1";
470448
cci-master = <0>;
471449
clocks = <&camcc CAM_CC_MCLK1_CLK>;
472450
clock-names = "cam_clk";
@@ -493,11 +471,6 @@
493471
rgltr-max-voltage = <1800000>;
494472
rgltr-load-current = <120000>;
495473
gpio-no-mux = <0>;
496-
pinctrl-0 = <&cam_sensor_mclk1_active
497-
&cam_sensor_active_rst1>;
498-
pinctrl-1 = <&cam_sensor_mclk1_suspend
499-
&cam_sensor_suspend_rst1>;
500-
pinctrl-names = "cam_default", "cam_suspend";
501474
gpios = <&tlmm 73 0>,
502475
<&tlmm 133 0>,
503476
<&pmm8654au_0_gpios 8 0>;
@@ -563,11 +536,6 @@
563536
rgltr-max-voltage = <1800000>;
564537
rgltr-load-current = <120000>;
565538
gpio-no-mux = <0>;
566-
pinctrl-0 = <&cam_sensor_mclk1_active
567-
&cam_sensor_active_rst1>;
568-
pinctrl-1 = <&cam_sensor_mclk1_suspend
569-
&cam_sensor_suspend_rst1>;
570-
pinctrl-names = "cam_default", "cam_suspend";
571539
gpios = <&tlmm 73 0>,
572540
<&tlmm 133 0>,
573541
<&pmm8654au_0_gpios 8 0>;
@@ -726,21 +694,17 @@
726694
rgltr-max-voltage = <1800000>;
727695
rgltr-load-current = <120000>;
728696
gpio-no-mux = <0>;
729-
pinctrl-0 = <&cam_sensor_mclk2_active
730-
&cam_sensor_active_rst2>;
731-
pinctrl-1 = <&cam_sensor_mclk2_suspend
732-
&cam_sensor_suspend_rst2>;
697+
pinctrl-0 = <&cam_sensor_mclk2_active>;
698+
pinctrl-1 = <&cam_sensor_mclk2_suspend>;
733699
pinctrl-names = "cam_default", "cam_suspend";
734-
gpios = <&tlmm 74 0>,
735-
<&tlmm 134 0>,
700+
gpios = <&tlmm 134 0>,
736701
<&pmm8654au_0_gpios 9 0>;
737-
gpio-reset = <1>;
738-
gpio-custom1 = <2>;
739-
gpio-req-tbl-num = <0 1 2>;
740-
gpio-req-tbl-flags = <1 0 0>;
741-
gpio-req-tbl-label = "CAM_MCLK2",
742-
"CAMIF_RESET2",
743-
"CAM_CUSTOM1";
702+
gpio-reset = <0>;
703+
gpio-custom1 = <1>;
704+
gpio-req-tbl-num = <0 1>;
705+
gpio-req-tbl-flags = <0 0>;
706+
gpio-req-tbl-label = "CAMIF_RESET2",
707+
"CAM_CUSTOM1";
744708
cci-master = <0>;
745709
clocks = <&camcc CAM_CC_MCLK2_CLK>;
746710
clock-names = "cam_clk";
@@ -767,20 +731,16 @@
767731
rgltr-max-voltage = <1800000>;
768732
rgltr-load-current = <120000>;
769733
gpio-no-mux = <0>;
770-
pinctrl-0 = <&cam_sensor_mclk2_active
771-
&cam_sensor_active_rst2>;
772-
pinctrl-1 = <&cam_sensor_mclk2_suspend
773-
&cam_sensor_suspend_rst2>;
734+
pinctrl-0 = <&cam_sensor_mclk2_active>;
735+
pinctrl-1 = <&cam_sensor_mclk2_suspend>;
774736
pinctrl-names = "cam_default", "cam_suspend";
775-
gpios = <&tlmm 74 0>,
776-
<&tlmm 134 0>,
737+
gpios = <&tlmm 134 0>,
777738
<&pmm8654au_0_gpios 9 0>;
778-
gpio-reset = <1>;
779-
gpio-custom1 = <2>;
780-
gpio-req-tbl-num = <0 1 2>;
781-
gpio-req-tbl-flags = <1 0 0>;
782-
gpio-req-tbl-label = "CAM_MCLK2",
783-
"CAMIF_RESET2",
739+
gpio-reset = <0>;
740+
gpio-custom1 = <1>;
741+
gpio-req-tbl-num = <0 1>;
742+
gpio-req-tbl-flags = <0 0>;
743+
gpio-req-tbl-label = "CAMIF_RESET2",
784744
"CAM_CUSTOM1";
785745
cci-master = <0>;
786746
clocks = <&camcc CAM_CC_MCLK2_CLK>;
@@ -802,20 +762,16 @@
802762
rgltr-max-voltage = <1800000>;
803763
rgltr-load-current = <120000>;
804764
gpio-no-mux = <0>;
805-
pinctrl-0 = <&cam_sensor_mclk2_active
806-
&cam_sensor_active_rst2>;
807-
pinctrl-1 = <&cam_sensor_mclk2_suspend
808-
&cam_sensor_suspend_rst2>;
765+
pinctrl-0 = <&cam_sensor_mclk2_active>;
766+
pinctrl-1 = <&cam_sensor_mclk2_suspend>;
809767
pinctrl-names = "cam_default", "cam_suspend";
810-
gpios = <&tlmm 74 0>,
811-
<&tlmm 134 0>,
768+
gpios = <&tlmm 134 0>,
812769
<&pmm8654au_0_gpios 9 0>;
813-
gpio-reset = <1>;
814-
gpio-custom1 = <2>;
815-
gpio-req-tbl-num = <0 1 2>;
816-
gpio-req-tbl-flags = <1 0 0>;
817-
gpio-req-tbl-label = "CAMIF_MCLK2",
818-
"CAM_RESET2",
770+
gpio-reset = <0>;
771+
gpio-custom1 = <1>;
772+
gpio-req-tbl-num = <0 1>;
773+
gpio-req-tbl-flags = <0 0>;
774+
gpio-req-tbl-label = "CAMIF_RESET2",
819775
"CAM_CUSTOM1";
820776
sensor-mode = <0>;
821777
cci-master = <0>;
@@ -965,21 +921,17 @@
965921
rgltr-max-voltage = <1800000>;
966922
rgltr-load-current = <120000>;
967923
gpio-no-mux = <0>;
968-
pinctrl-0 = <&cam_sensor_mclk3_active
969-
&cam_sensor_active_rst3>;
970-
pinctrl-1 = <&cam_sensor_mclk3_suspend
971-
&cam_sensor_suspend_rst3>;
924+
pinctrl-0 = <&cam_sensor_mclk3_active>;
925+
pinctrl-1 = <&cam_sensor_mclk3_suspend>;
972926
pinctrl-names = "cam_default", "cam_suspend";
973-
gpios = <&tlmm 75 0>,
974-
<&tlmm 135 0>,
927+
gpios = <&tlmm 135 0>,
975928
<&pmm8654au_0_gpios 10 0>;
976-
gpio-reset = <1>;
977-
gpio-custom1 = <2>;
978-
gpio-req-tbl-num = <0 1 2>;
979-
gpio-req-tbl-flags = <1 0 0>;
980-
gpio-req-tbl-label = "CAM_MCLK3",
981-
"CAMIF_RESET3",
982-
"CAM_CUSTOM1";
929+
gpio-reset = <0>;
930+
gpio-custom1 = <1>;
931+
gpio-req-tbl-num = <0 1>;
932+
gpio-req-tbl-flags = <0 0>;
933+
gpio-req-tbl-label = "CAMIF_RESET3",
934+
"CAM_CUSTOM1";
983935
cci-master = <0>;
984936
clocks = <&camcc CAM_CC_MCLK3_CLK>;
985937
clock-names = "cam_clk";
@@ -1006,20 +958,16 @@
1006958
rgltr-max-voltage = <1800000>;
1007959
rgltr-load-current = <120000>;
1008960
gpio-no-mux = <0>;
961+
pinctrl-0 = <&cam_sensor_mclk3_active>;
962+
pinctrl-1 = <&cam_sensor_mclk3_suspend>;
1009963
pinctrl-names = "cam_default", "cam_suspend";
1010-
pinctrl-0 = <&cam_sensor_mclk3_active
1011-
&cam_sensor_active_rst3>;
1012-
pinctrl-1 = <&cam_sensor_mclk3_suspend
1013-
&cam_sensor_suspend_rst3>;
1014-
gpios = <&tlmm 75 0>,
1015-
<&tlmm 135 0>,
964+
gpios = <&tlmm 135 0>,
1016965
<&pmm8654au_0_gpios 10 0>;
1017-
gpio-reset = <1>;
1018-
gpio-custom1 = <2>;
1019-
gpio-req-tbl-num = <0 1 2>;
1020-
gpio-req-tbl-flags = <1 0 0>;
1021-
gpio-req-tbl-label = "CAM_MCLK3",
1022-
"CAMIF_RESET3",
966+
gpio-reset = <0>;
967+
gpio-custom1 = <1>;
968+
gpio-req-tbl-num = <0 1>;
969+
gpio-req-tbl-flags = <0 0>;
970+
gpio-req-tbl-label = "CAMIF_RESET3",
1023971
"CAM_CUSTOM1";
1024972
cci-master = <0>;
1025973
clocks = <&camcc CAM_CC_MCLK3_CLK>;
@@ -1041,20 +989,16 @@
1041989
rgltr-max-voltage = <1800000>;
1042990
rgltr-load-current = <120000>;
1043991
gpio-no-mux = <0>;
1044-
pinctrl-0 = <&cam_sensor_mclk3_active
1045-
&cam_sensor_active_rst3>;
1046-
pinctrl-1 = <&cam_sensor_mclk3_suspend
1047-
&cam_sensor_suspend_rst3>;
1048-
gpios = <&tlmm 75 0>,
1049-
<&tlmm 135 0>,
1050-
<&pmm8654au_0_gpios 10 0>;
992+
pinctrl-0 = <&cam_sensor_mclk3_active>;
993+
pinctrl-1 = <&cam_sensor_mclk3_suspend>;
1051994
pinctrl-names = "cam_default", "cam_suspend";
1052-
gpio-reset = <1>;
1053-
gpio-custom1 = <2>;
1054-
gpio-req-tbl-num = <0 1 2>;
1055-
gpio-req-tbl-flags = <1 0 0>;
1056-
gpio-req-tbl-label = "CAMIF_MCLK3",
1057-
"CAM_RESET3",
995+
gpios = <&tlmm 135 0>,
996+
<&pmm8654au_0_gpios 10 0>;
997+
gpio-reset = <0>;
998+
gpio-custom1 = <1>;
999+
gpio-req-tbl-num = <0 1>;
1000+
gpio-req-tbl-flags = <0 0>;
1001+
gpio-req-tbl-label = "CAMIF_RESET3",
10581002
"CAM_CUSTOM1";
10591003
sensor-mode = <0>;
10601004
cci-master = <0>;

0 commit comments

Comments
 (0)