summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-whistler-sensors.c
diff options
context:
space:
mode:
authorPrashant Gaikwad <pgaikwad@nvidia.com>2011-01-27 18:36:06 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:46:24 -0800
commit2f6ad7b593804bf1a6d8d74af37232e5c5ead155 (patch)
treea9fad00609028bfc55b95108eca22911e6aca2ce /arch/arm/mach-tegra/board-whistler-sensors.c
parent4a6c3959cb2995750ca91b2b29d933626ce28df3 (diff)
[ARM] tegra: i2c registration of proximity sensor
Registering ISL29018 als and proximity sensor on GEN1 I2C. Bug 782958 Original-Change-Id: I3848926b3f46d3f13a7fdcc02535f39e80498dea Reviewed-on: http://git-master/r/17203 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com> Rebase-Id: R9ed1dbdc8b30bb72258e1fb900b497c0c0cb8900
Diffstat (limited to 'arch/arm/mach-tegra/board-whistler-sensors.c')
-rw-r--r--arch/arm/mach-tegra/board-whistler-sensors.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-whistler-sensors.c b/arch/arm/mach-tegra/board-whistler-sensors.c
index eb1ea7c0bb0a..d133c6cd6fa5 100644
--- a/arch/arm/mach-tegra/board-whistler-sensors.c
+++ b/arch/arm/mach-tegra/board-whistler-sensors.c
@@ -30,6 +30,7 @@
#define CAMERA_PWNDN2_STROBE_GPIO TEGRA_GPIO_PBB5
#define CAMERA_RESET1_GPIO TEGRA_GPIO_PD2
#define CAMERA_FLASH_GPIO TEGRA_GPIO_PA0
+#define ISL29018_IRQ_GPIO TEGRA_GPIO_PK2
static int whistler_camera_init(void)
{
@@ -90,11 +91,22 @@ static void whistler_adxl34x_init(void)
gpio_direction_input(ADXL34X_IRQ_GPIO);
}
+static void whistler_isl29018_init(void)
+{
+ tegra_gpio_enable(ISL29018_IRQ_GPIO);
+ gpio_request(ISL29018_IRQ_GPIO, "isl29018");
+ gpio_direction_input(ISL29018_IRQ_GPIO);
+}
+
static struct i2c_board_info whistler_i2c1_board_info[] = {
{
I2C_BOARD_INFO("adxl34x", 0x1D),
.irq = TEGRA_GPIO_TO_IRQ(ADXL34X_IRQ_GPIO),
},
+ {
+ I2C_BOARD_INFO("isl29018", 0x44),
+ .irq = TEGRA_GPIO_TO_IRQ(ISL29018_IRQ_GPIO),
+ },
};
int __init whistler_sensors_init(void)
@@ -103,6 +115,8 @@ int __init whistler_sensors_init(void)
whistler_adxl34x_init();
+ whistler_isl29018_init();
+
i2c_register_board_info(0, whistler_i2c1_board_info,
ARRAY_SIZE(whistler_i2c1_board_info));