summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/sunxi_defconfig
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2015-11-16 17:38:27 +0100
committerMaxime Ripard <maxime.ripard@free-electrons.com>2015-11-20 12:16:42 +0100
commitf7d2d93eab2b3d099b1a7f671ee355fe63f8e1d9 (patch)
tree044ddebdc87a6d7b49b41a0d8c98a9f628d3496e /arch/arm/configs/sunxi_defconfig
parentLinux 4.4-rc1 (diff)
downloadlinux-f7d2d93eab2b3d099b1a7f671ee355fe63f8e1d9.tar.xz
linux-f7d2d93eab2b3d099b1a7f671ee355fe63f8e1d9.zip
ARM: sunxi_defconfig: Update MFD_AXP20X symbol and enable MFD_AXP20X_RSB
axp20x support has been split into 2 parts, I2C and RSB interface variants. Update the MFD_AXP20X symbol for I2C support, and also enable MFD_AXP20X_RSB to support RSB variants. Keep MFD_AXP20X enabled for now, to ease migration for automated boot farms while the patches are being merged. This should be removed in the next release. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/configs/sunxi_defconfig')
-rw-r--r--arch/arm/configs/sunxi_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
index 3c36e16fcacf..18dbfaddb727 100644
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@ -89,6 +89,8 @@ CONFIG_CPU_THERMAL=y
CONFIG_WATCHDOG=y
CONFIG_SUNXI_WATCHDOG=y
CONFIG_MFD_AXP20X=y
+CONFIG_MFD_AXP20X_I2C=y
+CONFIG_MFD_AXP20X_RSB=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_AXP20X=y