Skip to content

Commit 4c10d22

Browse files
committed
Merge tag 'soc-defconfig-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC defconfig updates from Arnd Bergmann: "As usual, more drivers get enabled in the defconfigs, to support newly added hardware drivers. There is one change for Tegra that modifies the Kconfig file at the same time, and the NXP arm32 defconfigs get a refresh" * tag 'soc-defconfig-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (25 commits) arm: multi_v7_defconfig: Enable TPS65219 regulator arm: omap2plus_defconfig: Enable TPS65219 regulator arm64: defconfig: Enable Tegra241 and Tegra264 riscv: defconfig: spacemit: enable sdhci driver for K1 SoC riscv: defconfig: Enable PWM support for SpacemiT K1 SoC riscv: defconfig: Remove CONFIG_SND_SOC_STARFIVE=m arm64: defconfig: Enable Tegra HSP and BPMP ARM: imx_v6_v7_defconfig: select CONFIG_USB_HSIC_USB3503 ARM: imx_v6_v7_defconfig: select CONFIG_INPUT_PWM_BEEPER ARM: imx_v6_v7_defconfig: cleanup with savedefconfig ARM: mxs_defconfig: select new drivers used by imx28-amarula-rmm ARM: mxs_defconfig: Cleanup mxs_defconfig arm64: defconfig: enable further Rockchip platform drivers arm64: defconfig: enable Samsung PMIC over ACPM arm64: defconfig: enable Maxim max77759 driver ARM: configs: sama5_defconfig: Select CONFIG_WILC1000_SDIO ARM: shmobile: defconfig: Refresh for v6.16-rc2 arm64: defconfig: Enable RZ/V2H(P) USB2 PHY controller reset driver arm64: defconfig: add S32G RTC module support arm64: defconfig: Drop unneeded unselectable sound drivers ...
2 parents 4df9c0a + 5cfe03e commit 4c10d22

File tree

9 files changed

+44
-49
lines changed

9 files changed

