Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10

This commit is contained in:
陈亮
2014-05-26 23:35:41 -07:00

View File

@@ -369,11 +369,11 @@
dc_det_gpio = <&gpio0 GPIO_B0 GPIO_ACTIVE_LOW>;
bat_low_gpio = <&gpio0 GPIO_A7 GPIO_ACTIVE_LOW>;
chg_ok_gpio = <&gpio0 GPIO_B1 GPIO_ACTIVE_HIGH>;
bat_config_info = <0x15 0x2A 0x58 0x57 0x51 0x5F 0x4C 0x45 0x47 0x45 0x48 0x4C 0x47 0x36
0x2B 0x24 0x1E 0x16 0x16 0x17 0x1D 0x28 0x3B 0x4B 0x46 0x23 0x0D 0x71
0x41 0x62 0x5F 0x6E 0x6F 0x6F 0x6E 0x72 0x41 0x1B 0x30 0x22 0x01 0x21
0x52 0x87 0x8F 0x91 0x94 0x52 0x82 0x8C 0x92 0x96 0x12 0x70 0x8F 0xCB
0x2F 0x7D 0x72 0xA5 0xB5 0xC1 0x1F 0x21>;
bat_config_info = <0x15 0x81 0x5D 0x5C 0x58 0x5B 0x57 0x4B 0x49 0x4A 0x46 0x43 0x41
0x3A 0x38 0x30 0x26 0x1E 0x16 0x18 0x1C 0x2C 0x43 0x46 0x3C 0x93
0x09 0x9A 0x1A 0x33 0x6C 0x6E 0x6F 0x6D 0x6B 0x6C 0x3D 0x1C 0x61
0xB4 0x13 0x3F 0x52 0x87 0x8F 0x91 0x94 0x52 0x82 0x8C 0x92 0x96
0x87 0x95 0xC2 0xCB 0x2F 0x7D 0x72 0xA5 0xB5 0xC1 0x27 0x69>;
is_dc_charge = <1>;
is_usb_charge = <0>;
};