Skip to content

Commit 672d2da

Browse files
committed
Merge tag 'soc-defconfig-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC defconfig updates from Arnd Bergmann: "Most of the changes just enable additional device drivers that were added or that are often used on major platforms. The virtconfig added last time now disables additional drivers to shrink kernels for virtual machines. The obsolete oxnas_v6_defconfig file is removed in turn" * tag 'soc-defconfig-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (33 commits) ARM: config: Update Vexpress defconfig arm64: defconfig: enable building the nvmem-reboot-mode module arm64: defconfig: Enable TI ADC driver arm64: defconfig: Enable TI TSCADC driver arm64: defconfig: Enable security accelerator driver for TI K3 SoCs arm64: defconfig: Enable crypto test module ARM: multi_v7_defconfig: Add OPTEE support ARM: configs: Update U8500 defconfig ARM: imx_v4_v5_defconfig: Build CONFIG_IMX_SDMA as module arm64: defconfig: Enable IPQ9574 SoC base configs ARM: imx_v6_v7_defconfig: Enable Tarragon peripheral drivers arm64: defconfig: Enable ARM CoreSight PMU driver arm64: defconfig: remove duplicate TYPEC_UCSI & QCOM_PMIC_GLINK ARM: configs: remove oxnas_v6_defconfig arm64: defconfig: Enable audio drivers for AM62-SK arm64: defconfig: Enable drivers for BeaglePlay ARM: imx_v6_v7_defconfig: Select CONFIG_DRM_I2C_NXP_TDA998X arm64: defconfig: Enable Virtio RNG driver as built in arm64: defconfig: Enable CAN PHY transceiver driver arm64: defconfig: add PMIC GLINK modules ...
2 parents a907047 + 2c25b94 commit 672d2da

File tree

9 files changed

+97
-100
lines changed

9 files changed

+97
-100
lines changed

arch/arm/configs/imx_v4_v5_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ CONFIG_RTC_DRV_MC13XXX=y
160160
CONFIG_RTC_DRV_MXC=y
161161
CONFIG_DMADEVICES=y
162162
CONFIG_IMX_DMA=y
163-
CONFIG_IMX_SDMA=y
163+
CONFIG_IMX_SDMA=m
164164
# CONFIG_IOMMU_SUPPORT is not set
165165
CONFIG_IIO=y
166166
CONFIG_FSL_MX25_ADC=y

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ CONFIG_CS89x0_PLATFORM=y
128128
# CONFIG_NET_VENDOR_MICREL is not set
129129
# CONFIG_NET_VENDOR_MICROCHIP is not set
130130
# CONFIG_NET_VENDOR_NATSEMI is not set
131+
CONFIG_QCA7000_SPI=m
131132
# CONFIG_NET_VENDOR_SEEQ is not set
132133
CONFIG_SMC91X=y
133134
CONFIG_SMC911X=y
@@ -213,8 +214,12 @@ CONFIG_GPIO_SIOX=m
213214
CONFIG_GPIO_MAX732X=y
214215
CONFIG_GPIO_PCA953X=y
215216
CONFIG_GPIO_PCF857X=y
217+
CONFIG_GPIO_BD71815=y
216218
CONFIG_GPIO_STMPE=y
217219
CONFIG_GPIO_74X164=y
220+
CONFIG_W1=m
221+
CONFIG_W1_MASTER_DS2482=m
222+
CONFIG_W1_SLAVE_THERM=m
218223
CONFIG_POWER_RESET=y
219224
CONFIG_POWER_RESET_SYSCON=y
220225
CONFIG_POWER_RESET_SYSCON_POWEROFF=y
@@ -223,6 +228,7 @@ CONFIG_RN5T618_POWER=m
223228
CONFIG_SENSORS_MC13783_ADC=y
224229
CONFIG_SENSORS_GPIO_FAN=y
225230
CONFIG_SENSORS_IIO_HWMON=y
231+
CONFIG_SENSORS_PWM_FAN=y
226232
CONFIG_SENSORS_SY7636A=y
227233
CONFIG_THERMAL_STATISTICS=y
228234
CONFIG_THERMAL_WRITABLE_TRIPS=y
@@ -242,8 +248,10 @@ CONFIG_MFD_MC13XXX_I2C=y
242248
CONFIG_MFD_SY7636A=y
243249
CONFIG_MFD_RN5T618=y
244250
CONFIG_MFD_STMPE=y
251+
CONFIG_MFD_ROHM_BD71828=y
245252
CONFIG_REGULATOR_FIXED_VOLTAGE=y
246253
CONFIG_REGULATOR_ANATOP=y
254+
CONFIG_REGULATOR_BD71815=y
247255
CONFIG_REGULATOR_DA9052=y
248256
CONFIG_REGULATOR_DA9062=y
249257
CONFIG_REGULATOR_DA9063=y
@@ -271,6 +279,7 @@ CONFIG_VIDEO_OV5645=m
271279
CONFIG_VIDEO_ADV7180=m
272280
CONFIG_IMX_IPUV3_CORE=y
273281
CONFIG_DRM=y
282+
CONFIG_DRM_I2C_NXP_TDA998X=y
274283
CONFIG_DRM_MSM=y
275284
CONFIG_DRM_PANEL_LVDS=y
276285
CONFIG_DRM_PANEL_SIMPLE=y
@@ -380,6 +389,7 @@ CONFIG_RTC_DRV_ISL1208=y
380389
CONFIG_RTC_DRV_PCF8523=y
381390
CONFIG_RTC_DRV_PCF8563=y
382391
CONFIG_RTC_DRV_M41T80=y
392+
CONFIG_RTC_DRV_BD70528=y
383393
CONFIG_RTC_DRV_RC5T619=y
384394
CONFIG_RTC_DRV_RV3029C2=y
385395
CONFIG_RTC_DRV_DA9063=y
@@ -396,13 +406,15 @@ CONFIG_STAGING=y
396406
CONFIG_STAGING_MEDIA=y
397407
CONFIG_VIDEO_IMX_MEDIA=y
398408
CONFIG_COMMON_CLK_PWM=y
409+
CONFIG_COMMON_CLK_BD718XX=y
399410
CONFIG_CLK_IMX8MM=y
400411
CONFIG_CLK_IMX8MN=y
401412
CONFIG_CLK_IMX8MP=y
402413
CONFIG_CLK_IMX8MQ=y
403414
CONFIG_SOC_IMX8M=y
404415
CONFIG_EXTCON_USB_GPIO=y
405416
CONFIG_IIO=y
417+
CONFIG_IIO_ST_ACCEL_3AXIS=m
406418
CONFIG_MMA8452=y
407419
CONFIG_IMX7D_ADC=y
408420
CONFIG_RN5T618_ADC=y

