projects / openwrt / staging / lynxis.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
sunxi: Backport patches needed for A64
[openwrt/staging/lynxis.git] / target / linux / sunxi / patches-4.9 / 0035-pinctrl-sunxi-make-bool-drivers-explicitly-non-modul.patch
1 From 0c8c6ba00cbf2c0a6164aa41d43d017d65caf321 Mon Sep 17 00:00:00 2001
2 From: Paul Gortmaker <paul.gortmaker@windriver.com>
3 Date: Sat, 29 Oct 2016 20:00:30 -0400
4 Subject: pinctrl: sunxi: make bool drivers explicitly non-modular
5
6 None of the Kconfigs for any of these drivers are tristate,
7 meaning that they currently are not being built as a module by anyone.
8
9 Lets remove the modular code that is essentially orphaned, so that
10 when reading the drivers there is no doubt they are builtin-only. All
11 drivers get essentially the same change, so they are handled in batch.
12
13 Changes are (1) use builtin_platform_driver, (2) use init.h header
14 (3) delete module_exit related code, (4) delete MODULE_DEVICE_TABLE,
15 and (5) delete MODULE_LICENCE/MODULE_AUTHOR and associated tags.
16
17 Since module_platform_driver() uses the same init level priority as
18 builtin_platform_driver() the init ordering remains unchanged with
19 this commit.
20
21 Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code.
22
23 We do delete the MODULE_LICENSE etc. tags since all that information
24 is already contained at the top of each file in the comments.
25
26 Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
27 Cc: Chen-Yu Tsai <wens@csie.org>
28 Cc: Hans de Goede <hdegoede@redhat.com>
29 Cc: Linus Walleij <linus.walleij@linaro.org>
30 Cc: Patrice Chotard <patrice.chotard@st.com>
31 Cc: Hongzhou Yang <hongzhou.yang@mediatek.com>
32 Cc: Fabian Frederick <fabf@skynet.be>
33 Cc: Maxime Coquelin <maxime.coquelin@st.com>
34 Cc: Vishnu Patekar <vishnupatekar0510@gmail.com>
35 Cc: Mylene Josserand <mylene.josserand@free-electrons.com>
36 Cc: linux-gpio@vger.kernel.org
37 Cc: linux-arm-kernel@lists.infradead.org
38 Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
39 Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
40 Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
41 ---
42 drivers/pinctrl/sunxi/pinctrl-gr8.c | 9 ++-------
43 drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 9 ++-------
44 drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c | 9 ++-------
45 drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c | 9 ++-------
46 drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 10 ++--------
47 drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 9 ++-------
48 drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c | 9 ++-------
49 drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c | 9 ++-------
50 drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 11 ++---------
51 drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c | 10 ++--------
52 drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c | 9 ++-------
53 drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c | 9 ++-------
54 drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c | 9 ++-------
55 13 files changed, 26 insertions(+), 95 deletions(-)
56
57 --- a/drivers/pinctrl/sunxi/pinctrl-gr8.c
58 +++ b/drivers/pinctrl/sunxi/pinctrl-gr8.c
59 @@ -12,7 +12,7 @@
60 * warranty of any kind, whether express or implied.
61 */
62
63 -#include <linux/module.h>
64 +#include <linux/init.h>
65 #include <linux/platform_device.h>
66 #include <linux/of.h>
67 #include <linux/of_device.h>
68 @@ -525,7 +525,6 @@ static const struct of_device_id sun5i_g
69 { .compatible = "nextthing,gr8-pinctrl", },
70 {}
71 };
72 -MODULE_DEVICE_TABLE(of, sun5i_gr8_pinctrl_match);
73
74 static struct platform_driver sun5i_gr8_pinctrl_driver = {
75 .probe = sun5i_gr8_pinctrl_probe,
76 @@ -534,8 +533,4 @@ static struct platform_driver sun5i_gr8_
77 .of_match_table = sun5i_gr8_pinctrl_match,
78 },
79 };
80 -module_platform_driver(sun5i_gr8_pinctrl_driver);
81 -
82 -MODULE_AUTHOR("Mylene Josserand <mylene.josserand@free-electrons.com");
83 -MODULE_DESCRIPTION("NextThing GR8 pinctrl driver");
84 -MODULE_LICENSE("GPL");
85 +builtin_platform_driver(sun5i_gr8_pinctrl_driver);
86 --- a/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
87 +++ b/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
88 @@ -10,7 +10,7 @@
89 * warranty of any kind, whether express or implied.
90 */
91
92 -#include <linux/module.h>
93 +#include <linux/init.h>
94 #include <linux/platform_device.h>
95 #include <linux/of.h>
96 #include <linux/of_device.h>
97 @@ -1036,7 +1036,6 @@ static const struct of_device_id sun4i_a
98 { .compatible = "allwinner,sun4i-a10-pinctrl", },
99 {}
100 };
101 -MODULE_DEVICE_TABLE(of, sun4i_a10_pinctrl_match);
102
103 static struct platform_driver sun4i_a10_pinctrl_driver = {
104 .probe = sun4i_a10_pinctrl_probe,
105 @@ -1045,8 +1044,4 @@ static struct platform_driver sun4i_a10_
106 .of_match_table = sun4i_a10_pinctrl_match,
107 },
108 };
109 -module_platform_driver(sun4i_a10_pinctrl_driver);
110 -
111 -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
112 -MODULE_DESCRIPTION("Allwinner A10 pinctrl driver");
113 -MODULE_LICENSE("GPL");
114 +builtin_platform_driver(sun4i_a10_pinctrl_driver);
115 --- a/drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c
116 +++ b/drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c
117 @@ -10,7 +10,7 @@
118 * warranty of any kind, whether express or implied.
119 */
120
121 -#include <linux/module.h>
122 +#include <linux/init.h>
123 #include <linux/platform_device.h>
124 #include <linux/of.h>
125 #include <linux/of_device.h>
126 @@ -674,7 +674,6 @@ static const struct of_device_id sun5i_a
127 { .compatible = "allwinner,sun5i-a10s-pinctrl", },
128 {}
129 };
130 -MODULE_DEVICE_TABLE(of, sun5i_a10s_pinctrl_match);
131
132 static struct platform_driver sun5i_a10s_pinctrl_driver = {
133 .probe = sun5i_a10s_pinctrl_probe,
134 @@ -683,8 +682,4 @@ static struct platform_driver sun5i_a10s
135 .of_match_table = sun5i_a10s_pinctrl_match,
136 },
137 };
138 -module_platform_driver(sun5i_a10s_pinctrl_driver);
139 -
140 -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
141 -MODULE_DESCRIPTION("Allwinner A10s pinctrl driver");
142 -MODULE_LICENSE("GPL");
143 +builtin_platform_driver(sun5i_a10s_pinctrl_driver);
144 --- a/drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
145 +++ b/drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
146 @@ -10,7 +10,7 @@
147 * warranty of any kind, whether express or implied.
148 */
149
150 -#include <linux/module.h>
151 +#include <linux/init.h>
152 #include <linux/platform_device.h>
153 #include <linux/of.h>
154 #include <linux/of_device.h>
155 @@ -392,7 +392,6 @@ static const struct of_device_id sun5i_a
156 { .compatible = "allwinner,sun5i-a13-pinctrl", },
157 {}
158 };
159 -MODULE_DEVICE_TABLE(of, sun5i_a13_pinctrl_match);
160
161 static struct platform_driver sun5i_a13_pinctrl_driver = {
162 .probe = sun5i_a13_pinctrl_probe,
163 @@ -401,8 +400,4 @@ static struct platform_driver sun5i_a13_
164 .of_match_table = sun5i_a13_pinctrl_match,
165 },
166 };
167 -module_platform_driver(sun5i_a13_pinctrl_driver);
168 -
169 -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
170 -MODULE_DESCRIPTION("Allwinner A13 pinctrl driver");
171 -MODULE_LICENSE("GPL");
172 +builtin_platform_driver(sun5i_a13_pinctrl_driver);
173 --- a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c
174 +++ b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c
175 @@ -12,7 +12,7 @@
176 * warranty of any kind, whether express or implied.
177 */
178
179 -#include <linux/module.h>
180 +#include <linux/init.h>
181 #include <linux/platform_device.h>
182 #include <linux/of.h>
183 #include <linux/of_device.h>
184 @@ -136,7 +136,6 @@ static const struct of_device_id sun6i_a
185 { .compatible = "allwinner,sun6i-a31-r-pinctrl", },
186 {}
187 };
188 -MODULE_DEVICE_TABLE(of, sun6i_a31_r_pinctrl_match);
189
190 static struct platform_driver sun6i_a31_r_pinctrl_driver = {
191 .probe = sun6i_a31_r_pinctrl_probe,
192 @@ -145,9 +144,4 @@ static struct platform_driver sun6i_a31_
193 .of_match_table = sun6i_a31_r_pinctrl_match,
194 },
195 };
196 -module_platform_driver(sun6i_a31_r_pinctrl_driver);
197 -
198 -MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com");
199 -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
200 -MODULE_DESCRIPTION("Allwinner A31 R_PIO pinctrl driver");
201 -MODULE_LICENSE("GPL");
202 +builtin_platform_driver(sun6i_a31_r_pinctrl_driver);
203 --- a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c
204 +++ b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c
205 @@ -10,7 +10,7 @@
206 * warranty of any kind, whether express or implied.
207 */
208
209 -#include <linux/module.h>
210 +#include <linux/init.h>
211 #include <linux/platform_device.h>
212 #include <linux/of.h>
213 #include <linux/of_device.h>
214 @@ -934,7 +934,6 @@ static const struct of_device_id sun6i_a
215 { .compatible = "allwinner,sun6i-a31-pinctrl", },
216 {}
217 };
218 -MODULE_DEVICE_TABLE(of, sun6i_a31_pinctrl_match);
219
220 static struct platform_driver sun6i_a31_pinctrl_driver = {
221 .probe = sun6i_a31_pinctrl_probe,
222 @@ -943,8 +942,4 @@ static struct platform_driver sun6i_a31_
223 .of_match_table = sun6i_a31_pinctrl_match,
224 },
225 };
226 -module_platform_driver(sun6i_a31_pinctrl_driver);
227 -
228 -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
229 -MODULE_DESCRIPTION("Allwinner A31 pinctrl driver");
230 -MODULE_LICENSE("GPL");
231 +builtin_platform_driver(sun6i_a31_pinctrl_driver);
232 --- a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c
233 +++ b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c
234 @@ -11,7 +11,7 @@
235 * warranty of any kind, whether express or implied.
236 */
237
238 -#include <linux/module.h>
239 +#include <linux/init.h>
240 #include <linux/platform_device.h>
241 #include <linux/of.h>
242 #include <linux/of_device.h>
243 @@ -798,7 +798,6 @@ static const struct of_device_id sun6i_a
244 { .compatible = "allwinner,sun6i-a31s-pinctrl", },
245 {}
246 };
247 -MODULE_DEVICE_TABLE(of, sun6i_a31s_pinctrl_match);
248
249 static struct platform_driver sun6i_a31s_pinctrl_driver = {
250 .probe = sun6i_a31s_pinctrl_probe,
251 @@ -807,8 +806,4 @@ static struct platform_driver sun6i_a31s
252 .of_match_table = sun6i_a31s_pinctrl_match,
253 },
254 };
255 -module_platform_driver(sun6i_a31s_pinctrl_driver);
256 -
257 -MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
258 -MODULE_DESCRIPTION("Allwinner A31s pinctrl driver");
259 -MODULE_LICENSE("GPL");
260 +builtin_platform_driver(sun6i_a31s_pinctrl_driver);
261 --- a/drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c
262 +++ b/drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c
263 @@ -10,7 +10,7 @@
264 * warranty of any kind, whether express or implied.
265 */
266
267 -#include <linux/module.h>
268 +#include <linux/init.h>
269 #include <linux/platform_device.h>
270 #include <linux/of.h>
271 #include <linux/of_device.h>
272 @@ -1045,7 +1045,6 @@ static const struct of_device_id sun7i_a
273 { .compatible = "allwinner,sun7i-a20-pinctrl", },
274 {}
275 };
276 -MODULE_DEVICE_TABLE(of, sun7i_a20_pinctrl_match);
277
278 static struct platform_driver sun7i_a20_pinctrl_driver = {
279 .probe = sun7i_a20_pinctrl_probe,
280 @@ -1054,8 +1053,4 @@ static struct platform_driver sun7i_a20_
281 .of_match_table = sun7i_a20_pinctrl_match,
282 },
283 };
284 -module_platform_driver(sun7i_a20_pinctrl_driver);
285 -
286 -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
287 -MODULE_DESCRIPTION("Allwinner A20 pinctrl driver");
288 -MODULE_LICENSE("GPL");
289 +builtin_platform_driver(sun7i_a20_pinctrl_driver);
290 --- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
291 +++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
292 @@ -15,7 +15,7 @@
293 * warranty of any kind, whether express or implied.
294 */
295
296 -#include <linux/module.h>
297 +#include <linux/init.h>
298 #include <linux/platform_device.h>
299 #include <linux/of.h>
300 #include <linux/of_device.h>
301 @@ -123,7 +123,6 @@ static const struct of_device_id sun8i_a
302 { .compatible = "allwinner,sun8i-a23-r-pinctrl", },
303 {}
304 };
305 -MODULE_DEVICE_TABLE(of, sun8i_a23_r_pinctrl_match);
306
307 static struct platform_driver sun8i_a23_r_pinctrl_driver = {
308 .probe = sun8i_a23_r_pinctrl_probe,
309 @@ -132,10 +131,4 @@ static struct platform_driver sun8i_a23_
310 .of_match_table = sun8i_a23_r_pinctrl_match,
311 },
312 };
313 -module_platform_driver(sun8i_a23_r_pinctrl_driver);
314 -
315 -MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
316 -MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com");
317 -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
318 -MODULE_DESCRIPTION("Allwinner A23 R_PIO pinctrl driver");
319 -MODULE_LICENSE("GPL");
320 +builtin_platform_driver(sun8i_a23_r_pinctrl_driver);
321 --- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c
322 +++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c
323 @@ -14,7 +14,7 @@
324 * warranty of any kind, whether express or implied.
325 */
326
327 -#include <linux/module.h>
328 +#include <linux/init.h>
329 #include <linux/platform_device.h>
330 #include <linux/of.h>
331 #include <linux/of_device.h>
332 @@ -575,7 +575,6 @@ static const struct of_device_id sun8i_a
333 { .compatible = "allwinner,sun8i-a23-pinctrl", },
334 {}
335 };
336 -MODULE_DEVICE_TABLE(of, sun8i_a23_pinctrl_match);
337
338 static struct platform_driver sun8i_a23_pinctrl_driver = {
339 .probe = sun8i_a23_pinctrl_probe,
340 @@ -584,9 +583,4 @@ static struct platform_driver sun8i_a23_
341 .of_match_table = sun8i_a23_pinctrl_match,
342 },
343 };
344 -module_platform_driver(sun8i_a23_pinctrl_driver);
345 -
346 -MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
347 -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
348 -MODULE_DESCRIPTION("Allwinner A23 pinctrl driver");
349 -MODULE_LICENSE("GPL");
350 +builtin_platform_driver(sun8i_a23_pinctrl_driver);
351 --- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c
352 +++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c
353 @@ -12,7 +12,7 @@
354 * warranty of any kind, whether express or implied.
355 */
356
357 -#include <linux/module.h>
358 +#include <linux/init.h>
359 #include <linux/platform_device.h>
360 #include <linux/of.h>
361 #include <linux/of_device.h>
362 @@ -498,7 +498,6 @@ static const struct of_device_id sun8i_a
363 { .compatible = "allwinner,sun8i-a33-pinctrl", },
364 {}
365 };
366 -MODULE_DEVICE_TABLE(of, sun8i_a33_pinctrl_match);
367
368 static struct platform_driver sun8i_a33_pinctrl_driver = {
369 .probe = sun8i_a33_pinctrl_probe,
370 @@ -507,8 +506,4 @@ static struct platform_driver sun8i_a33_
371 .of_match_table = sun8i_a33_pinctrl_match,
372 },
373 };
374 -module_platform_driver(sun8i_a33_pinctrl_driver);
375 -
376 -MODULE_AUTHOR("Vishnu Patekar <vishnupatekar0510@gmail.com>");
377 -MODULE_DESCRIPTION("Allwinner a33 pinctrl driver");
378 -MODULE_LICENSE("GPL");
379 +builtin_platform_driver(sun8i_a33_pinctrl_driver);
380 --- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c
381 +++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c
382 @@ -12,7 +12,7 @@
383 * warranty of any kind, whether express or implied.
384 */
385
386 -#include <linux/module.h>
387 +#include <linux/init.h>
388 #include <linux/platform_device.h>
389 #include <linux/of.h>
390 #include <linux/of_device.h>
391 @@ -587,7 +587,6 @@ static const struct of_device_id sun8i_a
392 { .compatible = "allwinner,sun8i-a83t-pinctrl", },
393 {}
394 };
395 -MODULE_DEVICE_TABLE(of, sun8i_a83t_pinctrl_match);
396
397 static struct platform_driver sun8i_a83t_pinctrl_driver = {
398 .probe = sun8i_a83t_pinctrl_probe,
399 @@ -596,8 +595,4 @@ static struct platform_driver sun8i_a83t
400 .of_match_table = sun8i_a83t_pinctrl_match,
401 },
402 };
403 -module_platform_driver(sun8i_a83t_pinctrl_driver);
404 -
405 -MODULE_AUTHOR("Vishnu Patekar <vishnupatekar0510@gmail.com>");
406 -MODULE_DESCRIPTION("Allwinner a83t pinctrl driver");
407 -MODULE_LICENSE("GPL");
408 +builtin_platform_driver(sun8i_a83t_pinctrl_driver);
409 --- a/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c
410 +++ b/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c
411 @@ -10,7 +10,7 @@
412 * warranty of any kind, whether express or implied.
413 */
414
415 -#include <linux/module.h>
416 +#include <linux/init.h>
417 #include <linux/platform_device.h>
418 #include <linux/of.h>
419 #include <linux/of_device.h>
420 @@ -733,7 +733,6 @@ static const struct of_device_id sun9i_a
421 { .compatible = "allwinner,sun9i-a80-pinctrl", },
422 {}
423 };
424 -MODULE_DEVICE_TABLE(of, sun9i_a80_pinctrl_match);
425
426 static struct platform_driver sun9i_a80_pinctrl_driver = {
427 .probe = sun9i_a80_pinctrl_probe,
428 @@ -742,8 +741,4 @@ static struct platform_driver sun9i_a80_
429 .of_match_table = sun9i_a80_pinctrl_match,
430 },
431 };
432 -module_platform_driver(sun9i_a80_pinctrl_driver);
433 -
434 -MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>");
435 -MODULE_DESCRIPTION("Allwinner A80 pinctrl driver");
436 -MODULE_LICENSE("GPL");
437 +builtin_platform_driver(sun9i_a80_pinctrl_driver);
lynxis staging tree