shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-19 03:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity
270,273 Commits 55 Branches 2,486 Tags
024dbf593e79fe0d95b04fb9052d75fdb680e924
Commit Graph

431 Commits

Author SHA1 Message Date
许盛飞
e5d4ce84a6 adc_battery:the bug otg can not identification host 2012-12-21 09:58:16 +08:00
许盛飞
9604070d4d adc-battery: otg cannot identification 2012-12-17 16:48:29 +08:00
许盛飞
ef2086a0a8 battery: adc-battery improve 2012-12-04 09:58:15 +08:00
许盛飞
4d9a68ab70 the function get_msc_connect_flag change to get_gadget_connect_flag 2012-11-15 14:24:09 +08:00
许盛飞
3398342781 adc-battery: add battery-power decision method when reboot the system 2012-11-07 11:46:01 +08:00
许盛飞
46a12b137e adc_factory: return -EINVAL if fail to register and init 2012-11-03 11:44:19 +08:00
许盛飞
48598921a8 rk2928 rk30: support usb charging 2012-10-30 10:10:03 +08:00
kfx
d7d623dd14 adc_factory: return -EINVAL if fail to register adc channel 2012-10-23 18:44:24 +08:00
许盛飞
960de98ea4 the bug of detection charging 2012-10-17 15:32:28 +08:00
许盛飞
5e57f0150b rk2928 : add interface for adc_battery 2012-10-17 11:26:01 +08:00
许盛飞
249086bfe6 rk30:add interface for rk30_adc_battery 2012-10-17 09:50:42 +08:00
许盛飞
d983215487 update the ADC_BATTERY for mid 2012-09-28 17:02:08 +08:00
lyx
241f34b5e3 charger display: use late_initcall 
[问题描述]
万利达项目的dc_det脚开机时不稳定，不接充电器的时候开机存在误判断进入充电界面

[修改说明]
延迟进入充电界面的判断，等待dc_det脚状态稳定，解决问题
 2012-09-27 18:57:19 +08:00
许盛飞
25209cf23c rk3066B: support the adc_battery for 3066B 2012-09-26 15:55:18 +08:00
黄涛
bda24bec17 power: test_power: fix map_ac_online 2012-09-26 14:39:36 +08:00
黄涛
b2be450f10 Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb 
Conflicts:
	include/net/cfg80211.h
 2012-08-21 14:14:24 +08:00