arch/arm/configs/multi_v7_defconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ CONFIG_B53_SPI_DRIVER=m
251251
CONFIG_B53_MDIO_DRIVER=m
252252
CONFIG_B53_MMAP_DRIVER=m
253253
CONFIG_NET_DSA_BCM_SF2=m
254+
CONFIG_NET_DSA_RZN1_A5PSW=m
254255
CONFIG_SUN4I_EMAC=y
255256
CONFIG_SPI_AX88796C=m
256257
CONFIG_BCMGENET=m
@@ -474,6 +475,7 @@ CONFIG_PINCTRL_MSM8916=y
474475
CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
475476
CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
476477
CONFIG_PINCTRL_RZA2=y
478+
CONFIG_PINCTRL_RZN1=y
477479
CONFIG_GPIO_ASPEED_SGPIO=y
478480
CONFIG_GPIO_DAVINCI=y
479481
CONFIG_GPIO_DWAPB=y
@@ -563,6 +565,7 @@ CONFIG_MESON_WATCHDOG=y
563565
CONFIG_DIGICOLOR_WATCHDOG=y
564566
CONFIG_RENESAS_WDT=m
565567
CONFIG_RENESAS_RZAWDT=m
568+
CONFIG_RENESAS_RZN1WDT=m
566569
CONFIG_STPMIC1_WATCHDOG=y
567570
CONFIG_PM8916_WATCHDOG=m
568571
CONFIG_BCM47XX_WDT=y
@@ -873,6 +876,7 @@ CONFIG_USB_ISP1301=y
873876
CONFIG_USB_MXS_PHY=y
874877
CONFIG_USB_GADGET=y
875878
CONFIG_USB_RENESAS_USBHS_UDC=m
879+
CONFIG_USB_RENESAS_USBF=m
876880
CONFIG_USB_ASPEED_VHUB=m
877881
CONFIG_USB_CONFIGFS=m
878882
CONFIG_USB_CONFIGFS_SERIAL=y
@@ -989,6 +993,7 @@ CONFIG_RTC_DRV_SH=m
989993
CONFIG_RTC_DRV_PL031=y
990994
CONFIG_RTC_DRV_AT91RM9200=m
991995
CONFIG_RTC_DRV_AT91SAM9=m
996+
CONFIG_RTC_DRV_RZN1=m
992997
CONFIG_RTC_DRV_VT8500=y
993998
CONFIG_RTC_DRV_SUNXI=y
994999
CONFIG_RTC_DRV_MV=y
@@ -1020,6 +1025,7 @@ CONFIG_UNIPHIER_MDMAC=y
10201025
CONFIG_XILINX_DMA=y
10211026
CONFIG_QCOM_BAM_DMA=y
10221027
CONFIG_DW_DMAC=y
1028+
CONFIG_RZN1_DMAMUX=m
10231029
CONFIG_RCAR_DMAC=y
10241030
CONFIG_RENESAS_USB_DMAC=m
10251031
CONFIG_VIRTIO_PCI=y
@@ -1212,6 +1218,8 @@ CONFIG_FSI_MASTER_ASPEED=m
12121218
CONFIG_FSI_SCOM=m
12131219
CONFIG_FSI_SBEFIFO=m
12141220
CONFIG_FSI_OCC=m
1221+
CONFIG_TEE=y
1222+
CONFIG_OPTEE=y
12151223
CONFIG_INTERCONNECT_QCOM=y
12161224
CONFIG_INTERCONNECT_QCOM_MSM8916=y
12171225
CONFIG_COUNTER=m

