diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-04-28 12:00:44 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-04-28 12:11:36 -0700 |
| commit | a8b4c3e436848b4d85b7189785912e6e63ec3451 (patch) | |
| tree | c36eae05f72877ea221e2ab03e44bea117b481be /arch | |
| parent | dc2be70fdf8fdfaaba8303755615d6d04a330520 (diff) | |
| download | olio-linux-3.10-a8b4c3e436848b4d85b7189785912e6e63ec3451.tar.xz olio-linux-3.10-a8b4c3e436848b4d85b7189785912e6e63ec3451.zip | |
Adding driver for Cappellas cm3391 ALS, and setting up boardfile and configuration to make use of it.
Change-Id: I29b001f88bffe9a74c712bcb4bb12d2e56e1f7d6
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/omap3_h1_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig index 46d74964197..866a78d904e 100644 --- a/arch/arm/configs/omap3_h1_defconfig +++ b/arch/arm/configs/omap3_h1_defconfig @@ -2494,7 +2494,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 # # CONFIG_ADJD_S311 is not set # CONFIG_CM32181 is not set -# CONFIG_CM3391 is not set +CONFIG_CM3391=y # CONFIG_SENSORS_TSL2563 is not set # CONFIG_VCNL4000 is not set diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index df2d785e59e..4e01a52f9b5 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -737,7 +737,7 @@ static struct i2c_board_info __initdata omap3h1_i2c2_board_info[] = { .platform_data = &mxt_data, }, { - I2C_BOARD_INFO("cm32181", 0x10), + I2C_BOARD_INFO("cm3391", 0x10), }, #ifdef CONFIG_MACH_OMAP3_H1_EVT1 }; |