summaryrefslogtreecommitdiffstats
path: root/arch/arm64/configs
diff options
context:
space:
mode:
authorOlof Johansson2019-06-27 04:07:58 +0200
committerOlof Johansson2019-06-27 04:07:58 +0200
commite8ac278fc90ee1fd8fdaeb484985ae17224673db (patch)
treea12ac15254f9ff23f4baf69244da2f1e10e81bd4 /arch/arm64/configs
parentMerge tag 'aspeed-5.3-defconfig' of git://git.kernel.org/pub/scm/linux/kernel... (diff)
parentarm64: defconfig: enable Allwinner DMA drivers (diff)
downloadkernel-qcow2-linux-e8ac278fc90ee1fd8fdaeb484985ae17224673db.tar.gz
kernel-qcow2-linux-e8ac278fc90ee1fd8fdaeb484985ae17224673db.tar.xz
kernel-qcow2-linux-e8ac278fc90ee1fd8fdaeb484985ae17224673db.zip
Merge tag 'sunxi-config64-for-5.3-201906210813' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/defconfig
Our usual bunch of arm64 defconfig changes, this time mostly to enable some missing drivers for the Allwinner A64. * tag 'sunxi-config64-for-5.3-201906210813' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: defconfig: enable Allwinner DMA drivers arm64: defconfig: enable sunxi watchdog arm64: defconfig: add allwinner sid support Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/configs')
-rw-r--r--arch/arm64/configs/defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index edaad930921c..6d5cd7834481 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -437,6 +437,7 @@ CONFIG_UNIPHIER_THERMAL=y
CONFIG_WATCHDOG=y
CONFIG_ARM_SP805_WATCHDOG=y
CONFIG_S3C2410_WATCHDOG=y
+CONFIG_SUNXI_WATCHDOG=m
CONFIG_IMX2_WDT=y
CONFIG_MESON_GXBB_WATCHDOG=m
CONFIG_MESON_WATCHDOG=m
@@ -636,6 +637,7 @@ CONFIG_RTC_DRV_IMX_SC=m
CONFIG_RTC_DRV_XGENE=y
CONFIG_DMADEVICES=y
CONFIG_DMA_BCM2835=m
+CONFIG_DMA_SUN6I=m
CONFIG_K3_DMA=y
CONFIG_MV_XOR=y
CONFIG_MV_XOR_V2=y
@@ -763,6 +765,7 @@ CONFIG_PHY_TEGRA_XUSB=y
CONFIG_HISI_PMU=y
CONFIG_QCOM_L2_PMU=y
CONFIG_QCOM_L3_PMU=y
+CONFIG_NVMEM_SUNXI_SID=y
CONFIG_QCOM_QFPROM=y
CONFIG_ROCKCHIP_EFUSE=y
CONFIG_UNIPHIER_EFUSE=y