diff options
| author | Evan Wilson <evan@oliodevices.com> | 2014-12-27 23:43:04 -0800 |
|---|---|---|
| committer | Evan Wilson <evan@oliodevices.com> | 2014-12-27 23:43:04 -0800 |
| commit | fbc4a25b83cf2edb54bc45630fda6b72b58343f9 (patch) | |
| tree | 36ba084a7cddd1a763fa54d9448d5a6a83f5ad76 | |
| parent | a4cce73301c2ce0c7def300680928fc2166bafbf (diff) | |
| download | olio-linux-3.10-fbc4a25b83cf2edb54bc45630fda6b72b58343f9.tar.xz olio-linux-3.10-fbc4a25b83cf2edb54bc45630fda6b72b58343f9.zip | |
board-omap3h1: Update for the Olio EVT2 board
WARNING: this will break functionality on the older EVT1 boards
Change-Id: I2bbbdbd04edb5cca7c6f99727065828b4694b427
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 6b31b13217c..9364dc4e709 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -217,6 +217,7 @@ static struct regulator_init_data tps65910_1v8 = { .valid_modes_mask = REGULATOR_MODE_NORMAL, .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE, .always_on = true, + .apply_uV = true, }, }; @@ -270,7 +271,7 @@ static struct tps65910_board omap3h1_tps65910_pdata = { .tps65910_pmic_init_data[TPS65910_REG_VAUX1] = &tps65910_dummy, .tps65910_pmic_init_data[TPS65910_REG_VAUX2] = &tps65910_3v3, .tps65910_pmic_init_data[TPS65910_REG_VAUX33] = &tps65910_3v3, - .tps65910_pmic_init_data[TPS65910_REG_VMMC] = &tps65910_dummy, + .tps65910_pmic_init_data[TPS65910_REG_VMMC] = &tps65910_3v3, }; static struct i2c_board_info __initdata omap3h1_i2c1_board_info[] = { @@ -293,9 +294,6 @@ static struct i2c_board_info __initdata omap3h1_i2c1_board_info[] = { I2C_BOARD_INFO("mXT224", 0x4a), .platform_data = &mxt_data, }, -}; - -static struct i2c_board_info __initdata omap3h1_i2c3_board_info[] = { { I2C_BOARD_INFO("bq274xx", 0x55), }, @@ -307,7 +305,7 @@ static int __init omap3_h1_i2c_init(void) omap3h1_i2c1_board_info[3].irq = gpio_to_irq(ATMEL_MXT_GPIO); omap_register_i2c_bus(1, 400, omap3h1_i2c1_board_info, ARRAY_SIZE(omap3h1_i2c1_board_info)); - omap_register_i2c_bus(3, 400, omap3h1_i2c3_board_info, ARRAY_SIZE(omap3h1_i2c3_board_info)); + //omap_register_i2c_bus(3, 400, omap3h1_i2c3_board_info, ARRAY_SIZE(omap3h1_i2c3_board_info)); return 0; } |