ywj
3161f4afe4 amend DEVICE_ATTR of rk30_factory_adc_battery for cts 2012-08-17 11:32:40 +08:00
ywj
c353c8fed9 new add rk30_factory_adc_battery driver for factorytool 2012-08-16 14:29:57 +08:00
黄涛
a6ea2fea1e Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb 2012-07-24 12:02:49 +08:00
许盛飞
84499f3021 rk30☎️ the battery power display about the system resume 2012-07-20 10:45:52 +08:00
黄涛
30be6d7972 Merge remote-tracking branch 'common/android-3.0' into develop-3.0-jb 
Conflicts:
	drivers/cpufreq/cpufreq_interactive.c
	drivers/misc/pmem.c
	drivers/net/usb/asix.c
	drivers/net/wireless/ath/ath9k/ani.c
	drivers/net/wireless/ath/ath9k/ar5008_phy.c
	drivers/net/wireless/ath/ath9k/ar9002_hw.c
	drivers/net/wireless/ath/ath9k/ar9003_calib.c
	drivers/net/wireless/ath/ath9k/ar9003_mac.c
	drivers/net/wireless/ath/ath9k/ar9003_phy.h
	drivers/net/wireless/ath/ath9k/calib.c
	drivers/net/wireless/ath/ath9k/hif_usb.c
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/hw.h
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/ath9k/rc.c
	drivers/net/wireless/ath/ath9k/recv.c
	drivers/net/wireless/b43/main.c
	drivers/net/wireless/bcm4319/aiutils.c
	drivers/net/wireless/bcm4319/bcmsdh.c
	drivers/net/wireless/bcm4319/bcmsdh_linux.c
	drivers/net/wireless/bcm4319/bcmsdh_sdmmc.c
	drivers/net/wireless/bcm4319/bcmsdh_sdmmc_linux.c
	drivers/net/wireless/bcm4319/bcmutils.c
	drivers/net/wireless/bcm4319/dhd_common.c
	drivers/net/wireless/bcm4319/dhd_proto.h
	drivers/net/wireless/bcm4319/dhd_sdio.c
	drivers/net/wireless/bcm4319/hndpmu.c
	drivers/net/wireless/bcm4319/include/aidmp.h
	drivers/net/wireless/bcm4319/include/bcmcdc.h
	drivers/net/wireless/bcm4319/include/bcmdefs.h
	drivers/net/wireless/bcm4319/include/bcmdevs.h
	drivers/net/wireless/bcm4319/include/bcmendian.h
	drivers/net/wireless/bcm4319/include/bcmpcispi.h
	drivers/net/wireless/bcm4319/include/bcmperf.h
	drivers/net/wireless/bcm4319/include/bcmsdbus.h
	drivers/net/wireless/bcm4319/include/bcmsdh.h
	drivers/net/wireless/bcm4319/include/bcmsdh_sdmmc.h
	drivers/net/wireless/bcm4319/include/bcmsdpcm.h
	drivers/net/wireless/bcm4319/include/bcmsdspi.h
	drivers/net/wireless/bcm4319/include/bcmsdstd.h
	drivers/net/wireless/bcm4319/include/bcmspi.h
	drivers/net/wireless/bcm4319/include/bcmutils.h
	drivers/net/wireless/bcm4319/include/bcmwifi.h
	drivers/net/wireless/bcm4319/include/dhdioctl.h
	drivers/net/wireless/bcm4319/include/epivers.h
	drivers/net/wireless/bcm4319/include/hndpmu.h
	drivers/net/wireless/bcm4319/include/hndrte_armtrap.h
	drivers/net/wireless/bcm4319/include/hndrte_cons.h
	drivers/net/wireless/bcm4319/include/hndsoc.h
	drivers/net/wireless/bcm4319/include/linux_osl.h
	drivers/net/wireless/bcm4319/include/linuxver.h
	drivers/net/wireless/bcm4319/include/miniopt.h
	drivers/net/wireless/bcm4319/include/msgtrace.h
	drivers/net/wireless/bcm4319/include/osl.h
	drivers/net/wireless/bcm4319/include/packed_section_end.h
	drivers/net/wireless/bcm4319/include/packed_section_start.h
	drivers/net/wireless/bcm4319/include/pcicfg.h
	drivers/net/wireless/bcm4319/include/proto/802.11e.h
	drivers/net/wireless/bcm4319/include/proto/802.1d.h
	drivers/net/wireless/bcm4319/include/proto/bcmeth.h
	drivers/net/wireless/bcm4319/include/proto/bcmevent.h
	drivers/net/wireless/bcm4319/include/proto/bcmip.h
	drivers/net/wireless/bcm4319/include/proto/eapol.h
	drivers/net/wireless/bcm4319/include/proto/ethernet.h
	drivers/net/wireless/bcm4319/include/proto/sdspi.h
	drivers/net/wireless/bcm4319/include/proto/vlan.h
	drivers/net/wireless/bcm4319/include/proto/wpa.h
	drivers/net/wireless/bcm4319/include/sbchipc.h
	drivers/net/wireless/bcm4319/include/sbconfig.h
	drivers/net/wireless/bcm4319/include/sbhnddma.h
	drivers/net/wireless/bcm4319/include/sbpcmcia.h
	drivers/net/wireless/bcm4319/include/sbsdio.h
	drivers/net/wireless/bcm4319/include/sbsdpcmdev.h
	drivers/net/wireless/bcm4319/include/sbsocram.h
	drivers/net/wireless/bcm4319/include/sdio.h
	drivers/net/wireless/bcm4319/include/sdioh.h
	drivers/net/wireless/bcm4319/include/sdiovar.h
	drivers/net/wireless/bcm4319/include/siutils.h
	drivers/net/wireless/bcm4319/include/trxhdr.h
	drivers/net/wireless/bcm4319/include/typedefs.h
	drivers/net/wireless/bcm4319/siutils.c
	drivers/net/wireless/bcm4319/wl_iw.c
	drivers/net/wireless/bcm4319/wl_iw.h
	drivers/net/wireless/bcmdhd/Kconfig
	drivers/net/wireless/bcmdhd/Makefile
	drivers/net/wireless/bcmdhd/bcmevent.c
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_cdc.c
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/dhd_wlfc.h
	drivers/net/wireless/bcmdhd/include/Makefile
	drivers/net/wireless/bcmdhd/include/htsf.h
	drivers/net/wireless/bcmdhd/include/proto/802.11.h
	drivers/net/wireless/bcmdhd/include/proto/802.11_bta.h
	drivers/net/wireless/bcmdhd/include/proto/bt_amp_hci.h
	drivers/net/wireless/bcmdhd/include/proto/p2p.h
	drivers/net/wireless/bcmdhd/include/wlfc_proto.h
	drivers/net/wireless/bcmdhd/include/wlioctl.h
	drivers/net/wireless/bcmdhd/linux_osl.c
	drivers/net/wireless/bcmdhd/wl_android.c
	drivers/net/wireless/bcmdhd/wl_android.h
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.h
	drivers/net/wireless/bcmdhd/wl_cfgp2p.c
	drivers/net/wireless/bcmdhd/wl_cfgp2p.h
	drivers/net/wireless/bcmdhd/wl_linux_mon.c
	drivers/net/wireless/bcmdhd/wldev_common.c
	drivers/net/wireless/bcmdhd/wldev_common.h
	drivers/net/wireless/ipw2x00/ipw2200.c
	drivers/net/wireless/iwlwifi/iwl-agn-lib.c
	drivers/net/wireless/iwlwifi/iwl-agn-tx.c
	drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-agn.h
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-hcmd.c
	drivers/net/wireless/iwlwifi/iwl-rx.c
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/libertas/if_spi.c
	drivers/net/wireless/p54/p54spi.c
	drivers/net/wireless/rt2x00/rt2800lib.c
	drivers/net/wireless/rt2x00/rt2800pci.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt2x00.h
	drivers/net/wireless/rt2x00/rt2x00dev.c
	drivers/net/wireless/rt2x00/rt2x00mac.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/usb/serial/option.c
 2012-07-12 18:08:01 +08:00
