shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-14 01:20:41 +09:00
Code Issues Packages Projects Releases Wiki Activity
402,015 Commits 55 Branches 2,486 Tags
1e21786dede94de2a9f552928aedb3b1f561977a
Commit Graph

1042 Commits

Author SHA1 Message Date
许盛飞
12bd489d4d chargedisplay: add for adc-battery-driver 
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
 2014-10-17 10:36:52 +08:00
cl
de11a1a0ad rockchip: add gpio_poweroff driver 
Signed-off-by: cl <cl@rock-chips.com>
 2014-10-16 11:13:34 +08:00
张晴
5dc17820ab rk312x:pmic:rt5036:updata drivers to 1.0.9;support hdmi connect to VMID 2014-10-09 14:42:36 +08:00
zhangqing
ada6a02d04 rk3288:pmic:ricoh619:correct fuel_gauge for 99%-100% when sleep 2014-09-22 14:03:07 +08:00
xhh
fdb5231857 86v:电池检测，摄像头的整理修改 2014-09-13 11:22:51 +08:00
许盛飞
e19bdc2a7a adc-battery: add adc-battery 
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
 2014-09-11 19:13:57 +08:00
张晴
1142cc6021 rk312x:pmic:rt5036:support pmic rt5036 drivers 2014-09-11 14:28:23 +08:00
张晴
7d6f3bb0e4 rk312x:rt5025:updata rt5025 drivers to 1.1.1_R 2014-09-01 16:41:07 +08:00
张晴
476cbef830 rk312x:rt5025:support pmic rt5025 2014-08-22 10:01:21 +08:00
黄涛
c7412991e9 Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next 
Conflicts:
	arch/arm/mach-rockchip/vcodec_service.c
	drivers/input/Makefile
 2014-08-08 10:21:50 +08:00
黄涛
fcef60e36f Merge tag 'lsk-v3.10-android-14.07' into develop-3.10 
LSK v3.10 Android 14.07 release

Conflicts:
	drivers/clocksource/arm_arch_timer.c
	lib/Makefile
 2014-08-06 15:34:14 +08:00
许盛飞
acfc8012a6 rk312x: add rk818-battery 
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
 2014-07-30 20:04:14 +08:00
郭毅
6f36aed227 cw201x: shielding unnecessary dev_info 2014-07-18 10:03:20 +08:00
Mark Brown
40329a6815 Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android 
Conflicts:
	net/wireless/nl80211.c
 2014-06-19 11:42:18 +01:00
Todd Poynor
8ee650bdfc power: Add property CHARGE_COUNTER_EXT and 64-bit precision properties 
Add POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT that stores accumulated charge
in nAh units as a signed 64-bit value.

Add generic support for signed 64-bit property values.

Change-Id: I2bd34b1e95ffba24e7bfef81f398f22bd2aaf05e
Signed-off-by: Todd Poynor <toddpoynor@google.com>
 2014-06-17 02:18:07 +00:00
张晴
0cbedcde3c rk3288:pmic:rk808&act8846&ricoh619:fixed msleep to mdelay in shutdown function 2014-06-16 14:39:00 +08:00
郭毅
bf2c6f3634 cw2015_battery : modify some warnings 2014-06-13 11:38:54 +08:00
张晴
a05c3a3973 rk3288:pmic:act8846&syr82x:modify some warnings 2014-06-12 15:38:12 +08:00
张晴
75e9568f06 rk3288:pmic:ricoh619:modify some warnings 2014-06-12 15:33:37 +08:00
张晴
8f8749c359 rk3288:pmic:ricoh619:modify some warning 2014-05-27 09:28:18 +08:00
张晴
50fa88d460 rk3288:pmic:ricoh619:slove reboot i2c error;modify power off;slove fg 100% 2014-05-26 16:32:01 +08:00
张晴
77b2eae948 rk3288:pmic:ricoh619:slove pwrkey missed when wakeup;modify some fg error 2014-05-22 16:53:53 +08:00
张晴
89825aecd4 rk3288:pmu:ricoh619:support charger usb connect to adp;enable clkout2 when init 2014-05-06 14:10:32 +08:00
许盛飞
f575a0f312 RK818: add rk818-battery driver 2014-05-06 11:27:03 +08:00
张晴
de0f0d2cbc rk3288:ricoh619:add dc_det function,add ricoh619.txt 2014-04-29 11:15:29 +08:00
黄涛
0ffd56dafe Merge tag 'lsk-android-14.03' into develop-3.10 
lsk 14.03 Android release
 2014-04-15 12:51:10 +08:00
