zwl [Mon, 22 Sep 2014 13:10:39 +0000 (21:10 +0800)]
Revert "rk312x:dts: revert code to recovery lcdc io sleep pinctrl to fix white screen when resume"
This reverts commit
27c40940f7e5defb2a472703721c16865ff0dc00.
zwl [Mon, 22 Sep 2014 13:09:46 +0000 (21:09 +0800)]
Revert "rk312x:lvds: add pull down lcdc io when the first time of system suspend"
This reverts commit
ab3978515aeb5f845af17134950808bedbfbcd07.
zwl [Mon, 22 Sep 2014 12:50:06 +0000 (20:50 +0800)]
rk312x:lvds: add pull down lcdc io when the first time of system suspend
hjc [Mon, 22 Sep 2014 10:10:07 +0000 (18:10 +0800)]
rk3036 hdmi: update CSC code style
roger [Mon, 22 Sep 2014 07:33:13 +0000 (15:33 +0800)]
Merge remote-tracking branch 'rk/develop-3.10' into develop-3.10
roger [Mon, 22 Sep 2014 07:31:15 +0000 (15:31 +0800)]
ethernet:gmac: avoid pinctrl operation after a spin lock is acquired in suspend and resume
lintao [Mon, 22 Sep 2014 07:09:28 +0000 (15:09 +0800)]
mmc: fix low-end gpio-debounce detection failed dpm suspend
roger [Mon, 22 Sep 2014 06:37:01 +0000 (14:37 +0800)]
ethernet:gmac: enable PHY vendors's driver
roger [Mon, 22 Sep 2014 06:30:24 +0000 (14:30 +0800)]
ethernet:gmac: fix the bug of connection failure with PHY because of wrong phy_addr
hjh [Mon, 22 Sep 2014 06:15:41 +0000 (14:15 +0800)]
rk3128 box：temp ctrl added in dts.
hjc [Mon, 22 Sep 2014 06:00:18 +0000 (14:00 +0800)]
rk3036 lcdc: add support hwc layer
zhangqing [Mon, 22 Sep 2014 06:03:07 +0000 (14:03 +0800)]
rk3288:pmic:ricoh619:correct fuel_gauge for 99%-100% when sleep
hjc [Mon, 22 Sep 2014 03:13:11 +0000 (11:13 +0800)]
rk hdmi: add node to get TV audio&video info
lintao [Mon, 22 Sep 2014 02:14:03 +0000 (10:14 +0800)]
mmc: add atomic operation for register
zwl [Mon, 22 Sep 2014 01:39:11 +0000 (09:39 +0800)]
rk312x:dts: revert code to recovery lcdc io sleep pinctrl to fix white screen when resume
zwl [Sun, 21 Sep 2014 02:29:05 +0000 (10:29 +0800)]
rk fb: fix complie error when CONFIG_ROCKCHIP_IOMMU is not set
lintao [Sat, 20 Sep 2014 08:59:44 +0000 (16:59 +0800)]
mmc: schedule out rescan flow for confilicting with ehci reset
Signed-off-by: lintao <lintao@rock-chips.com>
lintao [Sat, 20 Sep 2014 07:37:49 +0000 (15:37 +0800)]
mmc: cd-gpio: wakeup system wheter debounce or not
Signed-off-by: lintao <lintao@rock-chips.com>
li bing [Fri, 19 Sep 2014 08:33:15 +0000 (16:33 +0800)]
Wifi: rtl8812au wifi support.
zyc [Fri, 19 Sep 2014 08:08:35 +0000 (16:08 +0800)]
camsys_drv: v0.0x17.0
lyz [Fri, 19 Sep 2014 07:40:57 +0000 (15:40 +0800)]
usb: fix typo
lyz [Fri, 19 Sep 2014 07:37:09 +0000 (15:37 +0800)]
usb: rk312x support usb charger detect
zhangqing [Fri, 19 Sep 2014 06:41:13 +0000 (14:41 +0800)]
rk312x:clk:select gpll_div2 when set apll,set aclk_core div
zwl [Fri, 19 Sep 2014 06:33:15 +0000 (14:33 +0800)]
rk3288 lcdc: add read default xvir and vir_stride
lintao [Fri, 19 Sep 2014 06:17:09 +0000 (14:17 +0800)]
mmc: unnecessary to dynamic request and release slave chn.
hjh [Fri, 19 Sep 2014 06:18:46 +0000 (14:18 +0800)]
rk3128 box: update gpu dvfs
dkl [Fri, 19 Sep 2014 02:46:25 +0000 (10:46 +0800)]
regulator: move pmu act8931 driver to kernel 3.10
Signed-off-by: dkl <dkl@rock-chips.com>
lintao [Fri, 19 Sep 2014 02:18:37 +0000 (10:18 +0800)]
mmc: edmac: reinit pll30 slave channel when resume
Signed-off-by: lintao <lintao@rock-chips.com>
lyz [Fri, 19 Sep 2014 00:48:27 +0000 (08:48 +0800)]
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
zwl [Thu, 18 Sep 2014 13:14:29 +0000 (21:14 +0800)]
rk fb: modify update the frame buffer of extend screen at the moment of hdmi insert
lintao [Thu, 18 Sep 2014 11:59:31 +0000 (19:59 +0800)]
mmc: rk3126: add wakeup event for SD insert/remove in deep sleep
Signed-off-by: lintao <lintao@rock-chips.com>
zwl [Thu, 18 Sep 2014 11:51:43 +0000 (19:51 +0800)]
rk fb: fix primary screen display flicker at the moment of hdmi insert
zyc [Thu, 18 Sep 2014 10:40:35 +0000 (18:40 +0800)]
camsys_drv: v0.0x16.0
陈亮 [Thu, 18 Sep 2014 10:07:49 +0000 (03:07 -0700)]
ddr_freq: select suspend rate if both suspend and video_4k status are set
Signed-off-by: 陈亮 <cl@rock-chips.com>
hjc [Thu, 18 Sep 2014 09:45:51 +0000 (17:45 +0800)]
rk312x lcdc: hwc layer test ok
陈亮 [Thu, 18 Sep 2014 09:32:51 +0000 (02:32 -0700)]
rk312x: correct clk_ddr rate
Signed-off-by: 陈亮 <cl@rock-chips.com>
郭毅 [Thu, 18 Sep 2014 09:14:41 +0000 (17:14 +0800)]
tb_8846:dts: remove goodix-ts's node
zwl [Thu, 18 Sep 2014 08:31:36 +0000 (16:31 +0800)]
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
Luowei [Thu, 18 Sep 2014 06:53:57 +0000 (14:53 +0800)]
spi:fix bug of initial clock division
hjh [Thu, 18 Sep 2014 06:27:01 +0000 (14:27 +0800)]
rk3128 : box : update box dts
许盛飞 [Thu, 18 Sep 2014 02:05:06 +0000 (10:05 +0800)]
rk312x: add GPIO3_C1 for pmic_sleep
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
ddl [Thu, 18 Sep 2014 01:57:37 +0000 (09:57 +0800)]
camsys_drv: v0.0x15.0 camsys_head: v0.9.0
wlf [Wed, 17 Sep 2014 11:23:52 +0000 (19:23 +0800)]
USB: fix compilation warning
Minsung Kim [Wed, 25 Jun 2014 10:44:50 +0000 (19:44 +0900)]
cpufreq: fix sleeping in atomic context when realloc freq_table for all_time_in_state
Commit
40cf2f8 (cpufreq: Persist cpufreq time in state data across hotplug)
causes the following call trace to be spit on boot:
BUG: sleeping function called from invalid context at mm/slub.c:936
in_atomic(): 1, irqs_disabled(): 0, pid: 1, name: swapper/0
CPU: 6 PID: 1 Comm: swapper/0 Not tainted
3.10.9-20140624.172707-eng-gd6c0f69-dirty #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
3c9e49908b882631f3737022e707ffddf0b7c230)
黄涛 [Wed, 17 Sep 2014 09:50:13 +0000 (17:50 +0800)]
mmc: fix compilation warning caused by commit
7b9586b50c56956fdf132c19c8ba4cd64449d678
黄涛 [Wed, 17 Sep 2014 08:41:04 +0000 (16:41 +0800)]
ARM: rockchip: printk.c: fix compilation warning
黄涛 [Wed, 17 Sep 2014 08:38:10 +0000 (16:38 +0800)]
input: keyboard: rk_keys: fix compilation warning
Chen Gang [Wed, 11 Sep 2013 21:20:27 +0000 (14:20 -0700)]
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
15ca220e1a63af06e000691e4ae1beaba5430c32)
lyz [Tue, 9 Sep 2014 01:32:14 +0000 (09:32 +0800)]
usb: dwc_otg: prevent sleeping function called from atomic context
Disable _local_ irq make no sense here and we don't really need
it, if we need to disable usb irqs from dwc_otg call func
dwc_otg_disable_global_interrupts() can be more useful.
yxj [Wed, 17 Sep 2014 06:37:12 +0000 (14:37 +0800)]
dts:rk3126-86v:usb_control: mask GPIO2_B4&GPIO2_B6
these two gpios are mux for LCDC_D10/D12
yxj [Wed, 17 Sep 2014 06:24:18 +0000 (14:24 +0800)]
dts:rk3126-86v: fb: add node rockchip,uboot-logo-on
set this node to 1 will enable boot logo display in uboot
CMY [Wed, 17 Sep 2014 06:27:56 +0000 (14:27 +0800)]
rk: bt: support HCIUART_LL protocol by default
ddl [Wed, 17 Sep 2014 03:26:57 +0000 (11:26 +0800)]
camsys_drv: v0.0x14.0
陈亮 [Wed, 17 Sep 2014 02:59:17 +0000 (19:59 -0700)]
rk312x: update dvfs table, remove gpu 480M
Signed-off-by: 陈亮 <cl@rock-chips.com>
gwl [Wed, 17 Sep 2014 02:41:33 +0000 (10:41 +0800)]
BT: add bt mac address user-defined function.
陈亮 [Wed, 17 Sep 2014 02:37:34 +0000 (19:37 -0700)]
rk312x: always enable jtab clk
Signed-off-by: 陈亮 <cl@rock-chips.com>
gwl [Wed, 17 Sep 2014 01:36:44 +0000 (09:36 +0800)]
Wifi: add wifi mac address user-defined function.
陈亮 [Wed, 17 Sep 2014 01:38:14 +0000 (18:38 -0700)]
rk3126-86v: add temperature control config
Signed-off-by: 陈亮 <cl@rock-chips.com>
陈亮 [Wed, 17 Sep 2014 01:34:33 +0000 (18:34 -0700)]
dvfs: add virtual temperature control
Signed-off-by: 陈亮 <cl@rock-chips.com>
陈亮 [Wed, 17 Sep 2014 01:17:27 +0000 (18:17 -0700)]
tsadc: define INVALID_TEMP and return it when some err happen
Signed-off-by: 陈亮 <cl@rock-chips.com>
黄涛 [Tue, 16 Sep 2014 12:01:51 +0000 (20:01 +0800)]
ARM: rockchip: rockchip_defconfig: update by savedefconfig and remove unused ethernet config
黄涛 [Tue, 16 Sep 2014 11:51:43 +0000 (19:51 +0800)]
ARM: rockchip: rk3288 set system serial when efuse init
yxj [Tue, 16 Sep 2014 10:41:19 +0000 (18:41 +0800)]
dts:rk3126-sdk:default disable uboot-logo-on
this must match with uboot
gwl [Tue, 16 Sep 2014 09:06:34 +0000 (17:06 +0800)]
Wifi: add rtl8192cu & rtl8192du wifi support.
lintao [Tue, 16 Sep 2014 03:31:51 +0000 (11:31 +0800)]
fix compile error
lintao [Tue, 16 Sep 2014 01:57:21 +0000 (09:57 +0800)]
mmc: guarantee enough time-gap between any two sequential tuning cmd
Signed-off-by: lintao <lintao@rock-chips.com>
yxj [Tue, 16 Sep 2014 01:56:32 +0000 (09:56 +0800)]
dts:rk3126-sdk:enable uboot-logo-on
yxj [Tue, 16 Sep 2014 01:47:17 +0000 (09:47 +0800)]
rk312x lcdc:support uboot display logo
simon [Tue, 16 Sep 2014 01:46:47 +0000 (09:46 +0800)]
rockchip: iommu: workround for rk312x vop iommu
1.disable request 312x vop iommu
2.mask 312x vop iommu intterurpt
3.disable rk312x stall operation when zap iommu tlb cache
hjc [Tue, 16 Sep 2014 01:21:03 +0000 (09:21 +0800)]
rk3036 hdmi: fix rgb2rgb csc error
zwl [Mon, 15 Sep 2014 11:48:39 +0000 (19:48 +0800)]
rk312x 86v:dtsi: fix lcdc io have voltage when system suspend
黄涛 [Mon, 15 Sep 2014 11:02:03 +0000 (19:02 +0800)]
ARM: rockchip: remove unused code
zwl [Mon, 15 Sep 2014 10:12:53 +0000 (18:12 +0800)]
rk312x:dts: fix lcdc io have voltage when suspend
zyc [Mon, 15 Sep 2014 10:19:44 +0000 (18:19 +0800)]
rk312x : cif : cif driver v0.0x1.6
gwl [Mon, 15 Sep 2014 09:09:28 +0000 (17:09 +0800)]
Wifi: add wifi power control configration [keep_wifi_power_on].
heyun [Mon, 15 Sep 2014 08:01:01 +0000 (16:01 +0800)]
Merge branch 'develop-3.10'
heyun [Mon, 15 Sep 2014 07:58:40 +0000 (15:58 +0800)]
remove rk3126_86v_defconfig
hjc [Mon, 15 Sep 2014 07:33:16 +0000 (15:33 +0800)]
rk312x lcdc: update bcsh pash
hjc [Mon, 15 Sep 2014 07:11:10 +0000 (15:11 +0800)]
rk3036 hdmi: power down hdmi power domain when suspend
hjh [Mon, 15 Sep 2014 06:59:15 +0000 (14:59 +0800)]
rk3128 box：mmc: fix dts cd-gpio setting
xhh [Sat, 13 Sep 2014 03:22:51 +0000 (11:22 +0800)]
86v:电池检测，摄像头的整理修改
xhh [Thu, 4 Sep 2014 08:50:58 +0000 (16:50 +0800)]
86v:merge change for 86v
Luowei [Fri, 12 Sep 2014 12:30:01 +0000 (20:30 +0800)]
spi:add spi dts for rk312x
hjc [Fri, 12 Sep 2014 09:44:03 +0000 (17:44 +0800)]
rk3036 hdmi: fix hdmi display error when TV power down and power up
lintao [Fri, 12 Sep 2014 10:06:18 +0000 (18:06 +0800)]
mmc: move cap with hs200 to caps
Signed-off-by: lintao <lintao@rock-chips.com>
许盛飞 [Fri, 12 Sep 2014 09:39:45 +0000 (17:39 +0800)]
rk312x: for the bug of suspend-resume
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
gwl [Fri, 12 Sep 2014 09:35:24 +0000 (17:35 +0800)]
Wifi: add rtl8723au & rtl8723bu wifi support.
zwl [Fri, 12 Sep 2014 06:36:07 +0000 (14:36 +0800)]
rk3288:dtsi: fix rockchip.pwr18 prop spelling mistake at lcdc dt node
gwl [Fri, 12 Sep 2014 06:19:34 +0000 (14:19 +0800)]
WiFi: add rtl8189es/etv support, Optimization wifi configuration.
zwl [Fri, 12 Sep 2014 06:10:44 +0000 (14:10 +0800)]
rk312x:lcdc: fix the color gradation of screen display if use dither down mode when resume
陈亮 [Fri, 12 Sep 2014 01:18:34 +0000 (18:18 -0700)]
rk312x: enable jtag clk by rockchip_jtag_enabled
Signed-off-by: 陈亮 <cl@rock-chips.com>
hjc [Fri, 12 Sep 2014 01:03:55 +0000 (09:03 +0800)]
rk312x dtsi: lvds status depend on dts file
许盛飞 [Thu, 11 Sep 2014 11:12:26 +0000 (19:12 +0800)]
adc-battery: add adc-battery
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
wdc [Thu, 11 Sep 2014 11:12:27 +0000 (19:12 +0800)]
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
wdc [Thu, 11 Sep 2014 11:10:31 +0000 (19:10 +0800)]
rk3036: change pll bypass to powerdown
hjc [Thu, 11 Sep 2014 10:29:29 +0000 (18:29 +0800)]
rk3036 hdmi: show kernel logo
hjc [Thu, 11 Sep 2014 10:29:02 +0000 (18:29 +0800)]
rk312x lcdc: if output_color is YUV color,vop should open bcsh r2y
li bing [Thu, 11 Sep 2014 09:50:06 +0000 (17:50 +0800)]
wifi->8089: update the firmware.
hjc [Thu, 11 Sep 2014 08:00:35 +0000 (16:00 +0800)]
rk312x lcdc: add support hwc lut update
lintao [Thu, 11 Sep 2014 07:02:16 +0000 (15:02 +0800)]
mmc: workaround DDR mmc devices internal divider bug
Signed-off-by: lintao <lintao@rock-chips.com>
projects / firefly-linux-kernel-4.4.55.git / log