| commit | d7a9c595118ad377b1c68524578271eb16f81a00 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Feb 11 14:49:37 2020 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Tue Feb 11 14:49:38 2020 -0800 |
| tree | 86c9c9be50f148db3a9791b010eebe42f3a560f6 | |
| parent | a9541fb7ed8eb112a32772d3c2dad57b355d66b0 [diff] | |
| parent | f166795871be4a6a679a5f61ac7130b3c0b21cab [diff] |
Merge tag 'arm-soc/for-5.6/defconfig-arm64-fixes' of https://github.com/Broadcom/stblinux into arm/fixes This pull request contains ARM64 defconfig changes for v5.6, please pull the following: - Nicolas enables the BCM2835 DMA engine controller as built-in since the bcm2835 SD host controller depends on the DMA engine to be available. * tag 'arm-soc/for-5.6/defconfig-arm64-fixes' of https://github.com/Broadcom/stblinux: arm64: defconfig: Set bcm2835-dma as built-in Link: https://lore.kernel.org/r/20200210145621.22599-1-f.fainelli@gmail.com Signed-off-by: Olof Johansson <olof@lixom.net>
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 4631a11..905109f 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig
@@ -683,7 +683,7 @@ CONFIG_RTC_DRV_IMX_SC=m CONFIG_RTC_DRV_XGENE=y CONFIG_DMADEVICES=y -CONFIG_DMA_BCM2835=m +CONFIG_DMA_BCM2835=y CONFIG_DMA_SUN6I=m CONFIG_FSL_EDMA=y CONFIG_IMX_SDMA=y