From 811d9e2268a62b830cfe93cd8bc929afcb8b198b Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 15 Jul 2017 21:12:38 +0200 Subject: kernel: move regmap bloat out of the kernel image if it is only being used in modules lede-commit: 96f39119815028073583e4fca3a9c5fe9141e998 Signed-off-by: Felix Fietkau --- drivers/base/regmap/Kconfig | 15 ++++++++++----- drivers/base/regmap/Makefile | 12 ++++++++---- drivers/base/regmap/regmap.c | 3 +++ include/linux/regmap.h | 2 +- 4 files changed, 22 insertions(+), 10 deletions(-) --- a/drivers/base/regmap/Kconfig +++ b/drivers/base/regmap/Kconfig @@ -4,9 +4,8 @@ # subsystems should select the appropriate symbols. config REGMAP - default y if (REGMAP_I2C || REGMAP_SPI || REGMAP_SPMI || REGMAP_W1 || REGMAP_AC97 || REGMAP_MMIO || REGMAP_IRQ || REGMAP_SOUNDWIRE || REGMAP_SCCB || REGMAP_I3C || REGMAP_SPI_AVMM) select IRQ_DOMAIN if REGMAP_IRQ - bool + tristate config REGCACHE_COMPRESSED select LZO_COMPRESS @@ -14,46 +13,59 @@ config REGCACHE_COMPRESSED bool config REGMAP_AC97 + select REGMAP tristate config REGMAP_I2C tristate + select REGMAP depends on I2C config REGMAP_SLIMBUS tristate + select REGMAP depends on SLIMBUS config REGMAP_SPI tristate + select REGMAP + depends on SPI_MASTER depends on SPI config REGMAP_SPMI tristate + select REGMAP depends on SPMI config REGMAP_W1 tristate + select REGMAP depends on W1 config REGMAP_MMIO tristate + select REGMAP config REGMAP_IRQ bool + select REGMAP config REGMAP_SOUNDWIRE tristate + select REGMAP depends on SOUNDWIRE config REGMAP_SCCB tristate + select REGMAP depends on I2C config REGMAP_I3C tristate + select REGMAP depends on I3C config REGMAP_SPI_AVMM tristate + select REGMAP depends on SPI --- a/drivers/base/regmap/Makefile +++ b/drivers/base/regmap/Makefile @@ -2,10 +2,14 @@ # For include/trace/define_trace.h to include trace.h CFLAGS_regmap.o := -I$(src) -obj-$(CONFIG_REGMAP) += regmap.o regcache.o -obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-flat.o -obj-$(CONFIG_REGCACHE_COMPRESSED) += regcache-lzo.o -obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o +regmap-core-objs = regmap.o regcache.o regcache-rbtree.o regcache-flat.o +ifdef CONFIG_DEBUG_FS +regmap-core-objs += regmap-debugfs.o +endif +ifdef CONFIG_REGCACHE_COMPRESSED +regmap-core-objs += regcache-lzo.o +endif +obj-$(CONFIG_REGMAP) += regmap-core.o obj-$(CONFIG_REGMAP_AC97) += regmap-ac97.o obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o obj-$(CONFIG_REGMAP_SLIMBUS) += regmap-slimbus.o --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -3298,3 +3299,5 @@ static int __init regmap_initcall(void) return 0; } postcore_initcall(regmap_initcall); + +MODULE_LICENSE("GPL"); --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -179,7 +179,7 @@ struct reg_sequence { __ret ?: __tmp; \ }) -#ifdef CONFIG_REGMAP +#if IS_REACHABLE(CONFIG_REGMAP) enum regmap_endian { /* Unspecified -> 0 -> Backwards compatible default */ plain/scripts/cleanpatch?id=5359a8ca382f473e2f671f6ed6f22e9d811c80cf'>plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259