Commit Graph

405200 Commits

Author SHA1 Message Date
Simon
551c61b2ce rk3368: iommu: remove hjc's commit
Signed-off-by: Simon <xxm@rock-chips.com>
2015-05-15 15:29:22 +08:00
Simon
6f24f43f6e rk3368: iommu: fix warning when compiling
Signed-off-by: Simon <xxm@rock-chips.com>
2015-05-15 15:26:54 +08:00
Simon
9a16e83fe9 rk3368: iommu: delete region list if map failed
Signed-off-by: Simon <xxm@rock-chips.com>
2015-05-15 15:26:54 +08:00
Simon
41e5a72d1b rk3368: iommu: add page fault call back for master
Signed-off-by: Simon <xxm@rock-chips.com>
2015-05-15 15:26:53 +08:00
chenjh
c1ea5e1d90 rk818-battery: fix index of array CHRG_CVCC_HOUR error
Signed-off-by: chenjh <chenjh@rock-chips.com>
2015-05-15 15:00:04 +08:00
hjc
a0745c0d83 rk31xx lvds: compatible with rk31xx and rk3368
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-15 12:45:23 +08:00
Zheng Yang
7be81dbf24 HDMI:rk3288: fix pinctrl mode switch error.
For 3288, i25 pinctrl gpio mode name is "sleep",
	not "gpio" any more.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

Conflicts:
	drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c
2015-05-15 11:38:45 +08:00
Mark Yao
f7391f8382 rockchip: rk312x: vop: fix iommu crash when resume
Maybe win is enabled and H/W address is not a vaild
iommu mapped addr, So we need delay to ensure H/W
switch done before enable iommu.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-05-15 10:21:13 +08:00
Wenlong Zhuang
ace5108985 video: rockchip: rk312x lcdc: Refine lcdc standby
add wait for lcdc hold valid when standby and add standby when
lcdc timing is changing at the moment of switch hdmi.

Signed-off-by: Wenlong Zhuang <daisen.zhuang@rockchips.com>
2015-05-15 10:20:05 +08:00
hjc
ada8a223c6 rk iommu: fix system panic when iommu pagefault
Signed-off-by: Simon <xxm@rock-chips.com>
Signed-off-by: cmy <cmy@rock-chips.com>
2015-05-15 09:29:30 +08:00
hjc
e66280cea3 rk3368 lcdc: add lcdc extend function for some special config
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-15 09:22:13 +08:00
hjc
be4e96f7c3 rk fb: add for iommu pagefault debug
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-15 09:21:36 +08:00
hjc
0e018e3c29 rk fb: add interface for debug
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-14 15:20:16 +08:00
Tang Yun ping
6b68cd05df RK3368 DDR: change get ddr freq method
The old method get ddr freq from MCU through mailbox,and new method get ddr
freq from ddrpctl register

Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2015-05-14 09:59:10 +08:00
smj
862e9c8a84 rk3368 hdmi : fix the hdmi bitstream connot idenfify sometimes
Signed-off-by: smj <smj@rock-chips.com>
2015-05-13 20:15:12 +08:00
RK_ywj
38640e3950 mend rk1000 display ,remove some code in lcdc 2015-05-12 14:10:08 +08:00
RK_ywj
b2e9b75b5e After insert HDMI reboot only, insert cvbs display become green 2015-05-12 14:06:06 +08:00
RK_ywj
2016b53197 when uboot logo on ,first cvbs display no need init rk1000 2015-05-12 14:06:05 +08:00
RK_ywj
073313449c mend rk1000 cvbs display when open uboot logo 2015-05-12 14:06:05 +08:00
xxx
cefefef538 add suspend ctrl in rk3368-tb_8846.dts 2015-05-11 16:06:51 +08:00
Tang Yun ping
ce118b8a83 RK3368 MCU: add MCU suspend and resume function
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2015-05-11 14:54:22 +08:00
hjc
65841919f8 rk3288 lcdc: delete unused message and update coding style
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-09 16:30:32 +08:00
hjc
8febed7e1e rk3288 lcdc: add overscan for extern screen
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-09 16:23:01 +08:00
hjc
9067ef55f1 rk3368 lcdc: update deflick config for interlace mode ouput
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-09 16:22:40 +08:00
Xiao Feng
ce04c16111 rk3368: ddrfreq: add compat_ioctl support
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-05-08 15:33:27 +08:00
zhangqing
94f4b88e4c rk3x: pmic: rk818_battery: fix code style issues from checkpatch.pl
Signed-off-by: chenjianhong <chenjh@rock-chips.com>
2015-05-08 03:18:55 -07:00
guoyi
5beddb7043 rk3368-p9: dts: mdify dvfs table 2015-05-08 10:18:11 +08:00
hjc
73cbf32341 rk31xx lvds: make sure lvds do init in kernel
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-07 19:51:43 +08:00
Huang, Tao
dd1ab0e14f cpufreq: rockchip_big_little: minor cleanups
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-07 19:14:06 +08:00
chenjh
df74b203fb rk818-battery: update version to 3.0.0
Signed-off-by: chenjh <chenjh@rock-chips.com>
2015-05-07 17:06:17 +08:00
chenjh
950e54e8fc rk3368-p9: dts: add property of rk818 battery node
Signed-off-by: chenjh <chenjh@rock-chips.com>
2015-05-07 17:06:17 +08:00
hjc
a2ea2f9589 rk3368 lcdc: add ccir656 output format support
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-07 09:00:02 +08:00
Huang, Tao
4142fa4b85 arm64: rockchip: rk3368: cpu0 use rockchip timer
prepare for power off all cpu when idle

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-06 22:05:01 +08:00
Huang, Tao
7f8ebb5de0 clocksource: rockchip_timer: support percpu timer on ARM64
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-06 22:05:01 +08:00
hjc
800593ddf1 rk fb: fix hdmi/cvbs display error when uboot display logo
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-06 17:33:15 +08:00
hjc
af62000f28 rk3368 lcdc: fix system crash when in blank mode to update register
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-06 17:33:14 +08:00
hjc
7bb02ff83e rk fb: delay 200ms when extern display switch screen can fix mmu pagefault 2015-05-06 17:33:14 +08:00
Zheng Yang
9943c5b12d HDMI: improve EDID parse.
1. For some sink device, there is no available video mode
	   in EDID. hdmi driver will crash under such case.
	2. There are some video mode is not defined in EDID extend
	   block, so we need to check first block data.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-06 17:22:12 +08:00
