zyc
5d9d0370bd
rk312x : cif : cif driver v0.0x1.7
2014-09-23 16:51:32 +08:00
zwl
bd01d6ee47
rk fb: remove set win state at rk_fb_pan_display
2014-09-22 21:37:49 +08:00
zwl
19372cb111
Revert "rk312x:dts: revert code to recovery lcdc io sleep pinctrl to fix white screen when resume"
...
This reverts commit 27c40940f7
2014-09-22 21:10:39 +08:00
zwl
aee15a2c77
Revert "rk312x:lvds: add pull down lcdc io when the first time of system suspend"
...
This reverts commit ab3978515a
2014-09-22 21:09:46 +08:00
zwl
ab3978515a
rk312x:lvds: add pull down lcdc io when the first time of system suspend
2014-09-22 20:50:15 +08:00
hjc
c916bd0190
rk3036 hdmi: update CSC code style
2014-09-22 18:11:28 +08:00
roger
0c5ac925e3
Merge remote-tracking branch 'rk/develop-3.10' into develop-3.10
2014-09-22 15:33:13 +08:00
roger
46dcf30869
ethernet:gmac: avoid pinctrl operation after a spin lock is acquired in suspend and resume
2014-09-22 15:31:15 +08:00
lintao
67decff741
mmc: fix low-end gpio-debounce detection failed dpm suspend
2014-09-22 15:10:08 +08:00
roger
269d928b5c
ethernet:gmac: enable PHY vendors's driver
2014-09-22 14:37:01 +08:00
roger
77009753a6
ethernet:gmac: fix the bug of connection failure with PHY because of wrong phy_addr
2014-09-22 14:30:24 +08:00
hjh
0489b64db4
rk3128 box：temp ctrl added in dts.
2014-09-22 14:16:10 +08:00
hjc
72f51bac1e
rk3036 lcdc: add support hwc layer
2014-09-22 14:06:00 +08:00
zhangqing
ada6a02d04
rk3288:pmic:ricoh619:correct fuel_gauge for 99%-100% when sleep
2014-09-22 14:03:07 +08:00
hjc
d1c8b6180a
rk hdmi: add node to get TV audio&video info
2014-09-22 11:13:42 +08:00
lintao
1c912e0e91
mmc: add atomic operation for register
2014-09-22 10:17:20 +08:00
zwl
27c40940f7
rk312x:dts: revert code to recovery lcdc io sleep pinctrl to fix white screen when resume
2014-09-22 09:39:11 +08:00
zwl
3b58dafd77
rk fb: fix complie error when CONFIG_ROCKCHIP_IOMMU is not set
2014-09-21 10:29:05 +08:00
lintao
d9a820a163
mmc: schedule out rescan flow for confilicting with ehci reset
...
Signed-off-by: lintao <lintao@rock-chips.com >
2014-09-20 16:59:44 +08:00
lintao
c901d947ae
mmc: cd-gpio: wakeup system wheter debounce or not
...
Signed-off-by: lintao <lintao@rock-chips.com >
2014-09-20 15:39:02 +08:00
li bing
43b8f3cc02
Wifi: rtl8812au wifi support.
2014-09-19 16:36:10 +08:00
zyc
651397146e
camsys_drv: v0.0x17.0
2014-09-19 16:08:35 +08:00
lyz
85554161e1
usb: fix typo
2014-09-19 15:40:57 +08:00
lyz
5c977f1c64
usb: rk312x support usb charger detect
2014-09-19 15:37:26 +08:00
zhangqing
7c8d2e7bae
rk312x:clk:select gpll_div2 when set apll,set aclk_core div
2014-09-19 14:41:13 +08:00
zwl
19f00072b7
rk3288 lcdc: add read default xvir and vir_stride
2014-09-19 14:33:34 +08:00
lintao
e4ad383ea8
mmc: unnecessary to dynamic request and release slave chn.
2014-09-19 14:23:51 +08:00
hjh
6c1ccc0f66
rk3128 box: update gpu dvfs
2014-09-19 14:19:18 +08:00
dkl
fcabb239dc
regulator: move pmu act8931 driver to kernel 3.10
...
Signed-off-by: dkl <dkl@rock-chips.com >
2014-09-19 11:13:51 +08:00
lintao
40b8aabbae
mmc: edmac: reinit pll30 slave channel when resume
...
Signed-off-by: lintao <lintao@rock-chips.com >
2014-09-19 10:20:18 +08:00
lyz
0c8d2d7806
HSIC: fix compilation error
...
usbdev_rk32.c: In function 'rk_hsic_soft_reset':
usbdev_rk32.c:438: error: storage size of 'rst_hsic_a' isn't known
usbdev_rk32.c:438: error: storage size of 'rst_hsic_p' isn't known
2014-09-19 08:50:47 +08:00
zwl
b78f49231e
rk fb: modify update the frame buffer of extend screen at the moment of hdmi insert
2014-09-18 21:15:20 +08:00
lintao
550a29f0cf
mmc: rk3126: add wakeup event for SD insert/remove in deep sleep
...
Signed-off-by: lintao <lintao@rock-chips.com >
2014-09-18 19:59:31 +08:00
zwl
d2a3adf0f9
rk fb: fix primary screen display flicker at the moment of hdmi insert
2014-09-18 19:52:13 +08:00
zyc
947157fbfb
camsys_drv: v0.0x16.0
2014-09-18 18:40:35 +08:00
陈亮
d8b42855b3
ddr_freq: select suspend rate if both suspend and video_4k status are set
...
Signed-off-by: 陈亮 <cl@rock-chips.com >
2014-09-18 03:08:14 -07:00
hjc
7f38d87f1b
rk312x lcdc: hwc layer test ok
2014-09-18 17:46:49 +08:00
陈亮
eb7e8235cf
rk312x: correct clk_ddr rate
...
Signed-off-by: 陈亮 <cl@rock-chips.com >
2014-09-18 02:33:31 -07:00
郭毅
7f087aa86d
tb_8846:dts: remove goodix-ts's node
2014-09-18 17:14:41 +08:00
zwl
51ea5dee5e
rk fb:
...
1. fix extend screen display error when CONFIG_ROCKCHIP_IOMMU is set at DUAL disp mode
2. fix extend screen display error when uboot-display is on at DUAL disp mode
2014-09-18 16:36:37 +08:00
Luowei
4013e49d8c
spi:fix bug of initial clock division
2014-09-18 14:53:57 +08:00
hjh
c56c050a02
rk3128 : box : update box dts
2014-09-18 14:27:35 +08:00
许盛飞
87fe882ad8
rk312x: add GPIO3_C1 for pmic_sleep
...
Signed-off-by: 许盛飞 <xsf@rock-chips.com >
2014-09-18 10:05:06 +08:00
ddl
51b573ba61
camsys_drv: v0.0x15.0 camsys_head: v0.9.0
2014-09-18 09:57:37 +08:00
wlf
ad9774c22b
USB: fix compilation warning
2014-09-17 19:23:52 +08:00
Minsung Kim
38050da31a
cpufreq: fix sleeping in atomic context when realloc freq_table for all_time_in_state
...
Commit 40cf2f8#50
Backtrace:
[<c0012270>] (dump_backtrace+0x0/0x10c) from [<c001256c>] (show_stack+0x18/0x1c)
r6:ffff1788 r5:c0c020c0 r4:e609c000 r3:00000000
[<c0012554>] (show_stack+0x0/0x1c) from [<c07a2970>] (dump_stack+0x20/0x28)
[<c07a2950>] (dump_stack+0x0/0x28) from [<c0057678>] (__might_sleep+0x104/0x120)
[<c0057574>] (__might_sleep+0x0/0x120) from [<c00ff000>] (__kmalloc_track_caller+0x144/0x274)
r6:00000000 r5:e609c000 r4:e6802140
[<c00feebc>] (__kmalloc_track_caller+0x0/0x274) from [<c00da098>] (krealloc+0x58/0xb0)
[<c00da040>] (krealloc+0x0/0xb0) from [<c050266c>] (cpufreq_allstats_create+0x120/0x204)
r8:e4c4ff00 r7:c0d266b8 r6:0013d620 r5:e4c4e600 r4:00000001
r3:e535d6d0
[<c050254c>] (cpufreq_allstats_create+0x0/0x204) from [<c0502e38>] (cpufreq_stat_notifier_policy+0xb8/0xd0)
[<c0502d80>] (cpufreq_stat_notifier_policy+0x0/0xd0) from [<c00517cc>] (notifier_call_chain+0x4c/0x8c)
r5:00000000 r4:fffffffe
[<c0051780>] (notifier_call_chain+0x0/0x8c) from [<c00519fc>] (__blocking_notifier_call_chain+0x50/0x68)
r8:c0cd4d00 r7:00000002 r6:e609dd7c r5:ffffffff r4:c0d25a4c
r3:ffffffff
[<c00519ac>] (__blocking_notifier_call_chain+0x0/0x68) from [<c0051a34>] (blocking_notifier_call_chain+0x20/0x28)
r7:c0e24f30 r6:00000000 r5:e53e1e00 r4:e609dd7c
[<c0051a14>] (blocking_notifier_call_chain+0x0/0x28) from [<c0500fec>] (__cpufreq_set_policy+0xc0/0x1d0)
[<c0500f2c>] (__cpufreq_set_policy+0x0/0x1d0) from [<c0501308>] (cpufreq_add_dev_interface+0x20c/0x270)
r7:00000008 r6:00000000 r5:e53e1e00 r4:e53e1e58
[<c05010fc>] (cpufreq_add_dev_interface+0x0/0x270) from [<c05016a8>] (cpufreq_add_dev+0x33c/0x420)
[<c050136c>] (cpufreq_add_dev+0x0/0x420) from [<c03604a4>] (subsys_interface_register+0x80/0xbc)
[<c0360424>] (subsys_interface_register+0x0/0xbc) from [<c050035c>] (cpufreq_register_driver+0x8c/0x194)
Change-Id: If77a656d0ea60a8fc4083283d104509fa6c07f8f
Signed-off-by: Minsung Kim <ms925.kim@samsung.com >
(cherry picked from commit 3c9e49908b
2014-09-17 18:27:47 +08:00
黄涛
ac48b4bb1e
mmc: fix compilation warning caused by commit 7b9586b50c
2014-09-17 17:50:13 +08:00
黄涛
c2370f8872
ARM: rockchip: printk.c: fix compilation warning
2014-09-17 16:41:04 +08:00
黄涛
3837431566
input: keyboard: rk_keys: fix compilation warning
2014-09-17 16:38:10 +08:00
Chen Gang
6decef03e1
mm/page_alloc.c: use '__paginginit' instead of '__init'
...
set_pageblock_order() may be called when memory hotplug, so need use
'__paginginit' instead of '__init'.
The related warning:
The function __meminit .free_area_init_node() references
a function __init .set_pageblock_order().
If .set_pageblock_order is only used by .free_area_init_node then
annotate .set_pageblock_order with a matching annotation.
Signed-off-by: Chen Gang <gang.chen@asianux.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
(cherry picked from commit 15ca220e1a
2014-09-17 16:30:08 +08:00
