summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/sunxi_defconfig
diff options
context:
space:
mode:
authorCarlo Caione <carlo@caione.org>2014-12-23 03:53:13 +0100
committerMaxime Ripard <maxime.ripard@free-electrons.com>2015-01-06 17:33:06 +0100
commit314fcb230cad7eea311f065f20f03ed9d08d8edf (patch)
treef367f5889dcebcbfc5bd15906725c5a1fbcf0f59 /arch/arm/configs/sunxi_defconfig
parentARM: multi_v7_defconfig: Enable TOUCHSCREEN_SUN4I, CPU_THERMAL (diff)
downloadlinux-314fcb230cad7eea311f065f20f03ed9d08d8edf.tar.xz
linux-314fcb230cad7eea311f065f20f03ed9d08d8edf.zip
ARM: sunxi: Add AXP20x support in defconfig
Signed-off-by: Carlo Caione <carlo@caione.org> 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_defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
index 46a8688bd49a..38840a812924 100644
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@ -56,6 +56,8 @@ CONFIG_STMMAC_ETH=y
# CONFIG_INPUT_MOUSEDEV is not set
# CONFIG_INPUT_KEYBOARD is not set
# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AXP20X_PEK=y
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_SUN4I=y
CONFIG_SERIAL_8250=y
@@ -82,6 +84,7 @@ CONFIG_SUNXI_WATCHDOG=y
CONFIG_MFD_AXP20X=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_AXP20X=y
CONFIG_REGULATOR_GPIO=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y