+44
-49
lines changed

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ CONFIG_RELAY=y
1212
CONFIG_BLK_DEV_INITRD=y
1313
CONFIG_EXPERT=y
1414
CONFIG_PERF_EVENTS=y
15+
CONFIG_KEXEC=y
1516
CONFIG_ARCH_MULTI_V6=y
1617
CONFIG_ARCH_MXC=y
1718
CONFIG_SOC_IMX31=y
@@ -32,7 +33,6 @@ CONFIG_ARM_PSCI=y
3233
CONFIG_HIGHMEM=y
3334
CONFIG_ARCH_FORCE_MAX_ORDER=13
3435
CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
35-
CONFIG_KEXEC=y
3636
CONFIG_CPU_FREQ=y
3737
CONFIG_CPU_FREQ_STAT=y
3838
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
@@ -68,6 +68,7 @@ CONFIG_BT=y
6868
CONFIG_BT_BNEP=m
6969
CONFIG_BT_HCIUART=y
7070
CONFIG_BT_HCIUART_LL=y
71+
CONFIG_BT_HCIUART_BCM=y
7172
CONFIG_BT_NXPUART=m
7273
CONFIG_CFG80211=y
7374
CONFIG_CFG80211_WEXT=y
@@ -129,7 +130,6 @@ CONFIG_CS89x0_PLATFORM=y
129130
CONFIG_QCA7000_SPI=m
130131
# CONFIG_NET_VENDOR_SEEQ is not set
131132
CONFIG_SMC91X=y
132-
CONFIG_SMC911X=y
133133
CONFIG_SMSC911X=y
134134
# CONFIG_NET_VENDOR_STMICRO is not set
135135
CONFIG_MICREL_PHY=y
@@ -153,9 +153,7 @@ CONFIG_MWIFIEX_PCIE=m
153153
CONFIG_WL12XX=m
154154
CONFIG_WL18XX=m
155155
CONFIG_WLCORE_SDIO=m
156-
# CONFIG_WILINK_PLATFORM_DATA is not set
157156
CONFIG_INPUT_EVDEV=y
158-
CONFIG_INPUT_EVBUG=m
159157
CONFIG_KEYBOARD_GPIO=y
160158
CONFIG_KEYBOARD_SNVS_PWRKEY=y
161159
CONFIG_KEYBOARD_IMX=y
@@ -183,16 +181,15 @@ CONFIG_TOUCHSCREEN_COLIBRI_VF50=y
183181
CONFIG_INPUT_MISC=y
184182
CONFIG_INPUT_MMA8450=y
185183
CONFIG_INPUT_GPIO_BEEPER=m
184+
CONFIG_INPUT_PWM_BEEPER=y
186185
CONFIG_SERIO_SERPORT=m
187186
# CONFIG_LEGACY_PTYS is not set
188187
CONFIG_SERIAL_IMX=y
189188
CONFIG_SERIAL_IMX_CONSOLE=y
190189
CONFIG_SERIAL_FSL_LPUART=y
191190
CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
192191
CONFIG_SERIAL_DEV_BUS=y
193-
# CONFIG_I2C_COMPAT is not set
194192
CONFIG_I2C_CHARDEV=y
195-
CONFIG_I2C_MUX=y
196193
CONFIG_I2C_MUX_GPIO=y
197194
# CONFIG_I2C_HELPER_AUTO is not set
198195
CONFIG_I2C_ALGOPCF=m
@@ -204,14 +201,9 @@ CONFIG_SPI_FSL_QUADSPI=y
204201
CONFIG_SPI_GPIO=y
205202
CONFIG_SPI_IMX=y
206203
CONFIG_SPI_FSL_DSPI=y
207-
CONFIG_PINCTRL_IMX8MM=y
208-
CONFIG_PINCTRL_IMX8MN=y
209-
CONFIG_PINCTRL_IMX8MP=y
210-
CONFIG_PINCTRL_IMX8MQ=y
211204
CONFIG_GPIO_SYSFS=y
212205
CONFIG_GPIO_MXC=y
213206
CONFIG_GPIO_SIOX=m
214-
CONFIG_GPIO_VF610=y
215207
CONFIG_GPIO_MAX732X=y
216208
CONFIG_GPIO_PCA953X=y
217209
CONFIG_GPIO_PCA953X_IRQ=y
@@ -225,7 +217,6 @@ CONFIG_W1_SLAVE_THERM=m
225217
CONFIG_POWER_RESET=y
226218
CONFIG_POWER_RESET_SYSCON=y
227219
CONFIG_POWER_RESET_SYSCON_POWEROFF=y
228-
CONFIG_POWER_SUPPLY=y
229220
CONFIG_RN5T618_POWER=m
230221
CONFIG_SENSORS_MC13783_ADC=y
231222
CONFIG_SENSORS_GPIO_FAN=y
@@ -283,13 +274,13 @@ CONFIG_VIDEO_OV5645=m
283274
CONFIG_VIDEO_ADV7180=m
284275
CONFIG_IMX_IPUV3_CORE=y
285276
CONFIG_DRM=y
286-
CONFIG_DRM_I2C_NXP_TDA998X=y
287277
CONFIG_DRM_MSM=y
288278
CONFIG_DRM_PANEL_LVDS=y
289-
CONFIG_DRM_PANEL_SIMPLE=y
290-
CONFIG_DRM_PANEL_EDP=y
291279
CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
280+
CONFIG_DRM_PANEL_EDP=y
281+
CONFIG_DRM_PANEL_SIMPLE=y
292282
CONFIG_DRM_DISPLAY_CONNECTOR=y
283+
CONFIG_DRM_I2C_NXP_TDA998X=y
293284
CONFIG_DRM_LVDS_CODEC=m
294285
CONFIG_DRM_SII902X=y
295286
CONFIG_DRM_TI_TFP410=y
@@ -310,7 +301,6 @@ CONFIG_LCD_PLATFORM=y
310301
CONFIG_BACKLIGHT_CLASS_DEVICE=y
311302
CONFIG_BACKLIGHT_PWM=y
312303
CONFIG_BACKLIGHT_GPIO=y
313-
CONFIG_FRAMEBUFFER_CONSOLE=y
314304
CONFIG_LOGO=y
315305
CONFIG_SOUND=y
316306
CONFIG_SND=y
@@ -346,6 +336,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
346336
CONFIG_USB_SERIAL_OPTION=m
347337
CONFIG_USB_TEST=m
348338
CONFIG_USB_EHSET_TEST_FIXTURE=m
339+
CONFIG_USB_HSIC_USB3503=y
349340
CONFIG_USB_ONBOARD_DEV=y
350341
CONFIG_NOP_USB_XCEIV=y
351342
CONFIG_USB_MXS_PHY=y
@@ -380,11 +371,8 @@ CONFIG_MMC=y
380371
CONFIG_MMC_SDHCI=y
381372
CONFIG_MMC_SDHCI_PLTFM=y
382373
CONFIG_MMC_SDHCI_ESDHC_IMX=y
383-
CONFIG_NEW_LEDS=y
384-
CONFIG_LEDS_CLASS=y
385374
CONFIG_LEDS_GPIO=y
386375
CONFIG_LEDS_PWM=y
387-
CONFIG_LEDS_TRIGGERS=y
388376
CONFIG_LEDS_TRIGGER_TIMER=y
389377
CONFIG_LEDS_TRIGGER_ONESHOT=y
390378
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
@@ -453,7 +441,6 @@ CONFIG_EXT3_FS_POSIX_ACL=y
453441
CONFIG_EXT3_FS_SECURITY=y
454442
CONFIG_QUOTA=y
455443
CONFIG_QUOTA_NETLINK_INTERFACE=y
456-
# CONFIG_PRINT_QUOTA_WARNING is not set
457444
CONFIG_AUTOFS_FS=y
458445
CONFIG_FUSE_FS=y
459446
CONFIG_ISO9660_FS=m
@@ -490,5 +477,4 @@ CONFIG_PRINTK_TIME=y
490477
CONFIG_MAGIC_SYSRQ=y
491478
CONFIG_DEBUG_FS=y
492479
# CONFIG_SLUB_DEBUG is not set
493-
# CONFIG_SCHED_DEBUG is not set
494480
# CONFIG_FTRACE is not set

