From: Olof Johansson <olof@lixom.net>
Date: Mon, 29 Apr 2019 06:38:12 +0000 (-0700)
Subject: Merge tag 'sunxi-config64-for-5.2' of https://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.2-rc1~43^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=784baecf92e5b61952fd6606879db808c705105e;p=thirdparty%2Fkernel%2Flinux.git

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>
---

784baecf92e5b61952fd6606879db808c705105e
diff --cc arch/arm64/configs/defconfig
index 755553f9c7536,3b6af01d1f42c..21128287be8bf
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -366,6 -372,8 +366,7 @@@ CONFIG_SPI_ROCKCHIP=
  CONFIG_SPI_QUP=y
  CONFIG_SPI_S3C64XX=y
  CONFIG_SPI_SPIDEV=m
 -CONFIG_SPI_NXP_FLEXSPI=y
+ CONFIG_SPI_SUN6I=y
  CONFIG_SPMI=y
  CONFIG_PINCTRL_SINGLE=y
  CONFIG_PINCTRL_MAX77620=y