Commit Graph

397798 Commits

Author SHA1 Message Date
hjc
1ef4f9a41c rk3288 lcdc: fix some compile warning 2014-03-12 11:50:22 +08:00
CMY
9e1d7022c3 rk: ion: get reserve cma memory for ion from device tree
restore default CMA size to 16M
2014-03-12 11:27:51 +08:00
wlf
3870aeaec1 USB: fix otg20 host mode auto suspend bug. 2014-03-12 11:19:54 +08:00
黄涛
1e836b3284 ARM: rockchip: fix debug/rockchip.S compile error 2014-03-12 10:45:04 +08:00
陈金泉
eb20d48a88 usb sound card: add switch register and switch state setting 2014-03-12 10:18:57 +08:00
gwl
735f106cef wifi: add wifi configuration into rockchip_defconfig. 2014-03-12 10:25:46 +08:00
黄涛
8937289465 input: ts: ct36x: init use async and fix compile warning 2014-03-12 09:53:03 +08:00
hwg
46b4c1ad3f ethernet: solve compile error 2014-03-12 09:25:22 +08:00
wlf
13a148e19e USB: add remote wakeup and detect by otg bvalid in defconfig 2014-03-12 09:10:30 +08:00
luowei
63e0132580 add dma support for spi driver 2014-03-11 22:05:58 +08:00
hwg
41e003a71d ethernet: add gmac driver 2014-03-11 21:52:01 +08:00
hwg
ab52b21ccf vmac: add phy power control driver 2014-03-11 21:09:55 +08:00
gwl
b39590391a wifi:bcmdhd: wifi does't work in oob's way. 2014-03-11 20:22:30 +08:00
gwl
34292c991e wifi:bcmdhd: remove a disgusting print. 2014-03-11 20:13:40 +08:00
黄涛
804c517191 ARM: rockchip: cpu.c support rk3288 2014-03-11 19:55:40 +08:00
gwl
f67bb3d4e0 wifi: modify wifi plat data. 2014-03-11 19:38:46 +08:00
gwl
dd70d9c061 wifi: fix rfkill-wlan.c error. 2014-03-11 17:30:21 +08:00
zwl
41f7cffafa HDMI: fix rk3288 hdmi driver code compile error 2014-03-11 17:15:34 +08:00
gwl
3a2b762e8f BT: add bt resource into dts, add bt power driver. 2014-03-11 17:24:06 +08:00
lintao
442acace24 mmc: rk_sdmmc: add host->hw_reset for eMMC 2014-03-11 17:09:28 +08:00
zwl
fa14d67d10 HDMI: optimize rk3288 hdmi driver code 2014-03-11 16:15:31 +08:00
zyk
e3a0fd5f7d ct36x compatible ct363 and ct365 2014-03-11 15:59:26 +08:00
wlf
79c8b16051 USB: remove unused files: ehci-rk.c and ohci-rk.c 2014-03-11 14:46:49 +08:00
wlf
490e5e3c95 USB: renamed usb files: ehci-rk.c -> ehci-rockchip.c, ohci-rk.c -> ohci-rockchip.c 2014-03-11 14:35:51 +08:00
wlf
7f63aac704 USB: RK3288 USB CTLR initialization 2014-03-11 11:14:10 +08:00
xbw
3639a7091d SDMMC: to suuport eMMC. continue with commit-7dcb2b4f0 2014-03-11 10:36:22 +08:00
xbw
7dcb2b4f0a 1.to support eMMC.
2.Resolve conflicts pin used to wifi-sdio-det.
3.Resolve the clock conflict between sd and sdio.
2014-03-11 10:01:46 +08:00
xbw
3ec8c040a9 fs: emmc: Delete useless files 2014-03-11 09:53:36 +08:00
hjc
a5b0564f69 rk3288 lcdc: win0/1/2/3 test at fpga ok 2014-03-11 09:40:16 +08:00
hjc
3c2d0db29d fix rk3188 and 3288 fpga screen par define error 2014-03-11 09:38:30 +08:00
黄涛
e3d077143d ARM: rockchip: fix fpga compile error 2014-03-11 09:02:37 +08:00
黄涛
80507470b1 input: ts: ct36x: fix init 2014-03-10 20:27:32 +08:00
黄涛
ce1d983988 ARM: rockchip: move some head files to include/linux/rockchip 2014-03-10 19:32:43 +08:00
hjc
757b445bdd rk fb: new framework test ok at rk3188
this commit depend on the hwc commit:
commit 59966e5cc0530d936435052d187fbe574684f21e
Author: huangds <hds@rock-chips.com>
Date:   Fri Mar 7 11:17:56 2014 +0800

    lcdc ok ,enable hwc
