diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-03-23 20:05:33 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-03-23 20:10:52 -0700 |
| commit | ad3fef79873eeacc8a6337d95df125e81df0a0a2 (patch) | |
| tree | 9c421453d1bd522f00942c6ee27c7a20b3269836 | |
| parent | 89f6f0211edb9e6c4e5ecafbf1c3581134117e53 (diff) | |
| parent | a734d0a9d2b31af6e583b74153081d058abe0e8c (diff) | |
| download | olio-linux-3.10-ad3fef79873eeacc8a6337d95df125e81df0a0a2.tar.xz olio-linux-3.10-ad3fef79873eeacc8a6337d95df125e81df0a0a2.zip | |
Merge branch 'android-3.10-bringup' of ssh://internal.oliodevices.com:29418/kernel/omap into mattis_dev
Change-Id: I7b6e248dea163a73056513b14f1cd401bba95ed6
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 4 | ||||
| -rw-r--r-- | drivers/power/bq27x00_battery.c | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 5505b893ddc..6270437b4d2 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -536,9 +536,13 @@ static int __init omap3_h1_i2c_init(void) omap_register_i2c_bus(1, 400, omap3h1_i2c1_board_info, ARRAY_SIZE(omap3h1_i2c1_board_info)); #ifdef CONFIG_MACH_OMAP3_H1_DVT2 omap_register_i2c_bus(2, 400, omap3h1_i2c2_board_info, ARRAY_SIZE(omap3h1_i2c2_board_info)); +#else + omap_register_i2c_bus(2, 400, NULL, 0); #endif #ifdef CONFIG_MACH_OMAP3_H1_EVT1 omap_register_i2c_bus(3, 400, omap3h1_i2c3_board_info, ARRAY_SIZE(omap3h1_i2c3_board_info)); +#else + omap_register_i2c_bus(3, 400, NULL, 0); #endif return 0; } diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c index 98fa8abcae7..7bed61e6229 100644 --- a/drivers/power/bq27x00_battery.c +++ b/drivers/power/bq27x00_battery.c @@ -391,12 +391,12 @@ static __initdata enum power_supply_property bq276xx_battery_props[] = { * Customize these values and, if necessary, add more based on system needs. */ static struct dm_reg bq274xx_dm_regs[] = { - {82, 0, 2, 1000}, /* Qmax */ + {82, 0, 2, 16384}, /* Qmax */ {82, 5, 1, 0x81}, /* Load Select */ - {82, 10, 2, 1340}, /* Design Capacity */ - {82, 12, 2, 3700}, /* Design Energy */ - {82, 16, 2, 3250}, /* Terminate Voltage */ - {82, 27, 2, 110}, /* Taper rate */ + {82, 10, 2, 300}, /* Design Capacity */ + {82, 12, 2, 1140}, /* Design Energy */ + {82, 16, 2, 3090}, /* Terminate Voltage */ + {82, 27, 2, 40}, /* Taper rate */ }; static struct dm_reg bq276xx_dm_regs[] = { |