Skip to content

Commit da95f08

Browse files
krzklinusw
authored andcommitted
pinctrl: qcom: mark true OF dependency - common MSM pinctrl code
The common MSM pinctrl driver code (PINCTRL_MSM) uses pinconf_generic_dt_node_to_map_group() from GENERIC_PINCONF, which is not available for compile testing for !OF cases. Drivers actually do not depend on OF. Move the OF dependency to the entry actually depending on it and drop any "|| COMPILE_TEST", because OF is required also for compile testing (lack of OF was never visible in compile testing because none of the drivers could be compile tested due to Makefile). Signed-off-by: Krzysztof Kozlowski <[email protected]> Reviewed-by: Konrad Dybcio <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Linus Walleij <[email protected]>
1 parent c0602ee commit da95f08

File tree

1 file changed

+2
-41
lines changed

1 file changed

+2
-41
lines changed

drivers/pinctrl/qcom/Kconfig

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ if (ARCH_QCOM || COMPILE_TEST)
44
config PINCTRL_MSM
55
tristate "Qualcomm core pin controller driver"
66
depends on GPIOLIB
7+
# OF for pinconf_generic_dt_node_to_map_group() from GENERIC_PINCONF
8+
depends on OF
79
select QCOM_SCM
810
select PINMUX
911
select PINCONF
@@ -14,7 +16,6 @@ config PINCTRL_MSM
1416

1517
config PINCTRL_APQ8064
1618
tristate "Qualcomm APQ8064 pin controller driver"
17-
depends on OF
1819
depends on ARM || COMPILE_TEST
1920
depends on PINCTRL_MSM
2021
help
@@ -23,7 +24,6 @@ config PINCTRL_APQ8064
2324

2425
config PINCTRL_APQ8084
2526
tristate "Qualcomm APQ8084 pin controller driver"
26-
depends on OF
2727
depends on ARM || COMPILE_TEST
2828
depends on PINCTRL_MSM
2929
help
@@ -32,7 +32,6 @@ config PINCTRL_APQ8084
3232

3333
config PINCTRL_IPQ4019
3434
tristate "Qualcomm IPQ4019 pin controller driver"
35-
depends on OF
3635
depends on ARM || COMPILE_TEST
3736
depends on PINCTRL_MSM
3837
help
@@ -52,7 +51,6 @@ config PINCTRL_IPQ5018
5251

5352
config PINCTRL_IPQ8064
5453
tristate "Qualcomm IPQ8064 pin controller driver"
55-
depends on OF
5654
depends on ARM || COMPILE_TEST
5755
depends on PINCTRL_MSM
5856
help
@@ -61,7 +59,6 @@ config PINCTRL_IPQ8064
6159

6260
config PINCTRL_IPQ5332
6361
tristate "Qualcomm Technologies Inc IPQ5332 pin controller driver"
64-
depends on OF
6562
depends on ARM64 || COMPILE_TEST
6663
depends on PINCTRL_MSM
6764
help
@@ -71,7 +68,6 @@ config PINCTRL_IPQ5332
7168

7269
config PINCTRL_IPQ8074
7370
tristate "Qualcomm Technologies, Inc. IPQ8074 pin controller driver"
74-
depends on OF
7571
depends on ARM64 || COMPILE_TEST
7672
depends on PINCTRL_MSM
7773
help
@@ -82,7 +78,6 @@ config PINCTRL_IPQ8074
8278

8379
config PINCTRL_IPQ6018
8480
tristate "Qualcomm Technologies, Inc. IPQ6018 pin controller driver"
85-
depends on OF
8681
depends on ARM64 || COMPILE_TEST
8782
depends on PINCTRL_MSM
8883
help
@@ -93,7 +88,6 @@ config PINCTRL_IPQ6018
9388

9489
config PINCTRL_IPQ9574
9590
tristate "Qualcomm Technologies, Inc. IPQ9574 pin controller driver"
96-
depends on OF || COMPILE_TEST
9791
depends on ARM64 || COMPILE_TEST
9892
depends on PINCTRL_MSM
9993
help
@@ -104,7 +98,6 @@ config PINCTRL_IPQ9574
10498

10599
config PINCTRL_MSM8226
106100
tristate "Qualcomm 8226 pin controller driver"
107-
depends on OF
108101
depends on ARM || COMPILE_TEST
109102
depends on PINCTRL_MSM
110103
help
@@ -114,7 +107,6 @@ config PINCTRL_MSM8226
114107

115108
config PINCTRL_MSM8660
116109
tristate "Qualcomm 8660 pin controller driver"
117-
depends on OF
118110
depends on ARM || COMPILE_TEST
119111
depends on PINCTRL_MSM
120112
help
@@ -123,7 +115,6 @@ config PINCTRL_MSM8660
123115

124116
config PINCTRL_MSM8960
125117
tristate "Qualcomm 8960 pin controller driver"
126-
depends on OF
127118
depends on ARM || COMPILE_TEST
128119
depends on PINCTRL_MSM
129120
help
@@ -132,15 +123,13 @@ config PINCTRL_MSM8960
132123

