Skip to content

Commit 66d3037

Browse files
committed
Merge tag 'at91-defconfig-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/defconfig
AT91 defconfig for 5.9 - Add ClassD, KSZ ethernet switches, brdige, vlan to sama5_defconfig - Reenable CAN support in sama5_defconfig * tag 'at91-defconfig-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: configs: at91: sama5: enable CAN PLATFORM driver ARM: configs: at91: sama5: enable bridge and VLAN filtering ARM: configs: at91: sama5: add support for KSZ ethernet switches ARM: configs: at91: sama5: Enable CLASSD Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 2ee6120 + c12b539 commit 66d3037

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

arch/arm/configs/sama5_defconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,14 @@ CONFIG_IP_PNP_RARP=y
4949
# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
5050
# CONFIG_INET6_XFRM_MODE_BEET is not set
5151
CONFIG_IPV6_SIT_6RD=y
52+
CONFIG_BRIDGE=m
53+
CONFIG_BRIDGE_VLAN_FILTERING=y
54+
CONFIG_NET_DSA=m
55+
CONFIG_VLAN_8021Q=m
5256
CONFIG_CAN=y
5357
CONFIG_CAN_AT91=y
5458
CONFIG_CAN_M_CAN=y
59+
CONFIG_CAN_M_CAN_PLATFORM=y
5560
CONFIG_CFG80211=y
5661
CONFIG_MAC80211=y
5762
CONFIG_MAC80211_LEDS=y
@@ -80,6 +85,8 @@ CONFIG_SCSI=y
8085
CONFIG_BLK_DEV_SD=y
8186
# CONFIG_SCSI_LOWLEVEL is not set
8287
CONFIG_NETDEVICES=y
88+
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
89+
CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
8390
CONFIG_MACB=y
8491
# CONFIG_NET_VENDOR_BROADCOM is not set
8592
# CONFIG_NET_VENDOR_CIRRUS is not set
@@ -165,6 +172,7 @@ CONFIG_SND_SOC=y
165172
CONFIG_SND_ATMEL_SOC=y
166173
CONFIG_SND_ATMEL_SOC_WM8904=y
167174
# CONFIG_HID_GENERIC is not set
175+
CONFIG_SND_ATMEL_SOC_CLASSD=y
168176
CONFIG_SND_ATMEL_SOC_PDMIC=y
169177
CONFIG_SND_ATMEL_SOC_TSE850_PCM5142=m
170178
CONFIG_SND_ATMEL_SOC_I2S=y

0 commit comments

Comments
 (0)