Commit Graph

60974 Commits

Author SHA1 Message Date
陈亮
d47b22f1f0 rk312x: init rockchip_pmu_ops 2014-07-31 05:21:43 -07:00
xxm
fb4412ae7a rockchip:iommu:1,fix build error 2,disable invalid tlb when iovmm_unmap 2014-07-31 17:35:15 +08:00
zwl
f3edddc359 rk fb: add support scaler for one lcdc dual disp 2014-07-28 22:46:12 +08:00
zwl
d3458c0b8c rk312x lcdc: add support scaler function 2014-07-28 22:19:45 +08:00
黄涛
b5d61451d6 Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next 2014-07-28 16:09:07 +08:00
dkl
e41271d341 pmic: rk818: modify shutdown function and fix compile errors
1. Modify the rk818 shutdown function refering to rk808.
2. Fix some compile errors.
2014-07-25 16:23:54 +08:00
luowei
81941d5546 pinctrl:add pinctrl dts for rk312x again 2014-07-24 11:19:55 +08:00
luowei
e5c80d8c68 pinctrl:add pinctrl dts for rk312x 2014-07-24 11:16:39 +08:00
陈亮
4d377d0e32 rk312x: define GRF register offset, add some iomap
Signed-off-by: 陈亮 <cl@rock-chips.com>
2014-07-23 01:45:22 -07:00
zwl
6269d4f44c rk fb: add support 4k video rotate and cancel map rotate fb 2014-07-18 10:40:59 +08:00
张晴
a013c410ce rk312x:clk:support set clks 2014-07-18 10:04:19 +08:00
陈亮
e0f7513837 rk312x: modify ROCKCHIP_CPU_RK3126 to ROCKCHIP_CPU_RK312X, add rk3126 rk3128 DT_MACHINE
Signed-off-by: 陈亮 <cl@rock-chips.com>
2014-07-17 02:08:43 -07:00
陈亮
780b2b158c ARM: rockchip: rk312x: add initial support 2014-07-16 23:28:10 -07:00
黄涛
c1446874c8 ARM: rockchip: common.h add rk_last_log_text 2014-07-16 15:01:34 +08:00
lintao
0e21a6d15e mmc: rk_sdmmc:
(1) auto select edma/idma by Soc chip id
	(2) enable rk3036-sdk sd & sdio
2014-07-15 17:27:01 +08:00
wdc
b42061c4fa 3036: fix iomap base addr error 2014-07-11 18:52:28 +08:00
luowei
9620f4d406 pinctrl:delete unused definition for rk3036 2014-07-11 17:10:21 +08:00
luowei
5dc9dc6260 pinctrl:add rk3036 handler in pinctrl driver 2014-07-10 22:44:20 +08:00
黄涛
77ddfc9d50 Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
Conflicts:
	drivers/usb/dwc_otg_310/usbdev_rk.h
2014-07-10 09:22:27 +08:00
lintao
bfc40850c4 mmc: support drv_e and sr modify 2014-07-09 18:09:20 +08:00
张晴
032de7a4eb rk3036:clk:rename clk_core_pre to clk_core 2014-07-09 16:50:25 +08:00
Zheng Yang
b6d7152f51 rk3036: add tv encoder code. 2014-07-08 18:11:59 +08:00
dkl
8929905cb9 reset: rk3036: add rk3036 reset-controller support 2014-07-08 14:29:06 +08:00
黄涛
223378cc0f Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
Conflicts:
	drivers/mmc/host/Kconfig
	drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.c
	drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.h
	drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.c
	drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.h
	include/linux/mmc/rk_mmc.h
	include/linux/rockchip/cru.h