arch/arm/configs/multi_v7_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ CONFIG_INPUT_MAX77693_HAPTIC=m
344344
CONFIG_INPUT_MAX8997_HAPTIC=m
345345
CONFIG_INPUT_GPIO_DECODER=m
346346
CONFIG_INPUT_CPCAP_PWRBUTTON=m
347+
CONFIG_INPUT_TPS65219_PWRBUTTON=m
347348
CONFIG_INPUT_AXP20X_PEK=m
348349
CONFIG_INPUT_DA9063_ONKEY=m
349350
CONFIG_INPUT_ADXL34X=m
@@ -618,6 +619,7 @@ CONFIG_MFD_PALMAS=y
618619
CONFIG_MFD_TPS65090=y
619620
CONFIG_MFD_TPS65217=y
620621
CONFIG_MFD_TPS65218=y
622+
CONFIG_MFD_TPS65219=y
621623
CONFIG_MFD_TPS6586X=y
622624
CONFIG_MFD_TPS65910=y
623625
CONFIG_MFD_STM32_LPTIMER=m
@@ -667,6 +669,7 @@ CONFIG_REGULATOR_TPS62360=y
667669
CONFIG_REGULATOR_TPS65090=y
668670
CONFIG_REGULATOR_TPS65217=y
669671
CONFIG_REGULATOR_TPS65218=y
672+
CONFIG_REGULATOR_TPS65219=y
670673
CONFIG_REGULATOR_TPS6586X=y
671674
CONFIG_REGULATOR_TPS65910=y
672675
CONFIG_REGULATOR_TWL4030=y

