diff options
| -rw-r--r-- | arch/arm/mach-tegra/board-loki-power.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-loki-sensors.c | 34 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-loki.h | 9 |
3 files changed, 10 insertions, 38 deletions
diff --git a/arch/arm/mach-tegra/board-loki-power.c b/arch/arm/mach-tegra/board-loki-power.c index 914fa07deb5a..2b7d61da6050 100644 --- a/arch/arm/mach-tegra/board-loki-power.c +++ b/arch/arm/mach-tegra/board-loki-power.c @@ -89,7 +89,7 @@ static struct regulator_consumer_supply palmas_smps8_supply[] = { REGULATOR_SUPPLY("vdd_1v8_eeprom", NULL), REGULATOR_SUPPLY("vddio_cam", "tegra_camera"), REGULATOR_SUPPLY("vddio_cam", "vi"), - REGULATOR_SUPPLY("vlogic", "0-0069"), + REGULATOR_SUPPLY("vlogic", "0-0068"), REGULATOR_SUPPLY("vid", "0-000c"), REGULATOR_SUPPLY("vddio", "0-0077"), REGULATOR_SUPPLY("dvdd_lcd", NULL), @@ -122,8 +122,6 @@ static struct regulator_consumer_supply palmas_ldo1_supply[] = { }; static struct regulator_consumer_supply palmas_ldo2_supply[] = { - REGULATOR_SUPPLY("vdd", "0-0069"), - REGULATOR_SUPPLY("vdd", "0-0039"), REGULATOR_SUPPLY("avdd_lcd", NULL), }; @@ -149,6 +147,7 @@ static struct regulator_consumer_supply palmas_ldo6_supply[] = { REGULATOR_SUPPLY("vdd", "0-000c"), REGULATOR_SUPPLY("vdd", "0-0077"), REGULATOR_SUPPLY("vdd", "0-004c"), + REGULATOR_SUPPLY("vdd", "0-0068"), }; static struct regulator_consumer_supply palmas_ldo8_supply[] = { diff --git a/arch/arm/mach-tegra/board-loki-sensors.c b/arch/arm/mach-tegra/board-loki-sensors.c index aee7b462e893..1564c9c6ad5e 100644 --- a/arch/arm/mach-tegra/board-loki-sensors.c +++ b/arch/arm/mach-tegra/board-loki-sensors.c @@ -39,7 +39,7 @@ #include "cpu-tegra.h" /* MPU board file definition */ -static struct mpu_platform_data mpu9250_gyro_data = { +static struct mpu_platform_data mpu6050_gyro_data = { .int_config = 0x10, .level_shifter = 0, /* Located in board_[platformname].h */ @@ -49,33 +49,11 @@ static struct mpu_platform_data mpu9250_gyro_data = { 0x00, 0x34, 0x0D, 0x65, 0x32, 0xE9, 0x94, 0x89}, }; -static struct mpu_platform_data mpu_compass_data = { - .orientation = MPU_COMPASS_ORIENTATION, - .config = NVI_CONFIG_BOOT_MPU, -}; - -static struct mpu_platform_data mpu_bmp_pdata = { - .config = NVI_CONFIG_BOOT_MPU, -}; -static struct i2c_board_info __initdata inv_mpu9250_i2c0_board_info[] = { +static struct i2c_board_info __initdata inv_mpu6050_i2c0_board_info[] = { { I2C_BOARD_INFO(MPU_GYRO_NAME, MPU_GYRO_ADDR), - .platform_data = &mpu9250_gyro_data, - }, - { - /* The actual BMP180 address is 0x77 but because this conflicts - * with another device, this address is hacked so Linux will - * call the driver. The conflict is technically okay since the - * BMP180 is behind the MPU. Also, the BMP180 driver uses a - * hard-coded address of 0x77 since it can't be changed anyway. - */ - I2C_BOARD_INFO(MPU_BMP_NAME, MPU_BMP_ADDR), - .platform_data = &mpu_bmp_pdata, - }, - { - I2C_BOARD_INFO(MPU_COMPASS_NAME, MPU_COMPASS_ADDR), - .platform_data = &mpu_compass_data, + .platform_data = &mpu6050_gyro_data, }, }; @@ -103,9 +81,9 @@ static void mpuirq_init(void) } pr_info("*** MPU END *** mpuirq_init...\n"); - inv_mpu9250_i2c0_board_info[0].irq = gpio_to_irq(MPU_GYRO_IRQ_GPIO); - i2c_register_board_info(gyro_bus_num, inv_mpu9250_i2c0_board_info, - ARRAY_SIZE(inv_mpu9250_i2c0_board_info)); + inv_mpu6050_i2c0_board_info[0].irq = gpio_to_irq(MPU_GYRO_IRQ_GPIO); + i2c_register_board_info(gyro_bus_num, inv_mpu6050_i2c0_board_info, + ARRAY_SIZE(inv_mpu6050_i2c0_board_info)); } struct jsa1127_platform_data jsa1127_platform_data = { diff --git a/arch/arm/mach-tegra/board-loki.h b/arch/arm/mach-tegra/board-loki.h index fef7f6dcda38..9783bbfa9fe4 100644 --- a/arch/arm/mach-tegra/board-loki.h +++ b/arch/arm/mach-tegra/board-loki.h @@ -35,16 +35,11 @@ int loki_suspend_init(void); int loki_pmon_init(void); /* Invensense MPU Definitions */ -#define MPU_GYRO_NAME "mpu6050c" -#define MPU_GYRO_IRQ_GPIO TEGRA_GPIO_PS0 +#define MPU_GYRO_NAME "mpu6050" +#define MPU_GYRO_IRQ_GPIO TEGRA_GPIO_PR2 #define MPU_GYRO_ADDR 0x68 #define MPU_GYRO_BUS_NUM 0 #define MPU_GYRO_ORIENTATION MTMAT_TOP_CCW_0 -#define MPU_COMPASS_NAME "ak8975" -#define MPU_COMPASS_ADDR 0x0C -#define MPU_COMPASS_ORIENTATION MTMAT_BOT_CCW_270 -#define MPU_BMP_NAME "bmp280" -#define MPU_BMP_ADDR 0x77 /* PCA954x I2C bus expander bus addresses */ #define PCA954x_I2C_BUS_BASE 6 |