Skip to content

Commit db8fcde

Browse files
committed
Merge branch 'linux-5.15-trunk/at91/config' into linux-5.15-mchp
2 parents b4b093d + 5c0153b commit db8fcde

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

arch/arm/configs/sama7_defconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ CONFIG_BLK_DEV_SD=y
107107
CONFIG_NETDEVICES=y
108108
CONFIG_MACB=y
109109
CONFIG_MICREL_PHY=y
110+
CONFIG_MWIFIEX=m
111+
CONFIG_MWIFIEX_SDIO=m
112+
CONFIG_MWIFIEX_USB=m
113+
CONFIG_WILC_SDIO=m
114+
CONFIG_WILC_SPI=m
110115
CONFIG_INPUT_EVDEV=y
111116
CONFIG_KEYBOARD_GPIO=y
112117
# CONFIG_INPUT_MOUSE is not set
@@ -143,6 +148,8 @@ CONFIG_MEDIA_SUPPORT_FILTER=y
143148
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
144149
CONFIG_MEDIA_CAMERA_SUPPORT=y
145150
CONFIG_MEDIA_PLATFORM_SUPPORT=y
151+
CONFIG_MEDIA_USB_SUPPORT=y
152+
CONFIG_USB_VIDEO_CLASS=m
146153
CONFIG_V4L_PLATFORM_DRIVERS=y
147154
CONFIG_VIDEO_ATMEL_XISC=y
148155
CONFIG_VIDEO_MICROCHIP_CSI2DC=y
@@ -186,6 +193,7 @@ CONFIG_USB_CONFIGFS_MASS_STORAGE=y
186193
CONFIG_USB_CONFIGFS_F_UVC=y
187194
CONFIG_USB_G_SERIAL=m
188195
CONFIG_MMC=y
196+
CONFIG_PWRSEQ_SD8787=m
189197
CONFIG_MMC_SDHCI=y
190198
CONFIG_MMC_SDHCI_PLTFM=y
191199
CONFIG_MMC_SDHCI_OF_AT91=y
@@ -243,6 +251,7 @@ CONFIG_CRYPTO_DEV_ATMEL_TDES=y
243251
CONFIG_CRYPTO_DEV_ATMEL_SHA=y
244252
CONFIG_CRC_CCITT=y
245253
CONFIG_CRC_ITU_T=y
254+
CONFIG_CRC7=y
246255
CONFIG_DMA_CMA=y
247256
CONFIG_CMA_SIZE_MBYTES=32
248257
CONFIG_CMA_ALIGNMENT=9

0 commit comments

Comments
 (0)