Commit Graph

405181 Commits

Author SHA1 Message Date
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
xxx
c8dc70ee04 linux os can config sleep mode 2015-05-05 11:39:44 +08:00
Huang, Tao
30435ae348 Revert "staging: Remove the Android logger driver"
This reverts commit 4f8c75c8d9.
2015-05-05 10:54:10 +08:00
Huang, Tao
e83495dab6 Revert "staging: Remove the Android alarm-dev driver"
This reverts commit 013845fd73.
2015-05-05 10:53:55 +08:00
Huang, Tao
1c6fac5d71 Revert "staging: Remove logger and alarm-dev from android Makefile"
This reverts commit a290c3e430.
2015-05-05 10:53:44 +08:00
Huang, Tao
f07d7eb591 Merge tag 'lsk-v3.10-15.04-android'
Conflicts:
	drivers/base/cpu.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
2015-05-05 10:51:31 +08:00
Dan Carpenter
d323420ea0 dma: pl330: silence a compile warning
On 64 bit systems GCC warns that:

drivers/dma/pl330.c: In function ‘pl330_filter’:
drivers/dma/pl330.c:2317:21: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]

It's harmless and I have casted it away.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
(cherry picked from commit 2f986ec6fa)
2015-05-04 21:35:24 +08:00
Will Deacon
fc53f6adcf dma: pl330: use dma_addr_t for describing bus addresses
The microcode bus address (pl330_dmac.mcode_bus) is currently a u32,
which fails to compile when building on a system with 64-bit bus
addresses.

This patch uses dma_addr_t to represent the address instead.

Cc: Jassi Brar <jaswinder.singh@linaro.org>
Cc: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
Acked-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
(cherry picked from commit fed8c45727)
2015-05-04 21:23:22 +08:00
Huang, Tao
bff22aebd0 rk: gcc-wrapper.py ignore psci.c
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 21:04:37 +08:00
Huang, Tao
61ef8d7311 rfkill-bt: fix compilation warning
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 21:03:48 +08:00
Huang, Tao
08fc3fd8e7 input: gt9xx: fix compilation warning
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 20:59:30 +08:00
Huang, Tao
8acd81b485 mmc: rk_sdmmc: fix compilation warning
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 20:54:41 +08:00
Huang, Tao
abfc59ac28 inv_mpu: fix compilation warning
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 20:50:42 +08:00
Huang, Tao
2908af4243 media: camsys_marvin: fix compilation warning
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 20:46:20 +08:00
Huang, Tao
3e92dcec47 input: vtl_ts: fix compilation warning
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 20:25:39 +08:00
Huang, Tao
4f4343d438 iommu: rockchip-iovmm: fix compilation warning
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 20:22:22 +08:00
Huang, Tao
c33ee628d8 arm: rockchip: pm: fix compilation warning
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 20:02:11 +08:00
Huang, Tao
22ca938e4d arm: rockchip: ddr_freq: fix compilation warning
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 19:51:17 +08:00
Huang, Tao
e0fb27faf5 arm64: cpuinfo: compat task get hwcap from compat_hwcap_str
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 19:43:13 +08:00
Huang, Tao
f44c52812d media: rk_camsys: fix compilation warning
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 19:06:37 +08:00