lyz
6d91a06b4e phy: phy-rockchip-usb: add support of rk33 usb phy
The usb phy of rk33's ehci usb controller usb genernic phy
subsystem to handle suspend and resume

Signed-off-by: lyz <lyz@rock-chips.com>
2015-05-06 14:53:16 +08:00
lyz
97c16b72f3 phy: merge and backport phy core from linux kernel 4.1
Signed-off-by: lyz <lyz@rock-chips.com>
2015-05-06 14:53:16 +08:00
Zheng Yang
67ea220c39 HDMI: rk3368/rk3288: If HDCP is enabled in uboot, do not set again.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-05 18:28:37 +08:00
Zheng Yang
eb7952e5c5 display-sys: fix code style
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-05 18:28:11 +08:00
Zheng Yang
ac7a667e17 display-sys: list supported 3d format of all resolution.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-05 18:27:59 +08:00
huang zhibao
ef32560739 rk1000 codec: fixed rk1000 av startup pop 2015-05-05 17:44:13 +08:00
Huang, Tao
433b7b6a39 USB: gadget: rndis: fix compilation warning
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-05 17:36:46 +08:00
Rohith Seelaboyina
1aab3d20ef usb: gadget: mtp: add new ioctl for compat
Define a new ioctl for MTP_SEND_EVENT, as its
ioctl numbers depends on the size of struct
mtp_event, which varies in ARCH32 and ARCH64.

Bug 1466403

Change-Id: I1d172aae422ca483b00c6dd59e739166f40c53ce
Signed-off-by: Rohith Seelaboyina <rseelaboyina@nvidia.com>
Reviewed-on: http://git-master/r/377800
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
2015-05-05 17:30:12 +08:00
Huang, Tao
0c278cf19c Revert "usb: ftp: fix the bug of ftp ioctrl args problem with 32bit userspace on 64bit platforms"
This reverts commit c04cdecff9.
2015-05-05 17:30:12 +08:00
hjc
56632fc22a rk3368 lcdc: update gather config
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-05 17:13:09 +08:00
hjc
506d331dde rk3368 lcdc: fix system crash when send reboot cmd in sleep mode
Signed-off-by: hjc <hjc@rock-chips.com>
2015-05-05 14:40:37 +08:00
Zheng Yang
92077716d1 HDMI: 3288/3368: hdcp check firmware pointer.
If firmware is NULL, HDCP is disabled.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-05-05 12:26:55 +08:00