2014-07-07 21:01:04 +08:00
dkl
b83cf632f3 rockchip: dvfs: switch regulator mode dynamically as rate changes 2014-07-07 20:13:24 +08:00
lintao
1a6580fba7 mmc: add support for rk3036 2014-07-07 17:39:37 +08:00
lintao
00b34deba4 mmc: host: rk_sdmmc: prepare for next Soc(s)
fix edma slave config phy regs
2014-07-07 16:43:00 +08:00
Zheng Yang
b8d4b5f2ec rk3036 lcdc: commit driver code, just pass compiling. 2014-07-07 13:08:04 +08:00
xxm
36b0eb381c rockchip:iommu:update iommu for rk3036,add vcodec_sel for hevc and vpu,change param name(sfrbase) to (base) ,delete some useless code 2014-07-07 10:12:38 +08:00
Luowei
24487e0ff9 add rk3036 pinctrl support 2014-07-04 18:28:08 +08:00
wdc
b392850b9d 3036: add CRU_MODE_CON offset 2014-07-04 10:23:16 +08:00
wdc
0719499a77 3036: add cru,grf,iomap 2014-07-03 17:49:06 +08:00
dkl
3207637c8d rockchip: add reset-rockchip driver to support Generic Reset Controller framework 2014-07-02 19:30:37 +08:00
黄涛
7bce321881 ARM: rockchip: fix compilation error when SENSORS_ROCKCHIP_TSADC is not selected 2014-07-01 15:51:57 +08:00
zwl
373657e263 rk fb: add set screen status for ddr change 2014-07-01 10:32:18 +08:00
lintao
78f99b8039 mmc: core: rk_sdmmc: prepare for next Soc(s)
Merge branch from develop-3.10-next into develop-3.10
2014-06-26 21:27:48 +08:00
xxx
d966cddbfd fixed: suspend gpios setting 2014-06-26 15:15:58 +08:00
lintao
fbfdff1f46 mmc: host: rk_sdmmc: add data-over-int timeout for data_busy
If devices fall in bad state make data_busy be hold too long,
dto interrupt will not be present, which leading  mmc-core wait for it forever.

 [<c06d42e4>] (__schedule+0x48c/0x554) from [<c06d275c>] (schedule_timeout+0x1c/0x260)
 [<c06d275c>] (schedule_timeout+0x1c/0x260) from [<c06d3c10>] (wait_for_common+0xd0/0x164)
 [<c06d3c10>] (wait_for_common+0xd0/0x164) from [<c044a4bc>] (mmc_wait_for_req_done+0x1c/0xe0)
 [<c044a4bc>] (mmc_wait_for_req_done+0x1c/0xe0) from [<c0453730>] (mmc_io_rw_extended+0x218/0x294)
 [<c0453730>] (mmc_io_rw_extended+0x218/0x294) from [<c0454590>] (sdio_io_rw_ext_helper+0xc8/0x194)
 [<c0454590>] (sdio_io_rw_ext_helper+0xc8/0x194) from [<c04546b0>] (sdio_memcpy_toio+0x1c/0x20)
 [<c04546b0>] (sdio_memcpy_toio+0x1c/0x20) from [<c032e96c>] (sdioh_request_packet+0x664/0x7e8)
 [<c032e96c>] (sdioh_request_packet+0x664/0x7e8) from [<c032fc78>] (sdioh_request_buffer+0x1a8/0x210)
2014-06-25 21:42:19 +08:00
lintao
f8d7a2a1b7 mmc: core: rk_sdmmc: prepare for next Soc(s)
complete  external dma itf ops for mmc
2014-06-25 16:31:51 +08:00
黄涛
4f26888822 ARM: rockchip: rk3036: add initial support 2014-06-24 17:37:35 +08:00
zwl
a33266695a rk fb: modify fb rotate config read from dts 2014-06-20 11:38:20 +08:00
lin tao
c580ac7deb mmc: host: rk_sdmmc:
Support physical level three transfer.
2014-06-16 10:56:00 +08:00
lin tao
086c795117 mmc: fix compile warning 2014-06-16 08:00:18 +08:00
郭毅
1549b588c5 sensor: modify some warnings of sensor_dev.c 2014-06-13 16:50:55 +08:00
黄涛
ee25a425b9 Merge tag 'lsk-android-14.05' into develop-3.10
lsk 14.05 android release

Conflicts:
	arch/arm/common/Kconfig
	arch/arm64/include/asm/arch_timer.h
	drivers/staging/android/fiq_debugger/fiq_debugger.c
	drivers/usb/Kconfig
2014-06-12 21:04:26 +08:00
张晴
a05c3a3973 rk3288:pmic:act8846&syr82x:modify some warnings 2014-06-12 15:38:12 +08:00
张晴
75e9568f06 rk3288:pmic:ricoh619:modify some warnings 2014-06-12 15:33:37 +08:00
zwl
bed6221bcc rk fb: add get frame time interface that is used for ddr change 2014-06-11 16:29:24 +08:00
lintao
bc9c115f09 Revert "mmc: host: rk_sdmmc:"
This reverts commit 4821809db2.
2014-06-11 14:40:09 +08:00
lintao
4821809db2 mmc: host: rk_sdmmc:
[IMPORTANT COMMIT | NEED_EXPERIMENTAL | CAN_REVERT]

     <1> Support SDIO 3.0, workaround for non-standard behaviour(AP6335) Temporarily.
     <2> Support SD3.0, and SDXC card  should use  exfat filesystem.
     <3> Non-emmc devices that turning fail would not bug kernel.
         Hotplug and poweroff-able (wifi,SD,MMC) devices support re-insert and try it again.
     <4> note:
         (a) card & io aware devices, f_max = 2 * clock, e.g USH_SDR104 means
             support max 208MHz clock in standard.
         (b) setup_bus doesn't need update clk in svi flow
         (c) card_busy: bascially should check CMD,DATA[0:3], however we use
             toggle tags to match svi flow now.
         (d) shorter wait busy and remove  dump_stack in vsi flow.
             Card should be busy until clk re-enable and svi complete.

      All behaviour follow the protocol, enjoy it!
2014-06-11 14:14:55 +08:00