arm: tegra: roth: change board sensors for roth
Erik Lilliebjerg [Tue, 13 Nov 2012 14:08:08 +0000 (07:08 -0700)]
- add MPU6050 (remove MPU9150)
- remove light sensor

Bug 1163074

Reviewed-on: http://git-master/r/163766
(cherry picked from commit c7604f2e22deca05f172d00db40a0d7ab4f84aea)
Change-Id: Ie963cdd53383e1fe9cb9e76531c9cb11d2b674ea
Signed-off-by: Erik Lilliebjerg <elilliebjerg@nvidia.com>
Signed-off-by: Vikram Kanigiri <vkanigiri@nvidia.com>
Reviewed-on: http://git-master/r/164869
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>

arch/arm/mach-tegra/board-roth-sensors.c
arch/arm/mach-tegra/board-roth.h

index ab3f54e..4f11925 100644 (file)
@@ -111,21 +111,11 @@ static struct mpu_platform_data mpu9150_gyro_data = {
        .level_shifter  = 0,
        /* Located in board_[platformname].h */
        .orientation    = MPU_GYRO_ORIENTATION,
-       .sec_slave_type = SECONDARY_SLAVE_TYPE_COMPASS,
-       .sec_slave_id   = COMPASS_ID_AK8975,
-       .secondary_i2c_addr     = MPU_COMPASS_ADDR,
-       .secondary_read_reg     = 0x06,
-       .secondary_orientation  = MPU_COMPASS_ORIENTATION,
+       .sec_slave_type = SECONDARY_SLAVE_TYPE_NONE,
        .key            = {0x4E, 0xCC, 0x7E, 0xEB, 0xF6, 0x1E, 0x35, 0x22,
                           0x00, 0x34, 0x0D, 0x65, 0x32, 0xE9, 0x94, 0x89},
 };
 
-static struct i2c_board_info roth_i2c_board_info_cm3218[] = {
-       {
-               I2C_BOARD_INFO("cm3218", 0x48),
-       },
-};
-
 static struct i2c_board_info __initdata inv_mpu9150_i2c2_board_info[] = {
        {
                I2C_BOARD_INFO(MPU_GYRO_NAME, MPU_GYRO_ADDR),
@@ -329,9 +319,6 @@ int __init roth_sensors_init(void)
 
        mpuirq_init();
 
-       i2c_register_board_info(0, roth_i2c_board_info_cm3218,
-               ARRAY_SIZE(roth_i2c_board_info_cm3218));
-
        i2c_register_board_info(0, bq20z45_pdata,
                ARRAY_SIZE(bq20z45_pdata));
 
index 4fe21ee..120657e 100644 (file)
@@ -74,7 +74,7 @@
 #define TOUCH_GPIO_RST_RAYDIUM_SPI      TEGRA_GPIO_PK4
 
 /* Invensense MPU Definitions */
-#define MPU_GYRO_NAME           "mpu9150"
+#define MPU_GYRO_NAME           "mpu6050"
 #define MPU_GYRO_IRQ_GPIO       TEGRA_GPIO_PR3
 #define MPU_GYRO_ADDR           0x69
 #define MPU_GYRO_BUS_NUM        0