summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTimo Sigurdsson <public_timo.s@silentcreek.de>2015-12-29 02:47:33 +0100
committerArnd Bergmann <arnd@arndb.de>2015-12-31 17:01:59 +0100
commit694341cf2027504b6f63aaf4405b3af9ff41c63e (patch)
tree7d41bae607f64f8f85149af52af99198346095dc /arch
parentARM: tegra: Fix suspend hang on Tegra124 Chromebooks (diff)
downloadlinux-694341cf2027504b6f63aaf4405b3af9ff41c63e.tar.xz
linux-694341cf2027504b6f63aaf4405b3af9ff41c63e.zip
ARM: Fix broken USB support in sunxi_defconfig
Commit 69fb4dcada77 ("power: Add an axp20x-usb-power driver") introduced a new driver for the USB power supply used on various Allwinner based SBCs. However, the driver was not added to sunxi_defconfig which breaks USB support for some boards (e.g. LeMaker BananaPi) as the kernel will now turn off the USB power supply during boot by default if the driver isn't present. (This was not the case in linux 4.3 or lower where the USB power was always left on.) Hence, add the driver to sunxi_defconfig in order to keep USB support working on those boards that require it. Signed-off-by: Timo Sigurdsson <public_timo.s@silentcreek.de> Reported-by: David Tulloh <david@tulloh.id.au> Tested-by: David Tulloh <david@tulloh.id.au> Tested-by: Timo Sigurdsson <public_timo.s@silentcreek.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/sunxi_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
index 3c36e16fcacf..b503a89441bf 100644
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@ -84,6 +84,7 @@ CONFIG_SPI_SUN4I=y
CONFIG_SPI_SUN6I=y
CONFIG_GPIO_SYSFS=y
CONFIG_POWER_SUPPLY=y
+CONFIG_AXP20X_POWER=y
CONFIG_THERMAL=y
CONFIG_CPU_THERMAL=y
CONFIG_WATCHDOG=y