arch/arm/configs/mxs_defconfig

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ CONFIG_INET=y
3232
CONFIG_IP_PNP=y
3333
CONFIG_IP_PNP_DHCP=y
3434
CONFIG_SYN_COOKIES=y
35-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
36-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
37-
# CONFIG_INET_XFRM_MODE_BEET is not set
3835
# CONFIG_INET_DIAG is not set
3936
# CONFIG_IPV6 is not set
4037
CONFIG_CAN=m
@@ -45,7 +42,6 @@ CONFIG_MTD=y
4542
CONFIG_MTD_CMDLINE_PARTS=y
4643
CONFIG_MTD_BLOCK=y
4744
CONFIG_MTD_DATAFLASH=y
48-
CONFIG_MTD_M25P80=y
4945
CONFIG_MTD_SST25L=y
5046
CONFIG_MTD_RAW_NAND=y
5147
CONFIG_MTD_NAND_GPMI_NAND=y
@@ -60,7 +56,6 @@ CONFIG_ENC28J60=y
6056
CONFIG_ICPLUS_PHY=y
6157
CONFIG_MICREL_PHY=y
6258
CONFIG_REALTEK_PHY=y
63-
CONFIG_SMSC_PHY=y
6459
CONFIG_CAN_FLEXCAN=m
6560
CONFIG_USB_USBNET=y
6661
CONFIG_USB_NET_SMSC95XX=y
@@ -69,21 +64,22 @@ CONFIG_INPUT_EVDEV=y
6964
# CONFIG_INPUT_KEYBOARD is not set
7065
# CONFIG_INPUT_MOUSE is not set
7166
CONFIG_INPUT_TOUCHSCREEN=y
67+
CONFIG_TOUCHSCREEN_EDT_FT5X06=y
7268
CONFIG_TOUCHSCREEN_MXS_LRADC=y
7369
CONFIG_TOUCHSCREEN_TSC2007=m
70+
CONFIG_INPUT_MISC=y
71+
CONFIG_INPUT_PWM_BEEPER=y
7472
# CONFIG_SERIO is not set
7573
# CONFIG_LEGACY_PTYS is not set
7674
CONFIG_SERIAL_AMBA_PL011=y
7775
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
7876
CONFIG_SERIAL_MXS_AUART=y
7977
# CONFIG_HW_RANDOM is not set
80-
# CONFIG_I2C_COMPAT is not set
8178
CONFIG_I2C_CHARDEV=y
8279
CONFIG_I2C_MXS=y
8380
CONFIG_SPI=y
8481
CONFIG_SPI_GPIO=m
8582
CONFIG_SPI_MXS=y
86-
CONFIG_GPIO_SYSFS=y
8783
# CONFIG_HWMON is not set
8884
CONFIG_WATCHDOG=y
8985
CONFIG_STMP3XXX_RTC_WATCHDOG=y
@@ -138,10 +134,6 @@ CONFIG_PWM_MXS=y
138134
CONFIG_NVMEM_MXS_OCOTP=y
139135
CONFIG_EXT4_FS=y
140136
# CONFIG_DNOTIFY is not set
141-
CONFIG_NETFS_SUPPORT=m
142-
CONFIG_FSCACHE=y
143-
CONFIG_FSCACHE_STATS=y
144-
CONFIG_CACHEFILES=m
145137
CONFIG_VFAT_FS=y
146138
CONFIG_TMPFS=y
147139
CONFIG_TMPFS_POSIX_ACL=y

arch/arm/configs/omap2plus_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ CONFIG_TOUCHSCREEN_TSC2007=m
385385
CONFIG_INPUT_MISC=y
386386
CONFIG_INPUT_CPCAP_PWRBUTTON=m
387387
CONFIG_INPUT_TPS65218_PWRBUTTON=m
388+
CONFIG_INPUT_TPS65219_PWRBUTTON=m
388389
CONFIG_INPUT_TWL4030_PWRBUTTON=m
389390
CONFIG_INPUT_UINPUT=m
390391
CONFIG_INPUT_PALMAS_PWRBUTTON=m
@@ -454,6 +455,7 @@ CONFIG_MFD_TPS65217=y
454455
CONFIG_MFD_TI_LP873X=y
455456
CONFIG_MFD_TI_LP87565=y
456457
CONFIG_MFD_TPS65218=y
458+
CONFIG_MFD_TPS65219=y
457459
CONFIG_MFD_TPS65910=y
458460
CONFIG_TWL6040_CORE=y
459461
CONFIG_REGULATOR_CPCAP=y
@@ -470,6 +472,7 @@ CONFIG_REGULATOR_TPS65023=y
470472
CONFIG_REGULATOR_TPS6507X=y
471473
CONFIG_REGULATOR_TPS65217=y
472474
CONFIG_REGULATOR_TPS65218=y
475+
CONFIG_REGULATOR_TPS65219=y
473476
CONFIG_REGULATOR_TPS65910=y
474477
CONFIG_REGULATOR_TWL4030=y
475478
CONFIG_RC_CORE=m

arch/arm/configs/sama5_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ CONFIG_LIBERTAS_THINFIRM_USB=m
9595
CONFIG_MWIFIEX=m
9696
CONFIG_MWIFIEX_SDIO=m
9797
CONFIG_MWIFIEX_USB=m
98+
CONFIG_WILC1000_SDIO=m
9899
CONFIG_RT2X00=m
99100
CONFIG_RT2500USB=m
100101
CONFIG_RT73USB=m

arch/arm/configs/shmobile_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ CONFIG_SH_ETH=y
5858
CONFIG_RAVB=y
5959
CONFIG_SMSC911X=y
6060
CONFIG_STMMAC_ETH=y
61+
# CONFIG_DWMAC_RENESAS_GBETH is not set
6162
CONFIG_MICREL_PHY=y
6263
CONFIG_SMSC_PHY=y
6364
CONFIG_CAN_RCAR=y

0 commit comments

Comments
 (0)