aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-11-06 03:06:22 -0500
committerLinus Walleij <linus.walleij@linaro.org>2014-11-06 03:06:22 -0500
commit640e2f13cadba313a0dd3f83136afec09ad407c4 (patch)
treed4a577b06bde5766967497a11e26445c1537fd78 /arch/arm/configs
parent07cc65e3ddcb7d54b3796c5bba037fccc6cb9b90 (diff)
ARM: nomadik: configure in STMPE support
This enables the STMPE MFD, GPIO and keypad support by default on the Nomadik builds. This expander is used on the NDK 15 board. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/nhk8815_defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig
index 783f44c0dfc6..7d2ad30d9e70 100644
--- a/arch/arm/configs/nhk8815_defconfig
+++ b/arch/arm/configs/nhk8815_defconfig
@@ -80,6 +80,7 @@ CONFIG_PPP_SYNC_TTY=m
80CONFIG_INPUT_EVDEV=y 80CONFIG_INPUT_EVDEV=y
81# CONFIG_KEYBOARD_ATKBD is not set 81# CONFIG_KEYBOARD_ATKBD is not set
82CONFIG_KEYBOARD_GPIO=y 82CONFIG_KEYBOARD_GPIO=y
83CONFIG_KEYBOARD_STMPE=y
83# CONFIG_MOUSE_PS2 is not set 84# CONFIG_MOUSE_PS2 is not set
84# CONFIG_SERIO is not set 85# CONFIG_SERIO is not set
85# CONFIG_LEGACY_PTYS is not set 86# CONFIG_LEGACY_PTYS is not set
@@ -89,7 +90,9 @@ CONFIG_HW_RANDOM=y
89CONFIG_I2C_CHARDEV=y 90CONFIG_I2C_CHARDEV=y
90CONFIG_I2C_GPIO=y 91CONFIG_I2C_GPIO=y
91CONFIG_DEBUG_GPIO=y 92CONFIG_DEBUG_GPIO=y
93CONFIG_GPIO_STMPE=y
92# CONFIG_HWMON is not set 94# CONFIG_HWMON is not set
95CONFIG_MFD_STMPE=y
93CONFIG_REGULATOR=y 96CONFIG_REGULATOR=y
94CONFIG_MMC=y 97CONFIG_MMC=y
95# CONFIG_MMC_BLOCK_BOUNCE is not set 98# CONFIG_MMC_BLOCK_BOUNCE is not set