Commit Graph

400647 Commits

Author SHA1 Message Date
ljf
b2076f04e8 rk3036, rk312x: add iommu switch in dts for vcodec and iep 2014-08-08 09:46:48 +08:00
zwl
d0d6b8b1e3 rk3128 box dts: add screen dt node 2014-08-08 09:20:17 +08:00
zwl
0380564f78 rk312x lcdc: set uv offset for hdmi/cvbs 2014-08-07 18:11:00 +08:00
zwl
2669a870f4 rk312x dts: move lcdc pinctrl and screen from dtsi to dts 2014-08-07 18:03:10 +08:00
zsq
c7f72ac604 fix rga2 compile error when 2 drives exist 2014-08-07 16:39:07 +08:00
lyz
ad96d6d748 usb: fix RK3036 bvalid irq Num 2014-08-07 16:20:05 +08:00
lyz
a45c68396b Revert "usb: fix RK3036 bvalid irq Num"
This reverts commit 5c81c74ca6.
2014-08-07 16:18:00 +08:00
lyz
5c81c74ca6 usb: fix RK3036 bvalid irq Num 2014-08-07 16:16:21 +08:00
wdc
00de53499b rk3036: enable zram defconfig 2014-08-07 16:07:46 +08:00
陈亮
b31f216cb9 rk312x: implement rk312x_restart() function
Signed-off-by: 陈亮 <cl@rock-chips.com>
2014-08-07 01:05:00 -07:00
zsq
edeb634085 add rga2 driver for dsti to diff 2014-08-07 14:13:38 +08:00
luowei
9253caccd6 rk3128-box:add pwm_regulator,lcdc,dvfs dts support 2014-08-07 13:57:06 +08:00
ljf
b4b6670bf9 rk312x: vcodec driver revision for rk312x 2014-08-07 13:53:40 +08:00
zsq
5e4ec4018a open rga driver 2014-08-07 13:44:43 +08:00
huang zhibao
c1b3403ce7 input: rk3128 support pwm remote control 2014-08-07 11:52:08 +08:00
张晴
fabc630d40 rk312x:rk818:open rk818 2014-08-07 11:17:45 +08:00
lyz
d043ff9001 usb: fix RK312x bvalid irq Num 2014-08-07 11:03:38 +08:00
张晴
29b38303e0 rk312x:support pwm set arm and logic voltages 2014-08-07 10:54:52 +08:00
hjc
24f76485b8 rk3036 hdmi: add support yuv input and output 2014-08-07 08:49:09 +08:00
zwl
d0f8322530 rk312x lcdc: when in hdmi/cvbs mode ,vop overlay in yuv domain 2014-08-07 08:45:54 +08:00
zwl
4824ab03cf rk312x lvds: fix ttl rgb mode no output 2014-08-06 18:28:49 +08:00
huang zhibao
5ee7e3fac5 input: support ir long press 2014-08-06 18:11:43 +08:00
lintao
18579bd625 mmc: disable force_jtag when card been inserted
3126 had no controller-cd pin for auto jtag/sdmmc selection
2014-08-06 10:58:56 +08:00
xjh
fa1743b3da TP: sdk support goodix 2014-08-05 17:23:07 +08:00
lyz
fd4b68a8f3 rk312x: usb: use dwc as default host controller 2014-08-05 16:46:21 +08:00
张晴
9331a0f6e0 rk312x:rk818:support usb and ac charger 2014-08-05 16:00:14 +08:00
luowei
47bddb4a9a pinctrl:fix rk312x gpio2c_iomux2 offset error 2014-08-05 15:20:37 +08:00
zwl
e038c69b56 rk3128 dts: fix lcd_cs gpio pin err 2014-08-05 14:34:28 +08:00
zsq
d2c007315a fix rga dssi compile error 2014-08-05 13:53:18 +08:00
lintao
bcec492cc1 mmc: fix rk3126 support
(1) Add cd_gpio support
	(2) defconf IDMAC
