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
lyz
fdad8bbc33
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.
2014-09-17 14:55:12 +08:00
yxj
13154b4b6f
dts:rk3126-86v:usb_control: mask GPIO2_B4&GPIO2_B6
...
these two gpios are mux for LCDC_D10/D12
2014-09-17 14:38:10 +08:00
yxj
21404d1a39
dts:rk3126-86v: fb: add node rockchip,uboot-logo-on
...
set this node to 1 will enable boot logo display in uboot
2014-09-17 14:38:10 +08:00
CMY
4cfda77c79
rk: bt: support HCIUART_LL protocol by default
2014-09-17 14:27:56 +08:00
ddl
7deb93127e
camsys_drv: v0.0x14.0
2014-09-17 11:26:57 +08:00
陈亮
855685ab74
rk312x: update dvfs table, remove gpu 480M
...
Signed-off-by: 陈亮 <cl@rock-chips.com >
2014-09-16 19:59:42 -07:00
gwl
3871ecbe29
BT: add bt mac address user-defined function.
2014-09-17 10:41:38 +08:00
陈亮
24d065d4c0
rk312x: always enable jtab clk
...
Signed-off-by: 陈亮 <cl@rock-chips.com >
2014-09-16 19:37:55 -07:00
gwl
8cfd5b8926
Wifi: add wifi mac address user-defined function.
2014-09-17 09:38:56 +08:00
陈亮
3eb1b59a12
rk3126-86v: add temperature control config
...
Signed-off-by: 陈亮 <cl@rock-chips.com >
2014-09-16 18:38:14 -07:00
陈亮
c1a63c40f0
dvfs: add virtual temperature control
...
Signed-off-by: 陈亮 <cl@rock-chips.com >
2014-09-16 18:34:33 -07:00
陈亮
e0384471e3
tsadc: define INVALID_TEMP and return it when some err happen
...
Signed-off-by: 陈亮 <cl@rock-chips.com >
2014-09-16 18:17:27 -07:00
黄涛
bb50c81be9
ARM: rockchip: rockchip_defconfig: update by savedefconfig and remove unused ethernet config
2014-09-16 20:01:51 +08:00
黄涛
003de5bdd2
ARM: rockchip: rk3288 set system serial when efuse init
2014-09-16 19:52:02 +08:00
yxj
7dd3aa1540
dts:rk3126-sdk:default disable uboot-logo-on
...
this must match with uboot
2014-09-16 18:42:11 +08:00
gwl
837937e8d5
Wifi: add rtl8192cu & rtl8192du wifi support.
2014-09-16 17:06:53 +08:00
lintao
33f9000669
fix compile error
2014-09-16 11:31:51 +08:00
lintao
a5981d0749
mmc: guarantee enough time-gap between any two sequential tuning cmd
...
Signed-off-by: lintao <lintao@rock-chips.com >
2014-09-16 10:05:01 +08:00
yxj
b27697a5b3
dts:rk3126-sdk:enable uboot-logo-on
2014-09-16 09:57:05 +08:00
yxj
914d4a11e7
rk312x lcdc:support uboot display logo
2014-09-16 09:56:55 +08:00
simon
4fada033dc
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
2014-09-16 09:50:30 +08:00
hjc
3a03751fac
rk3036 hdmi: fix rgb2rgb csc error
2014-09-16 09:21:27 +08:00
zwl
8e2e2d49f4
rk312x 86v:dtsi: fix lcdc io have voltage when system suspend
2014-09-15 19:48:54 +08:00
黄涛
616961e8ca
ARM: rockchip: remove unused code
2014-09-15 19:02:03 +08:00
zwl
9d47f07672
rk312x:dts: fix lcdc io have voltage when suspend
2014-09-15 18:13:07 +08:00
zyc
179a335ede
rk312x : cif : cif driver v0.0x1.6
2014-09-15 18:19:44 +08:00
gwl
8da569e3a7
Wifi: add wifi power control configration [keep_wifi_power_on].
2014-09-15 17:09:42 +08:00
heyun
a022323a06
Merge branch 'develop-3.10'
2014-09-15 16:01:05 +08:00
heyun
6cd9311e52
remove rk3126_86v_defconfig
2014-09-15 16:00:22 +08:00
hjc
3d3d816506
rk312x lcdc: update bcsh pash
2014-09-15 15:33:27 +08:00
hjc
8a9f1718ce
rk3036 hdmi: power down hdmi power domain when suspend
2014-09-15 15:33:27 +08:00
hjh
17b353d940
rk3128 box：mmc: fix dts cd-gpio setting
2014-09-15 14:59:41 +08:00
xhh
fdb5231857
86v:电池检测，摄像头的整理修改
2014-09-13 11:22:51 +08:00
xhh
1d65090701
86v:merge change for 86v
2014-09-13 10:57:41 +08:00
Luowei
43bc8d0d39
spi:add spi dts for rk312x
2014-09-12 20:30:01 +08:00
hjc
e0c93ffd0a
rk3036 hdmi: fix hdmi display error when TV power down and power up
2014-09-12 19:16:35 +08:00
lintao
d7b65047d4
mmc: move cap with hs200 to caps
...
Signed-off-by: lintao <lintao@rock-chips.com >
2014-09-12 18:07:07 +08:00
许盛飞
782dd90313
rk312x: for the bug of suspend-resume
...
Signed-off-by: 许盛飞 <xsf@rock-chips.com >
2014-09-12 17:39:45 +08:00
gwl
522c0bb37a
Wifi: add rtl8723au & rtl8723bu wifi support.
2014-09-12 17:35:34 +08:00
zwl
9df3cde614
rk3288:dtsi: fix rockchip.pwr18 prop spelling mistake at lcdc dt node
2014-09-12 14:38:10 +08:00
gwl
02bdd1af26
WiFi: add rtl8189es/etv support, Optimization wifi configuration.
2014-09-12 14:19:41 +08:00
zwl
f7c0e40060
rk312x:lcdc: fix the color gradation of screen display if use dither down mode when resume
2014-09-12 14:12:19 +08:00
陈亮
6091619467
rk312x: enable jtag clk by rockchip_jtag_enabled
...
Signed-off-by: 陈亮 <cl@rock-chips.com >
2014-09-11 18:19:48 -07:00
hjc
dc1e1bf064
rk312x dtsi: lvds status depend on dts file
2014-09-12 09:03:55 +08:00
许盛飞
e19bdc2a7a
adc-battery: add adc-battery
...
Signed-off-by: 许盛飞 <xsf@rock-chips.com >
2014-09-11 19:13:57 +08:00
wdc
157773d856
Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
2014-09-11 19:12:27 +08:00
wdc
58bc3c8887
rk3036: change pll bypass to powerdown
2014-09-11 19:10:31 +08:00
hjc
e55512242e
rk3036 hdmi: show kernel logo
2014-09-11 18:29:45 +08:00
hjc
d094d44a5b
rk312x lcdc: if output_color is YUV color,vop should open bcsh r2y
2014-09-11 18:29:45 +08:00
