summaryrefslogtreecommitdiffstats
path: root/config-armv7-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2015-09-14 11:50:12 +0100
committerJosh Boyer <jwboyer@fedoraproject.org>2015-09-15 09:26:48 -0400
commite06aa27ce7d1fe4301e85788600bd0e31459d9ea (patch)
tree772f98f6f5ee40cd1262ce20a732ebef53187d04 /config-armv7-generic
parenta8089a3aba84b389af65493f02fab38c0714cd91 (diff)
downloadkernel-e06aa27ce7d1fe4301e85788600bd0e31459d9ea.tar.gz
kernel-e06aa27ce7d1fe4301e85788600bd0e31459d9ea.tar.xz
kernel-e06aa27ce7d1fe4301e85788600bd0e31459d9ea.zip
Minor ARMv7/aarch64 config updates
Diffstat (limited to 'config-armv7-generic')
-rw-r--r--config-armv7-generic10
1 files changed, 6 insertions, 4 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index 63efd958e..9079e0a06 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -199,14 +199,18 @@ CONFIG_GPIO_PCA953X=m
CONFIG_GPIO_PCF857X=m
CONFIG_TOUCHSCREEN_SUN4I=m
CONFIG_MFD_AXP20X=y
-CONFIG_REGULATOR_AXP20X=m
CONFIG_AXP288_FUEL_GAUGE=m
+CONFIG_AXP288_ADC=m
+CONFIG_EXTCON_AXP288=m
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_AXP288_CHARGER=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
CONFIG_IR_SUNXI=m
CONFIG_MDIO_SUN4I=m
CONFIG_DWMAC_SUNXI=m
CONFIG_SUN4I_EMAC=m
CONFIG_RTC_DRV_SUN6I=m
-CONFIG_AXP288_ADC=m
CONFIG_MTD_NAND_SUNXI=m
CONFIG_SERIO_SUN4I_PS2=m
CONFIG_KEYBOARD_SUN4I_LRADC=m
@@ -899,7 +903,6 @@ CONFIG_R8188EU=m
# CONFIG_PMIC_DA903X is not set
# CONFIG_PMIC_ADP5520 is not set
# CONFIG_INPUT_REGULATOR_HAPTIC is not set
-# CONFIG_INPUT_AXP20X_PEK is not set
# CONFIG_POWER_RESET_BRCMSTB is not set
# CONFIG_INPUT_TPS65218_PWRBUTTON is not set
# CONFIG_CLK_QORIQ is not set
@@ -907,7 +910,6 @@ CONFIG_R8188EU=m
# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
# CONFIG_SND_SOC_APQ8016_SBC is not set
# CONFIG_SND_SOC_TAS571X is not set
-# CONFIG_EXTCON_AXP288 is not set
# Debug options. We need to deal with them at some point like x86
# CONFIG_DEBUG_USER is not set