133124
config PINCTRL_MDM9607
134125
tristate "Qualcomm 9607 pin controller driver"
135-
depends on OF
136126
depends on PINCTRL_MSM
137127
help
138128
This is the pinctrl, pinmux, pinconf and gpiolib driver for the
139129
Qualcomm TLMM block found in the Qualcomm 9607 platform.
140130

141131
config PINCTRL_MDM9615
142132
tristate "Qualcomm 9615 pin controller driver"
143-
depends on OF
144133
depends on ARM || COMPILE_TEST
145134
depends on PINCTRL_MSM
146135
help
@@ -149,7 +138,6 @@ config PINCTRL_MDM9615
149138

150139
config PINCTRL_MSM8X74
151140
tristate "Qualcomm 8x74 pin controller driver"
152-
depends on OF
153141
depends on ARM || COMPILE_TEST
154142
depends on PINCTRL_MSM
155143
help
@@ -158,7 +146,6 @@ config PINCTRL_MSM8X74
158146

159147
config PINCTRL_MSM8909
160148
tristate "Qualcomm 8909 pin controller driver"
161-
depends on OF
162149
depends on ARM || COMPILE_TEST
163150
depends on PINCTRL_MSM
164151
help
@@ -167,15 +154,13 @@ config PINCTRL_MSM8909
167154

168155
config PINCTRL_MSM8916
169156
tristate "Qualcomm 8916 pin controller driver"
170-
depends on OF
171157
depends on PINCTRL_MSM
172158
help
173159
This is the pinctrl, pinmux, pinconf and gpiolib driver for the
174160
Qualcomm TLMM block found on the Qualcomm 8916 platform.
175161

176162
config PINCTRL_MSM8953
177163
tristate "Qualcomm 8953 pin controller driver"
178-
depends on OF
179164
depends on ARM64 || COMPILE_TEST
180165
depends on PINCTRL_MSM
181166
help
@@ -186,7 +171,6 @@ config PINCTRL_MSM8953
186171

187172
config PINCTRL_MSM8976
188173
tristate "Qualcomm 8976 pin controller driver"
189-
depends on OF
190174
depends on ARM64 || COMPILE_TEST
191175
depends on PINCTRL_MSM
192176
help
@@ -197,7 +181,6 @@ config PINCTRL_MSM8976
197181

198182
config PINCTRL_MSM8994
199183
tristate "Qualcomm 8994 pin controller driver"
200-
depends on OF
201184
depends on ARM64 || COMPILE_TEST
202185
depends on PINCTRL_MSM
203186
help
@@ -207,7 +190,6 @@ config PINCTRL_MSM8994
207190

208191
config PINCTRL_MSM8996
209192
tristate "Qualcomm MSM8996 pin controller driver"
210-
depends on OF
211193
depends on ARM64 || COMPILE_TEST
212194
depends on PINCTRL_MSM
213195
help
@@ -216,7 +198,6 @@ config PINCTRL_MSM8996
216198

217199
config PINCTRL_MSM8998
218200
tristate "Qualcomm MSM8998 pin controller driver"
219-
depends on OF
220201
depends on ARM64 || COMPILE_TEST
221202
depends on PINCTRL_MSM
222203
help
@@ -225,7 +206,6 @@ config PINCTRL_MSM8998
225206

226207
config PINCTRL_QCM2290
227208
tristate "Qualcomm QCM2290 pin controller driver"
228-
depends on OF
229209
depends on ARM64 || COMPILE_TEST
230210
depends on PINCTRL_MSM
231211
help
@@ -234,7 +214,6 @@ config PINCTRL_QCM2290
234214

235215
config PINCTRL_QCS404
236216
tristate "Qualcomm QCS404 pin controller driver"
237-
depends on OF
238217
depends on ARM64 || COMPILE_TEST
239218
depends on PINCTRL_MSM
240219
help
@@ -282,7 +261,6 @@ config PINCTRL_QCOM_SSBI_PMIC
282261

283262
config PINCTRL_QDU1000
284263
tristate "Qualcomm Technologies Inc QDU1000/QRU1000 pin controller driver"
285-
depends on OF
286264
depends on ARM64 || COMPILE_TEST
287265
depends on PINCTRL_MSM
288266
help
@@ -292,7 +270,6 @@ config PINCTRL_QDU1000
292270

293271
config PINCTRL_SA8775P
294272
tristate "Qualcomm Technologies Inc SA8775P pin controller driver"
295-
depends on OF
296273
depends on ARM64 || COMPILE_TEST
297274
depends on PINCTRL_MSM
298275
help
@@ -301,7 +278,6 @@ config PINCTRL_SA8775P
301278

302279
config PINCTRL_SC7180
303280
tristate "Qualcomm Technologies Inc SC7180 pin controller driver"
304-
depends on OF
305281
depends on ARM64 || COMPILE_TEST
306282
depends on PINCTRL_MSM
307283
help
@@ -311,7 +287,6 @@ config PINCTRL_SC7180
311287

