From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 21 Aug 2017 07:21:26 +0000 (+0200)
Subject: Merge tag 'sunxi-config64-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ddd0eb3d29e00c899e4a349246ad074e9335693b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'sunxi-config64-for-4.14' of https://git./linux/kernel/git/sunxi/linux into next/arm64

Pull "Allwinner arm64 defconfig changes for 4.14" from Chen-Yu Tsai:

Enable X-Powers AXP series PMIC mfd and regulator support by default.

* tag 'sunxi-config64-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: defconfig: Enable REGULATOR_AXP20X
  arm64: defconfig: Enable MFD_AXP20X_RSB
---

ddd0eb3d29e00c899e4a349246ad074e9335693b
diff --cc arch/arm64/configs/defconfig
index e85d2bda8ef0,a0c42b835af6..a3176b56e8fd
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -320,8 -311,8 +320,9 @@@ CONFIG_S3C2410_WATCHDOG=
  CONFIG_MESON_GXBB_WATCHDOG=m
  CONFIG_MESON_WATCHDOG=m
  CONFIG_RENESAS_WDT=y
 +CONFIG_UNIPHIER_WATCHDOG=y
  CONFIG_BCM2835_WDT=y
+ CONFIG_MFD_AXP20X_RSB=y
  CONFIG_MFD_CROS_EC=y
  CONFIG_MFD_CROS_EC_I2C=y
  CONFIG_MFD_CROS_EC_SPI=y