Commit fe46e55
committed
Merge tag 'imx-defconfig-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/defconfig
i.MX defconfig updates for 6.4:
- Enable i.MX93 ADC driver in arm64 defconfig.
- Enable BD71815 PMIC and TDA998X HDMI bridge driver in
imx_v6_v7_defconfig.
- Enable a few drivers support needed by Tarragon boards in
imx_v6_v7_defconfig.
- Build IMX_SDMA driver as module in imx_v4_v5_defconfig.
* tag 'imx-defconfig-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx_v4_v5_defconfig: Build CONFIG_IMX_SDMA as module
ARM: imx_v6_v7_defconfig: Enable Tarragon peripheral drivers
ARM: imx_v6_v7_defconfig: Select CONFIG_DRM_I2C_NXP_TDA998X
arm64: defconfig: Enable i.MX93 ADC support
ARM: imx_v6_v7_defconfig: Enable rohm,bd71815
Link: https://lore.kernel.org/r/20230408101928.280271-6-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>3 files changed
Lines changed: 14 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
160 | 160 | | |
161 | 161 | | |
162 | 162 | | |
163 | | - | |
| 163 | + | |
164 | 164 | | |
165 | 165 | | |
166 | 166 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
128 | 128 | | |
129 | 129 | | |
130 | 130 | | |
| 131 | + | |
131 | 132 | | |
132 | 133 | | |
133 | 134 | | |
| |||
213 | 214 | | |
214 | 215 | | |
215 | 216 | | |
| 217 | + | |
216 | 218 | | |
217 | 219 | | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
218 | 223 | | |
219 | 224 | | |
220 | 225 | | |
| |||
223 | 228 | | |
224 | 229 | | |
225 | 230 | | |
| 231 | + | |
226 | 232 | | |
227 | 233 | | |
228 | 234 | | |
| |||
242 | 248 | | |
243 | 249 | | |
244 | 250 | | |
| 251 | + | |
245 | 252 | | |
246 | 253 | | |
| 254 | + | |
247 | 255 | | |
248 | 256 | | |
249 | 257 | | |
| |||
271 | 279 | | |
272 | 280 | | |
273 | 281 | | |
| 282 | + | |
274 | 283 | | |
275 | 284 | | |
276 | 285 | | |
| |||
380 | 389 | | |
381 | 390 | | |
382 | 391 | | |
| 392 | + | |
383 | 393 | | |
384 | 394 | | |
385 | 395 | | |
| |||
396 | 406 | | |
397 | 407 | | |
398 | 408 | | |
| 409 | + | |
399 | 410 | | |
400 | 411 | | |
401 | 412 | | |
402 | 413 | | |
403 | 414 | | |
404 | 415 | | |
405 | 416 | | |
| 417 | + | |
406 | 418 | | |
407 | 419 | | |
408 | 420 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1284 | 1284 | | |
1285 | 1285 | | |
1286 | 1286 | | |
| 1287 | + | |
1287 | 1288 | | |
1288 | 1289 | | |
1289 | 1290 | | |
| |||
0 commit comments