diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2012-05-29 21:52:31 -0700 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-06-06 06:08:44 -0700 |
| commit | 42ba0490d883d7d0d1cfa3ad55b725964c57345d (patch) | |
| tree | 2b05f2ec0ce4e1b3fcba9092e24be5b9eeddef70 /arch/arm/mach-tegra/board-kai-sensors.c | |
| parent | 397a74a2d13e7f93504a72476271f517be5a6ca1 (diff) | |
arm: tegra: board-files: remove usage of TEGRA_GPIO_TO_IRQ
we've moved to IRQ domains, and need to use gpio_to_irq
instead of TEGRA_GPIO_TO_IRQ to get correct results.
See commit 6f74dc9bc8de41f3de474a7269a70921e773c40f
Change-Id: Ieb7c3e5d2a9bd0f4c83881b16fbd617babf41950
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Signed-off-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-on: http://git-master/r/106362
Tested-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-kai-sensors.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-kai-sensors.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/board-kai-sensors.c b/arch/arm/mach-tegra/board-kai-sensors.c index e03e973c6e82..2f6f54dc249e 100644 --- a/arch/arm/mach-tegra/board-kai-sensors.c +++ b/arch/arm/mach-tegra/board-kai-sensors.c @@ -125,7 +125,7 @@ static int kai_nct1008_init(void) /* FIXME: enable irq when throttling is supported */ kai_i2c4_nct1008_board_info[0].irq = - TEGRA_GPIO_TO_IRQ(KAI_TEMP_ALERT_GPIO); + gpio_to_irq(KAI_TEMP_ALERT_GPIO); ret = gpio_request(KAI_TEMP_ALERT_GPIO, "temp_alert"); if (ret < 0) { @@ -287,23 +287,16 @@ static struct ext_slave_platform_data mpu_compass_data = { static struct i2c_board_info __initdata inv_mpu_i2c0_board_info[] = { { I2C_BOARD_INFO(MPU_GYRO_NAME, MPU_GYRO_ADDR), - .irq = TEGRA_GPIO_TO_IRQ(MPU_GYRO_IRQ_GPIO), .platform_data = &mpu_gyro_data, }, #if (MPU_GYRO_TYPE == MPU_TYPE_MPU3050) { I2C_BOARD_INFO(MPU_ACCEL_NAME, MPU_ACCEL_ADDR), -#if MPU_ACCEL_IRQ_GPIO - .irq = TEGRA_GPIO_TO_IRQ(MPU_ACCEL_IRQ_GPIO), -#endif .platform_data = &mpu_accel_data, }, #endif { I2C_BOARD_INFO(MPU_COMPASS_NAME, MPU_COMPASS_ADDR), -#if MPU_COMPASS_IRQ_GPIO - .irq = TEGRA_GPIO_TO_IRQ(MPU_COMPASS_IRQ_GPIO), -#endif .platform_data = &mpu_compass_data, }, }; @@ -311,6 +304,7 @@ static struct i2c_board_info __initdata inv_mpu_i2c0_board_info[] = { static void mpuirq_init(void) { int ret = 0; + int i = 0; pr_info("*** MPU START *** mpuirq_init...\n"); @@ -349,6 +343,16 @@ static void mpuirq_init(void) } pr_info("*** MPU END *** mpuirq_init...\n"); + inv_mpu_i2c0_board_info[i++].irq = gpio_to_irq(MPU_GYRO_IRQ_GPIO); +#if (MPU_GYRO_TYPE == MPU_TYPE_MPU3050) +#if MPU_ACCEL_IRQ_GPIO + inv_mpu_i2c0_board_info[i].irq = gpio_to_irq(MPU_ACCEL_IRQ_GPIO); +#endif + i++ +#endif +#if MPU_COMPASS_IRQ_GPIO + inv_mpu_i2c0_board_info[i++].irq = gpio_to_irq(MPU_COMPASS_IRQ_GPIO); +#endif i2c_register_board_info(MPU_GYRO_BUS_NUM, inv_mpu_i2c0_board_info, ARRAY_SIZE(inv_mpu_i2c0_board_info)); } |