许盛飞
a823ab919a rk30☎️ the bug of charge_display 2012-07-09 20:01:42 +08:00
许盛飞
a6fd7f7fb5 rk30:sdk:change load order order 2012-07-09 10:01:02 +08:00
张晴
30d38160f8 rk30:phone:support pmic tps80032 vbat low detection,support pmic tps80032 early suspend 2012-07-09 09:49:32 +08:00
许盛飞
9e94d2b544 rk30:sdk: update power calculation method 2012-07-06 18:02:17 +08:00
许盛飞
5114a79469 rk30:sdk: add lowpower check 2012-07-05 16:45:17 +08:00
许盛飞
f40781fe3e rk30:sdk: add wakelock when charging 2012-07-04 17:46:35 +08:00
许盛飞
3c4e394f15 phone :RK30:phone: the bug of battery indicator 2012-06-15 10:25:25 +08:00
张晴
22e9b8cfde rk30:phone loquat:modify the battery capacity reported 2012-06-03 11:28:35 +08:00
张晴
3317f45d6b rk30:phone loquat:modify the pmu battery charger work quenes 2012-05-28 19:46:44 +08:00
张晴
5541fd205e rk30:phone loquat:supply the PMU usb charge 2012-05-22 20:47:57 +08:00
许盛飞
20fa9b336b rk29: adc bat bug 2012-05-18 15:14:52 +08:00
许盛飞
4ddee2e7cc rk30: perfect information of Single battery 2012-05-17 18:12:49 +08:00
许盛飞
904428e6ee rk29: modify the bug of adc_charge 2012-05-15 15:54:00 +08:00
张晴
0692923d2a rk30:phone:add sleep,battery charger,powerbutton ,gpadc and poweroff for TI pmu 80032 2012-05-09 15:01:06 +08:00
张晴
7fdb181c23 rk30:phone:modify the config file and add battery function 2012-05-07 16:17:52 +08:00
张晴
035e3ba750 rk30:sdk:Support wm8326 adc for low battery detection 2012-05-03 13:50:32 +08:00
Todd Poynor
94225ab0be Merge linux-stable 3.0.28 into android-3.0 
Change-Id: Iee820738e53627f5d0447a87ceff34443aa72786
Signed-off-by: Todd Poynor <toddpoynor@google.com>
 2012-04-19 15:20:03 -07:00
许盛飞
eb6c74bdfe add rk30 adc battery checker 2012-04-19 16:03:03 +08:00
许盛飞
fa673b3f3d modify the bug of adc_charge 2012-03-14 10:40:02 +08:00
hzf
4aa04aa8dc Revert "td8801:add charger display for phone" 
This reverts commit 40d5af25eb.
 2012-02-13 10:42:18 +08:00
hzf
b9bad3d526 td8801:add battery dispplay 2012-02-13 10:32:30 +08:00
hzf
40d5af25eb td8801:add charger display for phone 2012-02-13 10:32:30 +08:00
lw
a4ec9a50e7 a22:fix buiding error 2012-02-01 14:43:23 +08:00
lw
b55a7eeb64 fix wm831x building warning 2012-01-16 11:42:48 +08:00
许盛飞
7483ee6232 wm831x_power: add charger display support 2012-01-04 21:42:05 +08:00
许盛飞
161540c8cc power_supply: add charger display 2012-01-04 21:28:24 +08:00
许盛飞
525611c6dc power_supply: add rk29 adc battery driver 2012-01-04 21:03:46 +08:00
张昊
44d7c4c0d2 wm831x:fix building error 2011-11-18 10:44:59 +08:00
Clifton Barnes
b97cdd64ca drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal 
commit 0e053fcbbb upstream.

Fixes the deadlock when inserting and removing the ds2780.

Signed-off-by: Clifton Barnes <cabarnes@indesign-llc.com>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 2011-11-11 09:36:32 -08:00