Commit Graph

400623 Commits

Author SHA1 Message Date
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
许盛飞
8f8d60a029 rk312x: change BL-EN pin config
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2014-08-01 18:46:33 +08:00
hjc
266161a208 rk3036 hdmi: add support HDMI CEC function 2014-08-01 17:05:04 +08:00
lintao
a73af9e69b mmc: rk_sdmmc: increase max_blk_count for edmac 2014-08-01 17:02:51 +08:00
Zheng Yang
8481b02bd4 rk312x tve: display is ok. 2014-08-01 16:42:06 +08:00
陈亮
28cfbfc4cf rk312x: add rk3128-box.dts
Signed-off-by: 陈亮 <cl@rock-chips.com>
2014-08-01 01:09:25 -07:00
lyz
8ba35134f6 rk312x: support usb-uart debug 2014-08-01 15:37:38 +08:00
张晴
e3076abc9e rk3036&rk312x:clk:modify gpu clk name for dvfs 2014-08-01 14:25:45 +08:00
xxm
1dc06ea101 rockchip:mali400:fix gpu clk name:clk_gpu 2014-08-01 14:26:10 +08:00
Zheng Yang
a32c85a5d1 rk3036 hdmi:
When system power up, hdmi irq will be enabled twice for
	hwc will call fb unblack notifier. So if hdmi is not in suspend
	mode, it is no need to call rk3036_hdmi_early_resume when fb unblank
	event is triggered.
2014-08-01 13:36:25 +08:00
wdc
e47ed7898c rk3036: set cma reverse memory o kb 2014-08-01 11:53:57 +08:00
xxm
11d06ca448 rockchip:mali400:enable gpu pd 2014-08-01 11:32:38 +08:00
张晴
97a6355e4a rk312x:clk:support clk pd,set cpll for any freq 2014-08-01 10:48:01 +08:00
hjc
891ec37171 rk3036 lcdc: update lcdc resume and suspend func 2014-08-01 10:22:20 +08:00
陈亮
6c2702fe12 set clk_ignore_unused, disable core dvfs
Signed-off-by: 陈亮 <cl@rock-chips.com>
2014-07-31 06:18:55 -07:00
陈亮
6ad8034c50 Revert "rk312x: set clk_ignore_unused = true"
This reverts commit f0db0fef3b.
2014-07-31 06:07:55 -07:00
陈亮
f0db0fef3b rk312x: set clk_ignore_unused = true
Signed-off-by: 陈亮 <cl@rock-chips.com>
2014-07-31 06:06:33 -07:00
许盛飞
e93ba24ac1 rk312x:add pwm0 status-okay
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2014-07-31 20:49:36 +08:00
陈亮
0d2690fd73 Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10-next 2014-07-31 05:37:07 -07:00
zwl
411e9d7737 rk fb: fix error judge for screen1 2014-07-31 20:32:53 +08:00
陈亮
d47b22f1f0 rk312x: init rockchip_pmu_ops 2014-07-31 05:21:43 -07:00
zwl
63dd03ea17 rk312x dts: different lcdc dt node config for rk3126 and rk3128 2014-07-31 20:02:40 +08:00
Zheng Yang
2dee5b5201 rk321x.dtsi: add tve node. 2014-07-31 18:06:34 +08:00
Zheng Yang
e7154e9565 rk3036 tve: register fb notifier. 2014-07-31 18:05:01 +08:00
zyc
f1634b7e9e camsys_drv : v0.0x12.0 ,camsys_head : v0.0x8.0 2014-07-31 18:01:30 +08:00