Commit Graph

402015 Commits

Author SHA1 Message Date
simon
7849e2a21e rockchip: midgard: renable temperature control in dvfs 2014-08-15 10:59:57 +08:00
lyz
d765e373a1 usb: dwc_otg: put usb phy back to normal state when shutdown 2014-08-15 10:39:10 +08:00
lyz
295c152c8b usb-uart: add a propertie in dts to enable usb-uart debug 2014-08-15 10:39:10 +08:00
simon
643d90b064 rockchip: midgard: cancel dvfs timers when recieve reboot notifier event 2014-08-15 10:35:22 +08:00
hwg
b4dd0ce703 rk3288 gmac: add tx rx clock delayline in dts 2014-08-15 10:04:21 +08:00
zwl
e5d3bf09e3 rk fb: add support DUAL disp mode in rk_fb_switch_screen interlace 2014-08-14 21:07:19 +08:00
许盛飞
e5b31c407f Revert "RK312x: support suspend and resume"
This reverts commit 0a82ae44b7.
2014-08-14 20:59:51 +08:00
Zheng Yang
9eff1c7238 rk3036 lcdc: fix compile error for iommu function changed. 2014-08-14 19:17:11 +08:00
wdc
e86456d197 rk3036: CMA size reduces to 4M 2014-08-14 17:08:04 +08:00
zyc
85a9069c36 rk312x:cif: 1. soft reset cif before setting cif registers
2. raise cif qos the same as lcdc
                3. add 3A controls in soc camera framework
2014-08-14 17:09:33 +08:00
许盛飞
0a82ae44b7 RK312x: support suspend and resume
Signed-off-by: 许盛飞 <xsf@rock-chips.com>
2014-08-14 16:16:16 +08:00
roger
334acec182 Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10 2014-08-14 16:10:58 +08:00
roger
1945bbd10f ethernet:gmac: fix the following warnning
[  169.855161] WARNING: at fs/sysfs/dir.c:530 sysfs_adl@one28x7/ 0x9c()
[  169.855236] sysfs: cannot create duplicate filename '/devices/ff290000.eth/stmmac-0:00/phy_reg'
2014-08-14 16:09:40 +08:00
zwl
f05e7b5508 rk312x lcdc: modify mmu_dts_name copy from MAROC Definition 2014-08-14 15:22:03 +08:00
xxm
a2bd7432e9 rockchip: iommu: replace prefix iommu with rockchip for iommu compatible 2014-08-14 15:02:47 +08:00
roger
a826090f0c Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10 2014-08-14 14:52:36 +08:00
roger
538df30955 ethernet:gmac:
1. set interface type(rgmii/rmii) in dts
2. set clock input/output in dts
3. set tx/rx delay in dts
2014-08-14 14:51:23 +08:00
zwl
1897916287 rk lcdc: use new interface to open and active vop iommu device 2014-08-14 14:40:16 +08:00
Sun Mingjun
227e8f0536 codec modified :
- Changed name from spk_ctl to hp_ctl to Corresponding logic
	- Deleted some of Debugging Code
	- Add the support to fullalsa
2014-08-14 11:33:10 +08:00
hjc
301057966e rk312x lcdc: add alpha config 2014-08-14 11:31:39 +08:00
CMY
0aaedd101e rk: ion: return appropriate value if iommu map fail 2014-08-14 10:49:26 +08:00
hjc
ea22dfdf4e rk312x lcdc: fix rk312x lcdc win1 reg error 2014-08-14 10:41:10 +08:00
zwl
95e93752df rk fb: fix hdmi disp err when at ONE_DUAL disp mode and reorganize some code 2014-08-14 10:22:23 +08:00
xxm
776738d7c2 rockchip: iommu: fix function name cpu_is_rkxxxx 2014-08-14 10:24:34 +08:00
zwl
25c04f60a4 rk3126 sdk dts: add the pinctrl of lvds node to support RGB output 2014-08-14 09:44:42 +08:00
Sun Mingjun
fc321ca0f2 spdif : changed the spdif device name to uniform naming 2014-08-14 09:34:18 +08:00
CMY
059e52c528 rk: ion: check the iommu map's result 2014-08-14 09:03:21 +08:00
roger
ea0dcfc1ef Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10 2014-08-13 19:05:41 +08:00
roger
0a23c7826b ethernet: fix the bug of rmii not work when clock input from PHY 2014-08-13 19:05:28 +08:00
typ
bdd88501f7 rk312x DDR: first init ddr.c 2014-08-13 17:09:30 +08:00
hwg
61cc5f91cd gmac: compatible with rk3288 and rk312x 2014-08-13 15:21:45 +08:00
ddl
3fc7712fef camsys_drv: v0.0x13.0 2014-08-13 15:19:30 +08:00
hwg
f17795c900 wifi: build together with rkwifi, esp8089, rtl8188eu driver, avoid config change 2014-08-13 15:13:15 +08:00
ljf
ca24e0aa13 vpu: modify for the iommu interface 2014-08-13 10:58:56 +08:00
xxm
b468196810 rockchip: iommu: add rockchip specific head file to fix compile error 2014-08-13 11:02:01 +08:00
lintao
c1faa09737 mmc: rk312x: dts: remove pwren 2014-08-13 09:19:23 +08:00
xxh
4a64692665 modify esp8089 wifi driver for p2p fuction 2014-08-13 08:41:36 +08:00
zwl
6fa15cd64e rk312x dts: move the pinctrl config of lvds node from dtsi to dts that is need 2014-08-12 23:22:17 +08:00
zwl
9b31708c66 rk312x lvds: fix get pinctrl pins null pointer for RGB output 2014-08-12 23:18:45 +08:00
Sun Mingjun
095128cccb codec : add the general configuration to rk312x.dtsi 2014-08-12 20:54:35 +08:00
Sun Mingjun
f854ea25c4 codec : Support rk3126-sdk codec 2014-08-12 19:16:01 +08:00
黄涛
9c542eb57d ARM: rockchip: rk312x add cpu axi bus support 2014-08-12 18:37:38 +08:00
lintao
3af1f3eae4 mmc: fix err handle for release cd_irq 2014-08-12 18:02:21 +08:00
黄涛
68fe6924d3 Merge remote-tracking branch 'origin/develop-3.10-next' into develop-3.10
Conflicts:
	arch/arm/mach-rockchip/vcodec_service.c
	drivers/iommu/rockchip-iommu.c
	drivers/iommu/rockchip-iovmm.c
	drivers/net/ethernet/rockchip/gmac/stmmac_platform.c
	include/linux/rockchip/sysmmu.h
2014-08-12 17:39:16 +08:00
ljf
4a15e1e1cd prepare for marging develop-3.10-next to develop-3.10 2014-08-12 16:12:49 +08:00
Sun Mingjun
b2204794ef codec : Remove codec dts From rk312x.dtsi To rk3128-box.dtsi 2014-08-12 15:28:22 +08:00
黄涛
c93122b567 rk_serial: 4 bytes IO accesses
RK3288 uart_dbg only support 4 bytes IO accesses
2014-08-12 12:08:55 +08:00
dkl
4ae0521064 rk818: disable otg and boost when in sleep mode 2014-08-12 11:57:29 +08:00
lintao
d8eb71b416 mmc: 312x: disable sdio pull down 2014-08-12 11:44:44 +08:00
hwg
aba5e3a87f gmac: create /sys/class/vmac/exist 2014-08-12 10:52:18 +08:00