arch/arm/configs/oxnas_v6_defconfig

Lines changed: 0 additions & 92 deletions
This file was deleted.

arch/arm/configs/shmobile_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ CONFIG_SERIAL_8250=y
7676
# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
7777
CONFIG_SERIAL_8250_CONSOLE=y
7878
# CONFIG_SERIAL_8250_PCI is not set
79+
# CONFIG_SERIAL_8250_PCI1XXXX is not set
7980
CONFIG_SERIAL_8250_DW=y
8081
CONFIG_SERIAL_8250_EM=y
8182
# CONFIG_SERIAL_8250_PERICOM is not set
@@ -168,6 +169,7 @@ CONFIG_USB_R8A66597_HCD=y
168169
CONFIG_USB_RENESAS_USBHS=y
169170
CONFIG_USB_GADGET=y
170171
CONFIG_USB_RENESAS_USBHS_UDC=y
172+
CONFIG_USB_RENESAS_USBF=y
171173
CONFIG_USB_ETH=y
172174
CONFIG_MMC=y
173175
CONFIG_MMC_SDHI=y

arch/arm/configs/u8500_defconfig

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ CONFIG_CFG80211_DEBUGFS=y
3838
CONFIG_MAC80211=y
3939
CONFIG_MAC80211_LEDS=y
4040
CONFIG_CAIF=y
41+
CONFIG_NFC=m
42+
CONFIG_NFC_HCI=m
43+
CONFIG_NFC_SHDLC=m
44+
CONFIG_NFC_PN544_I2C=m
4145
CONFIG_DEVTMPFS=y
4246
CONFIG_DEVTMPFS_MOUNT=y
4347
CONFIG_GNSS=y
@@ -180,10 +184,8 @@ CONFIG_NFS_FS=y
180184
CONFIG_ROOT_NFS=y
181185
CONFIG_NLS_CODEPAGE_437=y
182186
CONFIG_NLS_ISO8859_1=y
183-
CONFIG_CRYPTO_DEV_UX500=y
184-
CONFIG_CRYPTO_DEV_UX500_CRYP=y
185-
CONFIG_CRYPTO_DEV_UX500_HASH=y
186-
CONFIG_CRYPTO_DEV_UX500_DEBUG=y
187+
CONFIG_CRYPTO_DEV_STM32_HASH=y
188+
CONFIG_CRYPTO_DEV_STM32_CRYP=y
187189
CONFIG_PRINTK_TIME=y
188190
CONFIG_DEBUG_KERNEL=y
189191
CONFIG_MAGIC_SYSRQ=y

arch/arm/configs/vexpress_defconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# CONFIG_LOCALVERSION_AUTO is not set
22
CONFIG_SYSVIPC=y
3+
CONFIG_NO_HZ_FULL=y
4+
CONFIG_HIGH_RES_TIMERS=y
35
CONFIG_IKCONFIG=y
46
CONFIG_IKCONFIG_PROC=y
57
CONFIG_LOG_BUF_SHIFT=14
@@ -42,6 +44,7 @@ CONFIG_NET_9P_VIRTIO=y
4244
CONFIG_DEVTMPFS=y
4345
CONFIG_MTD=y
4446
CONFIG_MTD_CMDLINE_PARTS=y
47+
CONFIG_MTD_AFS_PARTS=y
4548
CONFIG_MTD_BLOCK=y
4649
CONFIG_MTD_CFI=y
4750
CONFIG_MTD_CFI_INTELEXT=y
@@ -137,5 +140,4 @@ CONFIG_DEBUG_KERNEL=y
137140
CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
138141
CONFIG_MAGIC_SYSRQ=y
139142
CONFIG_DETECT_HUNG_TASK=y
140-
# CONFIG_SCHED_DEBUG is not set
141143
CONFIG_DEBUG_USER=y

0 commit comments

Comments
 (0)