Skip to content

Commit e8ac278

Browse files
committed
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 <[email protected]>
2 parents 29217a9 + dae335b commit e8ac278

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,7 @@ CONFIG_UNIPHIER_THERMAL=y
437437
CONFIG_WATCHDOG=y
438438
CONFIG_ARM_SP805_WATCHDOG=y
439439
CONFIG_S3C2410_WATCHDOG=y
440+
CONFIG_SUNXI_WATCHDOG=m
440441
CONFIG_IMX2_WDT=y
441442
CONFIG_MESON_GXBB_WATCHDOG=m
442443
CONFIG_MESON_WATCHDOG=m
@@ -636,6 +637,7 @@ CONFIG_RTC_DRV_IMX_SC=m
636637
CONFIG_RTC_DRV_XGENE=y
637638
CONFIG_DMADEVICES=y
638639
CONFIG_DMA_BCM2835=m
640+
CONFIG_DMA_SUN6I=m
639641
CONFIG_K3_DMA=y
640642
CONFIG_MV_XOR=y
641643
CONFIG_MV_XOR_V2=y
@@ -763,6 +765,7 @@ CONFIG_PHY_TEGRA_XUSB=y
763765
CONFIG_HISI_PMU=y
764766
CONFIG_QCOM_L2_PMU=y
765767
CONFIG_QCOM_L3_PMU=y
768+
CONFIG_NVMEM_SUNXI_SID=y
766769
CONFIG_QCOM_QFPROM=y
767770
CONFIG_ROCKCHIP_EFUSE=y
768771
CONFIG_UNIPHIER_EFUSE=y

0 commit comments

Comments
 (0)