diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-08-13 00:06:38 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-08-13 00:06:39 +0300 |
| commit | b528dede9bca2afc262b841757fa994bd035cb43 (patch) | |
| tree | 17a287f11e1e8e295217d2298915b6f0693304cf /arch/arm/configs/multi_v7_defconfig | |
| parent | c500bee1c5b2f1d59b1081ac879d73268ab0ff17 (diff) | |
| parent | b62869dcd4bcf341d3750a2bcad9a80c6d5562a8 (diff) | |
| download | linux-b528dede9bca2afc262b841757fa994bd035cb43.tar.xz | |
Merge tag 'at91-defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/defconfig
AT91 defconfig for 5.15:
- add defconfig entries for new SoC: SAMA7G5
- dedicated sama7_defconfig which avoids having to carry older drivers
and dependencies from the sama5 family:
CACHE_L2X0, CAN_AT91, TOUCHSCREEN_ADC, AT91SAM9X_WATCHDOG,
VIDEO_ATMEL_ISI, SND_ATMEL_SOC_I2S, MMC_ATMELMCI, AT_HDMAC, AT91_ADC,
REGULATOR_ACT*
Addition of new drivers that are not part of any sama5 SoC:
SND_MCHP_SOC_I2S_MCC, SND_MCHP_SOC_SPDIFTX|RX, MICROCHIP_PIT64B
plus upcoming MIPI pipeline, audio sample rate converter, ...
It also maintains both sama5 and sama7 defconfig tailored for their
respective families and easy to identify.
- addition to the generic multi_v7_defconfig
* tag 'at91-defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: multi_v7_defconfig: add sama7g5 SoC
ARM: configs: at91: add defconfig for sama7 family of SoCs
Link: https://lore.kernel.org/r/20210809134521.10155-1-nicolas.ferre@microchip.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index d9abaae118dd..bc9ecf28207c 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH_AT91=y CONFIG_SOC_SAMA5D2=y CONFIG_SOC_SAMA5D3=y CONFIG_SOC_SAMA5D4=y +CONFIG_SOC_SAMA7G5=y CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM_CYGNUS=y CONFIG_ARCH_BCM_HR2=y @@ -996,6 +997,7 @@ CONFIG_APQ_MMCC_8084=y CONFIG_MSM_GCC_8660=y CONFIG_MSM_MMCC_8960=y CONFIG_MSM_MMCC_8974=y +CONFIG_MICROCHIP_PIT64B=y CONFIG_BCM2835_MBOX=y CONFIG_ROCKCHIP_IOMMU=y CONFIG_TEGRA_IOMMU_GART=y |