commit 314b22af926f28c3daa048354a4e4185fc46611b
Author: huangds <hds@rock-chips.com>
Date:   Mon Mar 10 18:19:04 2014 +0800

    lcdc abbort ,RK_FBIOSET_CONFIG_DONE remove for a moment
2014-03-10 19:24:08 +08:00
黄涛
e6c0fa3546 ARM: rockchip: rk3288 support cpu on/off 2014-03-10 19:03:15 +08:00
黄涛
e3e8445fd7 ARM: rockchip: rk3288.dtsi indent only 2014-03-10 18:25:39 +08:00
zwl
bcfe045c75 HDMI: add rk3288 hdmi PHY MPLL config 2014-03-10 18:22:44 +08:00
libing
557ff1228e Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10 2014-03-10 17:35:08 +08:00
libing
5ca8c1360c rk mipi dsi: dsi file:lcd-rockchip_mipi.dtsi support rk3288. 2014-03-10 17:34:51 +08:00
张晴
71bc8394f2 rk31:linux3.10:pmic:support dc&ldo suspend en/disable,add rk808 pre_init 2014-03-10 14:21:07 +08:00
陈金泉
eb85433186 rk610-hdmi:delete hdmi_set_spk 2014-03-10 14:03:45 +08:00
lintao
4700b767e8 mmc: sdio: fix sdio_reset_comm 2014-03-10 12:35:09 +08:00
xbw
c8dc36ca79 SDMMC: 1.to identify eMMC. 2.add the trace log in rk_sdmmc driver. 2014-03-10 12:05:59 +08:00
陈金泉
8ae6fcba5c Audio: delete codec_set_spk, update rk616 codec driver 2014-03-10 11:10:43 +08:00
CMY
b4a4ee458f rk: ion: show client's buffer info 2014-03-10 09:58:06 +08:00
zwl
a696dfc813 HDMI: implement function at rk3288_hdmi_hw.c and add some register defined 2014-03-08 19:14:26 +08:00
libing
1b05238eb3 Revert "rk fb: new framework test ok at rk3188"
This reverts commit fe817a682b.
2014-03-08 14:30:22 +08:00
lintao
16fe3de136 Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10 2014-03-07 20:13:34 +08:00
Russell King
0138c701bb Fix uses of dma_max_pfn() when converting to a limiting address
We must use a 64-bit for this, otherwise overflowed bits get lost, and
that can result in a lower than intended value set.

Fixes: 8e0cb8a1f6 ("ARM: 7797/1: mmc: Use dma_max_pfn(dev) helper for bounce_limit calculations")
Fixes: 7d35496dd9 ("ARM: 7796/1: scsi: Use dma_max_pfn(dev) helper for bounce_limit calculations")
Tested-Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Conflicts:
	drivers/scsi/scsi_lib.c
2014-03-07 20:11:26 +08:00
Ray Jui
5c6b103edb mmc: fix host release issue after discard operation
Under function mmc_blk_issue_rq, after an MMC discard operation,
the MMC request data structure may be freed in memory. Later in
the same function, the check of req->cmd_flags & MMC_REQ_SPECIAL_MASK
is dangerous and invalid. It causes the MMC host not to be released
when it should.

This patch fixes the issue by marking the special request down before
the discard/flush operation.

Reported by: Harold (SoonYeal) Yang <haroldsy@broadcom.com>
Signed-off-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Seungwon Jeon <tgih.jun@samsung.com>
Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
2014-03-07 20:09:22 +08:00