From: Chen-Yu Tsai Date: Mon, 16 Nov 2015 16:38:27 +0000 (+0800) Subject: ARM: sunxi_defconfig: Update MFD_AXP20X symbol and enable MFD_AXP20X_RSB X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f7d2d93eab2b3d099b1a7f671ee355fe63f8e1d9;p=linux-beck.git 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 Signed-off-by: Maxime Ripard --- 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