312288
config PINCTRL_SC7280
313289
tristate "Qualcomm Technologies Inc SC7280 pin controller driver"
314-
depends on OF
315290
depends on ARM64 || COMPILE_TEST
316291
depends on PINCTRL_MSM
317292
help
@@ -340,7 +315,6 @@ config PINCTRL_SC8180X
340315

341316
config PINCTRL_SC8280XP
342317
tristate "Qualcomm Technologies Inc SC8280xp pin controller driver"
343-
depends on OF
344318
depends on ARM64 || COMPILE_TEST
345319
depends on PINCTRL_MSM
346320
help
@@ -350,7 +324,6 @@ config PINCTRL_SC8280XP
350324

351325
config PINCTRL_SDM660
352326
tristate "Qualcomm Technologies Inc SDM660 pin controller driver"
353-
depends on OF
354327
depends on ARM64 || COMPILE_TEST
355328
depends on PINCTRL_MSM
356329
help
@@ -360,7 +333,6 @@ config PINCTRL_SDM660
360333

361334
config PINCTRL_SDM670
362335
tristate "Qualcomm Technologies Inc SDM670 pin controller driver"
363-
depends on OF
364336
depends on ARM64 || COMPILE_TEST
365337
depends on PINCTRL_MSM
366338
help
@@ -380,7 +352,6 @@ config PINCTRL_SDM845
380352

381353
config PINCTRL_SDX55
382354
tristate "Qualcomm Technologies Inc SDX55 pin controller driver"
383-
depends on OF
384355
depends on ARM || COMPILE_TEST
385356
depends on PINCTRL_MSM
386357
help
@@ -390,7 +361,6 @@ config PINCTRL_SDX55
390361

391362
config PINCTRL_SDX65
392363
tristate "Qualcomm Technologies Inc SDX65 pin controller driver"
393-
depends on OF
394364
depends on ARM || COMPILE_TEST
395365
depends on PINCTRL_MSM
396366
help
@@ -400,7 +370,6 @@ config PINCTRL_SDX65
400370

401371
config PINCTRL_SDX75
402372
tristate "Qualcomm Technologies Inc SDX75 pin controller driver"
403-
depends on OF
404373
depends on ARM64 || COMPILE_TEST
405374
depends on PINCTRL_MSM
406375
help
@@ -410,7 +379,6 @@ config PINCTRL_SDX75
410379

411380
config PINCTRL_SM6115
412381
tristate "Qualcomm Technologies Inc SM6115,SM4250 pin controller driver"
413-
depends on OF
414382
depends on ARM64 || COMPILE_TEST
415383
depends on PINCTRL_MSM
416384
help
@@ -420,7 +388,6 @@ config PINCTRL_SM6115
420388

421389
config PINCTRL_SM6125
422390
tristate "Qualcomm Technologies Inc SM6125 pin controller driver"
423-
depends on OF
424391
depends on ARM64 || COMPILE_TEST
425392
depends on PINCTRL_MSM
426393
help
@@ -430,7 +397,6 @@ config PINCTRL_SM6125
430397

431398
config PINCTRL_SM6350
432399
tristate "Qualcomm Technologies Inc SM6350 pin controller driver"
433-
depends on OF
434400
depends on ARM64 || COMPILE_TEST
435401
depends on PINCTRL_MSM
436402
help
@@ -440,7 +406,6 @@ config PINCTRL_SM6350
440406

441407
config PINCTRL_SM6375
442408
tristate "Qualcomm Technologies Inc SM6375 pin controller driver"
443-
depends on OF
444409
depends on ARM64 || COMPILE_TEST
445410
depends on PINCTRL_MSM
446411
help
@@ -450,7 +415,6 @@ config PINCTRL_SM6375
450415

451416
config PINCTRL_SM7150
452417
tristate "Qualcomm Technologies Inc SM7150 pin controller driver"
453-
depends on OF
454418
depends on ARM64 || COMPILE_TEST
455419
depends on PINCTRL_MSM
456420
help
@@ -460,7 +424,6 @@ config PINCTRL_SM7150
460424

461425
config PINCTRL_SM8150
462426
tristate "Qualcomm Technologies Inc SM8150 pin controller driver"
463-
depends on OF
464427
depends on ARM64 || COMPILE_TEST
465428
depends on PINCTRL_MSM
466429
help
@@ -470,7 +433,6 @@ config PINCTRL_SM8150
470433

471434
config PINCTRL_SM8250
472435
tristate "Qualcomm Technologies Inc SM8250 pin controller driver"
473-
depends on OF
474436
depends on ARM64 || COMPILE_TEST
475437
depends on PINCTRL_MSM
476438
help
@@ -498,7 +460,6 @@ config PINCTRL_SM8350
498460

499461
config PINCTRL_SM8450
500462
tristate "Qualcomm Technologies Inc SM8450 pin controller driver"
501-
depends on OF
502463
depends on ARM64 || COMPILE_TEST
503464
depends on PINCTRL_MSM
504465
help

0 commit comments

Comments
 (0)