diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-07-27 15:35:28 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-07-27 15:35:28 +0300 |
| commit | 66d3037898efc84ee241f593ffba244591bca328 (patch) | |
| tree | abc4018480d22ace1ac63685619327366c10cd7a /arch/arm/configs | |
| parent | 2ee61200b7d7881b5bcad4a2e70c987393ee2f9d (diff) | |
| parent | c12b539787efff5b4fc5abac1debf3ea1901348e (diff) | |
| download | linux-66d3037898efc84ee241f593ffba244591bca328.tar.xz | |
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/20200726192810.GA181818@piout.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/sama5_defconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index 8e1f78c19920..7b7e333157fe 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig @@ -49,9 +49,14 @@ CONFIG_IP_PNP_RARP=y # CONFIG_INET6_XFRM_MODE_TUNNEL is not set # CONFIG_INET6_XFRM_MODE_BEET is not set CONFIG_IPV6_SIT_6RD=y +CONFIG_BRIDGE=m +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_NET_DSA=m +CONFIG_VLAN_8021Q=m CONFIG_CAN=y CONFIG_CAN_AT91=y CONFIG_CAN_M_CAN=y +CONFIG_CAN_M_CAN_PLATFORM=y CONFIG_CFG80211=y CONFIG_MAC80211=y CONFIG_MAC80211_LEDS=y @@ -80,6 +85,8 @@ CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y # CONFIG_SCSI_LOWLEVEL is not set CONFIG_NETDEVICES=y +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m CONFIG_MACB=y # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_CIRRUS is not set @@ -165,6 +172,7 @@ CONFIG_SND_SOC=y CONFIG_SND_ATMEL_SOC=y CONFIG_SND_ATMEL_SOC_WM8904=y # CONFIG_HID_GENERIC is not set +CONFIG_SND_ATMEL_SOC_CLASSD=y CONFIG_SND_ATMEL_SOC_PDMIC=y CONFIG_SND_ATMEL_SOC_TSE850_PCM5142=m CONFIG_SND_ATMEL_SOC_I2S=y |