2014-08-05 12:32:46 +08:00
wdc
cdc62933b0 rk312x: overwrite adc channel 2014-08-05 11:52:22 +08:00
wdc
dd14603065 rk312x: enable saradc clk 7 pclk 2014-08-05 11:35:33 +08:00
li bing
11adc58691 Wifi: Esp8089: modify kernel version 3.06 -> kernel version 3.10. 2014-08-05 11:00:03 +08:00
陈亮
f650629d48 rk312x: enable core dvfs, fix gpu dvfs table error
Signed-off-by: 陈亮 <cl@rock-chips.com>
2014-08-04 19:53:21 -07:00
陈亮
ff98190af1 rk312x.dtsi: fix syntax err
Signed-off-by: 陈亮 <cl@rock-chips.com>
2014-08-04 19:32:00 -07:00
zsq
940c7148e4 add rga define to rk312x.dtsi 2014-08-05 08:35:02 +08:00
陈亮
62c67dcbaf rk312x: reserve memory for ION, call rockchip_ion_reserve()
Signed-off-by: 陈亮 <cl@rock-chips.com>
2014-08-04 02:56:07 -07:00
黄涛
4b19ba3477 Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
Conflicts:
	drivers/staging/android/ion/ion.c
	include/linux/rockchip/sysmmu.h
2014-08-04 16:52:07 +08:00
Minchan Kim
66db73c14b zram: don't grab mutex in zram_slot_free_noity
[1] introduced down_write in zram_slot_free_notify to prevent race
between zram_slot_free_notify and zram_bvec_[read|write]. The race
could happen if somebody who has right permission to open swap device
is reading swap device while it is used by swap in parallel.

However, zram_slot_free_notify is called with holding spin_lock of
swap layer so we shouldn't avoid holing mutex. Otherwise, lockdep
warns it.

This patch adds new list to handle free slot and workqueue
so zram_slot_free_notify just registers slot index to be freed and
registers the request to workqueue. If workqueue is expired,
it holds mutex_lock so there is no problem any more.

If any I/O is issued, zram handles pending slot-free request
caused by zram_slot_free_notify right before handling issued
request because workqueue wouldn't be expired yet so zram I/O
request handling function can miss it.

Lastly, when zram is reset, flush_work could handle all of pending
free request so we shouldn't have memory leak.

NOTE: If zram_slot_free_notify's kmalloc with GFP_ATOMIC would be
failed, the slot will be freed when next write I/O write the slot.

[1] [57ab0485, zram: use zram->lock to protect zram_free_page()
    in swap free notify path]

* from v2
  * refactoring

* from v1
  * totally redesign

Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: stable@vger.kernel.org
Signed-off-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit a0c516cbfc)

Conflicts:
	drivers/staging/zram/zram_drv.c
2014-08-04 16:34:53 +08:00
xxm
3a37be7ce1 rockchip: mali400: change gpu to built-in temp 2014-08-04 14:48:18 +08:00
wdc
e0cfb38a88 rk312x: set logic 1.2v 2014-08-04 14:36:57 +08:00
wdc
3f669b8f50 rk312x: fix i2c base address error 2014-08-04 14:28:33 +08:00
luowei
9d90fdd84e spi:fix the bug while read one byte 2014-08-04 13:47:27 +08:00
zwl
d67c64c9c9 rk312x lvds: fix no display 2014-08-04 11:56:04 +08:00
luowei
4552ee7de8 pinctrl:fix debug command bug for rk3036/rk312x
cat /sys/kernel/debug/rockchip_pinctrl/registers
2014-08-04 09:51:47 +08:00
luowei
808c5ddbae spi:fix the bug while read one byte 2014-08-04 09:14:23 +08:00
郭毅
671282cef0 inv_mpu: only setup timer once. 2014-08-04 09:06:22 +08:00
Zheng Yang
3ac820be05 rk3036 lcdc:
add set_overscan callback function to set overscan.
2014-08-02 19:03:44 +08:00
zwl
467a3883b5 rk312x lcdc: fix win vir_stride err 2014-08-02 18:53:35 +08:00
zwl
21cc3b6f30 rk312x lvds: fix no signal output 2014-08-02 18:48:02 +08:00