diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-08-21 09:21:26 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-21 09:21:26 +0200 |
| commit | ddd0eb3d29e00c899e4a349246ad074e9335693b (patch) | |
| tree | 998bed6a397f76ef9dfecc6764f94a9633814947 /arch/arm64 | |
| parent | f4da0ed9d623255af846b35d601d0207ebe9d3a3 (diff) | |
| parent | 908d10b02b80a81c5dd1cee88165db2a30e23d45 (diff) | |
| download | linux-ddd0eb3d29e00c899e4a349246ad074e9335693b.tar.bz2 | |
Merge tag 'sunxi-config64-for-4.14' of https://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index e85d2bda8ef0..a3176b56e8fd 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -322,6 +322,7 @@ 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 @@ -332,6 +333,7 @@ CONFIG_MFD_MAX77620=y CONFIG_MFD_SPMI_PMIC=y CONFIG_MFD_RK808=y CONFIG_MFD_SEC_CORE=y +CONFIG_REGULATOR_AXP20X=y CONFIG_REGULATOR_FAN53555=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_GPIO=y |