summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javier.martinez@collabora.co.uk>2015-05-19 13:11:49 +0900
committerArnd Bergmann <arnd@arndb.de>2015-05-22 17:13:43 +0200
commit50bc2ad87c693e7fa1945ad0de91659c772858f0 (patch)
treec3cbe2868f59837084665d9b1d469d06fb0e8e0a /arch/arm/configs
parent56579f52aa37206d211263c253274896e99c6c28 (diff)
ARM: multi_v7_defconfig: Enable GPIO-based I2C arbitration support
The I2C GPIO arbitration driver is used on the Exynos5250 Snow Chromebook to arbitrate the access to a I2C bus by the Application Processor or a EC. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Kukjin Kim <kgene@kernel.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/multi_v7_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index f0b9f11d274e..a4169071bef3 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -281,6 +281,7 @@ CONFIG_SERIAL_ST_ASC_CONSOLE=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_DAVINCI=y
CONFIG_I2C_MUX=y
+CONFIG_I2C_ARB_GPIO_CHALLENGE=m
CONFIG_I2C_MUX_PCA954x=y
CONFIG_I2C_MUX_PINCTRL=y
CONFIG_I2C_AT91=m