aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMathias Nyman <mathias.nyman@nokia.com>2010-08-02 06:18:03 -0400
committerTony Lindgren <tony@atomide.com>2010-08-02 06:18:03 -0400
commit70b5d7377ec8640d5e5ff8c70da218fc20bef0c2 (patch)
treef158829610d30e6ee849bcb80398d6a692f40153 /arch/arm
parent64d066918272db2a851e4884e38f264fd6b3c07b (diff)
omap: tsl2563 ALS support for Nokia N900
This commit will enable usage of tsl2563 ambient light sensor on Nokia N900. Signed-off-by: Ameya Palande <ameya.palande@nokia.com> Signed-off-by: Mathias Nyman <mathias.nyman@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/board-rx51-peripherals.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 3c3f975520e8..a3a396ca2d32 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -35,6 +35,8 @@
35#include <sound/tlv320aic3x.h> 35#include <sound/tlv320aic3x.h>
36#include <sound/tpa6130a2-plat.h> 36#include <sound/tpa6130a2-plat.h>
37 37
38#include <../drivers/staging/iio/light/tsl2563.h>
39
38#include "mux.h" 40#include "mux.h"
39#include "hsmmc.h" 41#include "hsmmc.h"
40 42
@@ -53,6 +55,12 @@ enum {
53 55
54static struct wl12xx_platform_data wl1251_pdata; 56static struct wl12xx_platform_data wl1251_pdata;
55 57
58#if defined(CONFIG_SENSORS_TSL2563) || defined(CONFIG_SENSORS_TSL2563_MODULE)
59static struct tsl2563_platform_data rx51_tsl2563_platform_data = {
60 .cover_comp_gain = 16,
61};
62#endif
63
56static struct omap2_mcspi_device_config wl1251_mcspi_config = { 64static struct omap2_mcspi_device_config wl1251_mcspi_config = {
57 .turbo_mode = 0, 65 .turbo_mode = 0,
58 .single_channel = 1, 66 .single_channel = 1,
@@ -714,6 +722,12 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = {
714 I2C_BOARD_INFO("tlv320aic3x", 0x18), 722 I2C_BOARD_INFO("tlv320aic3x", 0x18),
715 .platform_data = &rx51_aic3x_data, 723 .platform_data = &rx51_aic3x_data,
716 }, 724 },
725#if defined(CONFIG_SENSORS_TSL2563) || defined(CONFIG_SENSORS_TSL2563_MODULE)
726 {
727 I2C_BOARD_INFO("tsl2563", 0x29),
728 .platform_data = &rx51_tsl2563_platform_data,
729 },
730#endif
717 { 731 {
718 I2C_BOARD_INFO("tpa6130a2", 0x60), 732 I2C_BOARD_INFO("tpa6130a2", 0x60),
719 .platform_data = &rx51_tpa6130a2_data, 733 .platform_data = &rx51_tpa6130a2_data,