diff options
| author | vsalve <vsalve@nvidia.com> | 2011-03-09 17:42:43 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-03-10 19:53:13 -0800 |
| commit | 6ef90dd552195da7e26907d2ee3f6a13368594ad (patch) | |
| tree | 0a91b610589e5a3362bcabb5772e694066892f6b /arch | |
| parent | 4f81118e6afb1658fc5061d16f53fb5fb168683a (diff) | |
Invensense MPU code update to v3.3.3tegra-11.2.ER1
Cherry-pick changes from http://git-master/r/#change,22109
Change-Id: I72cd31a441dcfbd5f5ffbbc956b7074f093c843c
Reviewed-on: http://git-master/r/22211
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-ventana-sensors.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/board-ventana-sensors.c b/arch/arm/mach-tegra/board-ventana-sensors.c index 030c348e3b52..5bbba54ddc0f 100644 --- a/arch/arm/mach-tegra/board-ventana-sensors.c +++ b/arch/arm/mach-tegra/board-ventana-sensors.c @@ -262,14 +262,14 @@ static struct i2c_board_info ventana_i2c8_board_info[] = { }, }; -#ifdef CONFIG_SENSORS_MPU3050 +#ifdef CONFIG_MPU_SENSORS_MPU3050 #define SENSOR_MPU_NAME "mpu3050" static struct mpu3050_platform_data mpu3050_data = { .int_config = 0x10, .orientation = { 0, -1, 0, -1, 0, 0, 0, 0, -1 }, /* Orientation matrix for MPU on ventana */ .level_shifter = 0, .accel = { -#ifdef CONFIG_SENSORS_KXTF9_MPU +#ifdef CONFIG_MPU_SENSORS_KXTF9 .get_slave_descr = get_accel_slave_descr, #else .get_slave_descr = NULL, @@ -281,7 +281,7 @@ static struct mpu3050_platform_data mpu3050_data = { }, .compass = { -#ifdef CONFIG_SENSORS_AK8975_MPU +#ifdef CONFIG_MPU_SENSORS_AK8975 .get_slave_descr = get_compass_slave_descr, #else .get_slave_descr = NULL, @@ -319,7 +319,7 @@ int __init ventana_sensors_init(void) #ifdef CONFIG_SENSORS_AK8975 ventana_akm8975_init(); #endif -#ifdef CONFIG_SENSORS_MPU3050 +#ifdef CONFIG_MPU_SENSORS_MPU3050 ventana_mpuirq_init(); #endif ventana_camera_init(); @@ -353,7 +353,7 @@ int __init ventana_sensors_init(void) ARRAY_SIZE(ventana_i2c8_board_info)); -#ifdef CONFIG_SENSORS_MPU3050 +#ifdef CONFIG_MPU_SENSORS_MPU3050 i2c_register_board_info(0, mpu3050_i2c0_boardinfo, ARRAY_SIZE(mpu3050_i2c0_boardinfo)); #endif |