Commit Graph

405162 Commits

Author SHA1 Message Date
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
Huang, Tao
be3d562d8c rk: gcc-wrapper.py ignore compat_binfmt_elf.c:58
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 19:00:03 +08:00
Huang, Tao
67c89a3e84 rkwifi: dhd_config: fix compilation warning
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 18:22:14 +08:00
Huang, Tao
70c7ca2642 video: rk32_mipi_dsi: fix compilation warning
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 18:17:27 +08:00
Huang, Tao
65d9fc5034 media: camsys_soc_rk3368: fix compilation warning
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 18:14:39 +08:00
Huang, Tao
46945f7116 thermal: rockchip: fix compilation warning
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 18:11:47 +08:00
Huang, Tao
fca743f5ce spi: rockchip: fix compilation warning
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 18:05:49 +08:00
Huang, Tao
68a53d4656 spi: rockchip: todos spi-rockchip-test.c
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-05-04 17:50:33 +08:00
Tang Yun ping
7f9d934145 RK3368 DDR:Add lcdc type detect for mcu DCF
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2015-05-04 14:11:32 +08:00
Mike Looijmans
ce2d3db614 mmc: sdhci-of-arasan: Omit superfluous error messages
sdhci_add_host and sdhci_platfm_init already report failure,
so don't emit error messages when a failure occurs. This prevents
occurences of "deferred" messages when required power supplies
are not ready for operation yet.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
2015-05-04 11:43:20 +08:00
Mike Looijmans
0625d9c769 mmc: sdhci-of-arasan: Use signed formatting in error messages
"ret" is a signed int, so use "%d" in format strings instead of "%u".
This prevents cryptic codes in error messages like this:
sdhci-arasan e0101000.sdhci: platform register failed (4294966779)

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Reviewed-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
2015-05-04 11:42:20 +08:00
Michal Simek
27c3c77e9c mmc: sdhci-of-arasan: Call OF parsing for MMC
Also check MMC OF properties. The controller supports MMC too.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
2015-05-04 11:35:29 +08:00
Soren Brinkmann
40e90d0041 mmc: arasan: Add driver for Arasan SDHCI
Add a driver for Arasan's SDHCI controller core.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Acked-by: Rob Herring <rob.herring@calxeda.com> [binding]
Acked-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: Chris Ball <chris@printf.net>

Conflicts:
	MAINTAINERS
2015-05-04 11:19:06 +08:00
xubilv
cdbefa5475 MIPI: Provide a function,get screen type,for frequency conversion.
Signed-off-by: xubilv <xbl@rock-chips.com>
2015-04-30 15:00:31 +08:00
Xiao Feng
ea6be56779 cpufreq: rockchip_big_little: update current policy cpu before cpufreq_cpu_get
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-04-30 14:30:42 +08:00
zxl
c68ec29b40 RK3368 GPU version: Rogue L 0.15
1. Fix lock bug in hrtimer.
2. Add USE_KTHREAD to simulate timer.Now open USE_HRTIMER instead of USE_KTHREAD by default.

Signed-off-by: zxl <zhuangxl@rock-chips.com>
2015-04-30 10:32:32 +08:00
hjc
895f21d5a7 rk fb: kfree envp[1], if we not do real switch screen
Signed-off-by: hjc <hjc@rock-chips.com>
2015-04-29 14:39:18 +08:00
hjc
ede0b85065 rk fb: fix iommu page fault when in video test
Signed-off-by: hjc <hjc@rock-chips.com>
2015-04-29 13:56:34 +08:00
hjc
c82a48303c rk3368 lcdc: update win state
Signed-off-by: hjc <hjc@rock-chips.com>
2015-04-29 13:53:58 +08:00
Huang, Tao
d02dc548d4 cpufreq: rockchip_big_little: check cpufreq_cpu_get return value
fix panic when cpu up/down

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-04-29 09:05:09 +08:00