张晴
d69f6b8301 rk3288:ricoh619&syb827:support pmic ricoh619 and dcdc syb827 2014-04-14 14:39:17 +08:00
黄涛
d93c580979 bq24296_charger: fix probe failed bug, which cause resume panic 2014-04-02 14:24:39 +08:00
黄涛
96ad001270 bq24296: fix reboot warning 
WARNING: at kernel/irq/manage.c:1249 __free_irq+0x88/0x184()
Trying to free already-free IRQ 200
Modules linked in:
CPU: 0 PID: 1 Comm: init Not tainted 3.10.0 #296
[<c0013dc4>] (unwind_backtrace+0x0/0xe0) from [<c00116e0>] (show_stack+0x10/0x14)
[<c00116e0>] (show_stack+0x10/0x14) from [<c002a424>] (warn_slowpath_common+0x4c/0x68)
[<c002a424>] (warn_slowpath_common+0x4c/0x68) from [<c002a4c0>] (warn_slowpath_fmt+0x2c/0x3c)
[<c002a4c0>] (warn_slowpath_fmt+0x2c/0x3c) from [<c0091668>] (__free_irq+0x88/0x184)
[<c0091668>] (__free_irq+0x88/0x184) from [<c00917d8>] (free_irq+0x74/0x98)
[<c00917d8>] (free_irq+0x74/0x98) from [<c0412898>] (i2c_device_shutdown+0x3c/0x44)
[<c0412898>] (i2c_device_shutdown+0x3c/0x44) from [<c02cd184>] (device_shutdown+0x110/0x170)
[<c02cd184>] (device_shutdown+0x110/0x170) from [<c003e948>] (kernel_restart+0xc/0x50)
[<c003e948>] (kernel_restart+0xc/0x50) from [<c003eae4>] (SyS_reboot+0x150/0x1b0)
[<c003eae4>] (SyS_reboot+0x150/0x1b0) from [<c000da00>] (ret_fast_syscall+0x0/0x30)
 2014-04-01 18:31:09 +08:00
张晴
fd3f82cf8b rk3288:bq27320:modify firmware_download 2014-03-28 14:48:06 +08:00
张晴
703cd22d32 rk3288:bq24296:add bq24296 suspend and resume func 2014-03-28 13:51:56 +08:00
yj
e7de6f7109 cw2015: optimizing 2014-03-28 12:20:24 +08:00
yj
e38a482967 bq24296: mod for probabilistic error 2014-03-27 15:05:01 +08:00
张晴
557246bac9 rk3288:bq24296:slove bq24296 reset reg when poweron;set init charger current 2014-03-25 14:13:56 +08:00
yj
c8356f0cd5 cw2015: decrese report battery change 2014-03-25 11:02:51 +08:00
张晴
3e7a8bc24e rk3288:bq24296:add dc_det_pin func,support power on when no usb 2014-03-22 21:23:52 +08:00
张晴
174d0d9268 rk3288:bq24296:set current 2014-03-21 15:52:24 +08:00
yangjie@rock-chips.com
08fced76b5 charge display: support 2014-03-21 15:24:57 +08:00
yangjie@rock-chips.com
52931eb6c5 cw2015: primer version 2014-03-21 15:24:44 +08:00
张晴
cce17ad8a7 rk3288:bq24296:modify bq24296 gpio unvalid 2014-03-21 11:33:21 +08:00
黄涛
22fbc55379 ARM: rockchip: rk3288 workaround temporarily 2014-03-20 23:37:54 +08:00
张晴
b38e601508 rk3288:modify rk808 vabt low error, set charger current 2014-03-20 21:21:08 +08:00
张晴
19f3753f60 rk31:linux3.10:support bq27320 fg and bq24296 charger ic 2014-03-12 15:54:36 +08:00
Alex Shi
a0692dda2a Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-02-27 09:39:31 +08:00
Alex Shi
0a92210a81 Merge tag 'v3.10.32' into linux-linaro-lsk 
This is the 3.10.32 stable release
 2014-02-27 09:12:39 +08:00
Krzysztof Kozlowski
d15d1e0358 power: max17040: Fix NULL pointer dereference when there is no platform_data 
commit ac323d8d80 upstream.

Fix NULL pointer dereference of "chip->pdata" if platform_data was not
supplied to the driver.

The driver during probe stored the pointer to the platform_data:
	chip->pdata = client->dev.platform_data;
Later it was dereferenced in max17040_get_online() and
max17040_get_status().

If platform_data was not supplied, the NULL pointer exception would
happen:

