summaryrefslogtreecommitdiffstats
path: root/arch/arm64/configs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-04-28 23:38:12 -0700
committerOlof Johansson <olof@lixom.net>2019-04-28 23:38:12 -0700
commit784baecf92e5b61952fd6606879db808c705105e (patch)
tree8e0d62a1f208967c45a6cda6b289c706e607f96d /arch/arm64/configs
parent82b8118d0cd949237aa26d90c9cde5cbc3fd0d31 (diff)
parent89232872319f6a93c91162f07c10dfd630b305b1 (diff)
downloadlinux-784baecf92e5b61952fd6606879db808c705105e.tar.bz2
Merge tag 'sunxi-config64-for-5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/defconfig
Allwinner arm64 defconfig changes for 5.2 Just a single patch to enable our SPI controller on the arm64 defconfig. * tag 'sunxi-config64-for-5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: defconfig: Enable SPI_SUN6I Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/configs')
-rw-r--r--arch/arm64/configs/defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 755553f9c753..21128287be8b 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -366,6 +366,7 @@ CONFIG_SPI_ROCKCHIP=y
CONFIG_SPI_QUP=y
CONFIG_SPI_S3C64XX=y
CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_SUN6I=y
CONFIG_SPMI=y
CONFIG_PINCTRL_SINGLE=y
CONFIG_PINCTRL_MAX77620=y