[    6.626094] Unable to handle kernel  of a at virtual address 00000000
[    6.628557] pgd = c0004000
[    6.632868] [00000000] *pgd=66262564
[    6.634636] Unable to handle kernel paging request at virtual address e6262000
[    6.642014] pgd = de468000
[    6.644700] [e6262000] *pgd=00000000
[    6.648265] Internal error: Oops: 5 [#1] PREEMPT SMP ARM
[    6.653552] Modules linked in:
[    6.656598] CPU: 0 PID: 31 Comm: kworker/0:1 Not tainted 3.10.14-02717-gc58b4b4 #505
[    6.664334] Workqueue: events max17040_work
[    6.668488] task: dfa11b80 ti: df9f6000 task.ti: df9f6000
[    6.673873] PC is at show_pte+0x80/0xb8
[    6.677687] LR is at show_pte+0x3c/0xb8
[    6.681503] pc : [<c001b7b8>]    lr : [<c001b774>]    psr: 600f0113
[    6.681503] sp : df9f7d58  ip : 600f0113  fp : 00000009
[    6.692965] r10: 00000000  r9 : 00000000  r8 : dfa11b80
[    6.698171] r7 : df9f7ea0  r6 : e6262000  r5 : 00000000  r4 : 00000000
[    6.704680] r3 : 00000000  r2 : e6262000  r1 : 600f0193  r0 : c05b3750
[    6.711194] Flags: nZCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment kernel
[    6.718485] Control: 10c53c7d  Table: 5e46806a  DAC: 00000015
[    6.724218] Process kworker/0:1 (pid: 31, stack limit = 0xdf9f6238)
[    6.730465] Stack: (0xdf9f7d58 to 0xdf9f8000)
[    6.914325] [<c001b7b8>] (show_pte+0x80/0xb8) from [<c047107c>] (__do_kernel_fault.part.9+0x44/0x74)
[    6.923425] [<c047107c>] (__do_kernel_fault.part.9+0x44/0x74) from [<c001bb7c>] (do_page_fault+0x2c4/0x360)
[    6.933144] [<c001bb7c>] (do_page_fault+0x2c4/0x360) from [<c0008400>] (do_DataAbort+0x34/0x9c)
[    6.941825] [<c0008400>] (do_DataAbort+0x34/0x9c) from [<c000e5d8>] (__dabt_svc+0x38/0x60)
[    6.950058] Exception stack(0xdf9f7ea0 to 0xdf9f7ee8)
[    6.955099] 7ea0: df0c1790 00000000 00000002 00000000 df0c1794 df0c1790 df0c1790 00000042
[    6.963271] 7ec0: df0c1794 00000001 00000000 00000009 00000000 df9f7ee8 c0306268 c0306270
[    6.971419] 7ee0: a00f0113 ffffffff
[    6.974902] [<c000e5d8>] (__dabt_svc+0x38/0x60) from [<c0306270>] (max17040_work+0x8c/0x144)
[    6.983317] [<c0306270>] (max17040_work+0x8c/0x144) from [<c003f364>] (process_one_work+0x138/0x440)
[    6.992429] [<c003f364>] (process_one_work+0x138/0x440) from [<c003fa64>] (worker_thread+0x134/0x3b8)
[    7.001628] [<c003fa64>] (worker_thread+0x134/0x3b8) from [<c00454bc>] (kthread+0xa4/0xb0)
[    7.009875] [<c00454bc>] (kthread+0xa4/0xb0) from [<c000eb28>] (ret_from_fork+0x14/0x2c)
[    7.017943] Code: e1a03005 e2422480 e0826104 e59f002c (e7922104)
[    7.024017] ---[ end trace 73bc7006b9cc5c79 ]---

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Fixes: c6f4a42de6
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2014-02-22 12:41:29 -08:00
Mark Brown
f3401c581c Merge remote-tracking branch 'lsk/v3.10/topic/android-fixes' into linux-linaro-lsk-android 
The cpufreq_interactive changes have been merged upstream and the local
version dropped.

Conflicts:
	drivers/cpufreq/cpufreq_interactive.c
 2013-11-14 15:43:52 +00:00
黄涛
107d3e5358 Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android+android-common-3.10' into develop-3.10 2013-11-11 14:38:40 +08:00
黄涛
e918de9e9f Merge remote-tracking branch 'origin/upstream/android-common-3.10' into linux-linaro-lsk-v3.10-android+android-common-3.10 
Conflicts:
	drivers/cpufreq/cpufreq_interactive.c
 2013-11-11 14:08:00 +08:00
黄涛
ef88c53f60 rk: revert 20f3d0b+v3.0.66 to v3.0 2013-11-08 21:34:05 +08:00