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
Zheng Yang
61d46c90ee
HDMI: rk3368: add function for HDCP2.2.
...
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com >
2015-04-28 19:17:27 +08:00
Mark Yao
5f3c54f3cb
rockchip: video: fix logo display when switch screen
...
Signed-off-by: Mark Yao <mark.yao@rock-chips.com >
2015-04-28 14:56:16 +08:00
Mark Yao
0f344c95ce
Revert "video: rockchip: logo: copy loader to framebuffer"
...
This reverts commit a9085919ca .
2015-04-28 14:54:41 +08:00
Mark Yao
ab3d3ee03b
Revert "video: dts: add disp fullscreen for box logo"
...
This reverts commit b8667979fa .
2015-04-28 14:54:41 +08:00
smj
544790e030
rk3368: add the hdmi nlpcm and hbr mode for direct output
...
Signed-off-by: smj <smj@rock-chips.com >
2015-04-27 19:39:15 +08:00
Zheng Yang
c84a187216
dts: delete node rockchips,hdmi_audio_source.
...
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com >
2015-04-27 17:01:48 +08:00
Mark Yao
bff29ceb63
video: rockchip: update display buffer dump
...
Create a new sys node "/sys/class/graphics/fb0/dump_buf" to dump
display buffer.
Now can support trace multi frames and kernel logo dump.
More info see by "cat /sys/class/graphics/fb0/dump_buf"
Signed-off-by: Mark Yao <mark.yao@rock-chips.com >
Conflicts:
include/linux/rk_fb.h
2015-04-27 09:38:21 +08:00
hjc
5a1141f969
delete unused file drivers/video/rockchip/rk_fb.c.rej
...
Signed-off-by: hjc <hjc@rock-chips.com >
2015-04-26 16:45:14 +08:00
Sugar Zhang
8c5cdaefbe
sofia3gr: ion: fix this issue, the reason is ion_import_dma_buf may be invoked concurrently.
...
<4>[ 3123.242655] WARNING: CPU: 2 PID: 2648 at drivers/staging/android/ion/ion.c:512 ion_handle_add+0xb4/0xc0()
<7>[ 3123.252189] ion_handle_add: buffer already found.
<7>[ 3123.256694] Modules linked in: iwlmvm iwlwifi mac80211 cfg80211 compat
<7>[ 3123.263195] CPU: 2 PID: 2648 Comm: TimedEventQueue Tainted: G W 3.14.0 #7
<7>[ 3123.270868] 00000000 00000000 9a3efd2c 80faf273 9a3efd6c 9a3efd5c 80935dc9 811d7fd3
<7>[ 3123.278405] 9a3efd88 00000a58 812208a0 00000200 80e128d4 80e128d4 8d4ae00c a8cd8600
<7>[ 3123.286065] a8cd8094 9a3efd74 80935e0e 00000009 9a3efd6c 811d7fd3 9a3efd88 9a3efd9c
<7>[ 3123.293867] Call Trace:
<7>[ 3123.296159] [<80faf273>] dump_stack+0x48/0x69
<7>[ 3123.300537] [<80935dc9>] warn_slowpath_common+0x79/0x90
<7>[ 3123.305913] [<80e128d4>] ? ion_handle_add+0xb4/0xc0
<7>[ 3123.310694] [<80e128d4>] ? ion_handle_add+0xb4/0xc0
<7>[ 3123.315703] [<80935e0e>] warn_slowpath_fmt+0x2e/0x30
<7>[ 3123.320586] [<80e128d4>] ion_handle_add+0xb4/0xc0
<7>[ 3123.325450] [<80e144cc>] ion_import_dma_buf+0x8c/0x110
<7>[ 3123.330490] [<80c517c4>] reg_init+0x364/0x7d0
<7>[ 3123.334975] [<80993363>] ? futex_wait+0x123/0x210
<7>[ 3123.339607] [<80992e0e>] ? get_futex_key+0x16e/0x1e0
<7>[ 3123.344692] [<8099308f>] ? futex_wake+0x5f/0x120
<7>[ 3123.349245] [<80c51e19>] vpu_service_ioctl+0x1e9/0x500
<7>[ 3123.354508] [<80994aec>] ? do_futex+0xec/0x8e0
<7>[ 3123.358885] [<80971080>] ? prepare_to_wait_event+0xc0/0xc0
<7>[ 3123.364503] [<80c51c30>] ? reg_init+0x7d0/0x7d0
<7>[ 3123.368955] [<80a22562>] do_vfs_ioctl+0x2d2/0x4c0
<7>[ 3123.373816] [<80b198ad>] ? inode_has_perm.isra.41+0x2d/0x40
<7>[ 3123.379278] [<80b199cf>] ? file_has_perm+0x7f/0x90
<7>[ 3123.384217] [<80b1a5f7>] ? selinux_file_ioctl+0x47/0xf0
<7>[ 3123.389351] [<80a227a8>] SyS_ioctl+0x58/0x80
<7>[ 3123.393754] [<80fb45e8>] syscall_call+0x7/0x7
<7>[ 3123.398043] [<80fb0000>] ? mmc_do_calc_max_discard+0xab/0xe4
<4>[ 3123.404220] ---[ end trace bd195cf65df321ce ]---
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com >
Signed-off-by: CMY <cmy@rock-chips.com >
2015-04-23 17:58:51 +08:00
guoyi
8479c5f245
TP: gt9xx: support early suspend&resume
2015-04-23 17:21:40 +08:00
huang zhibao
ff2d37671f
dts: rk3368 box r88 add power led
2015-04-23 10:45:37 +08:00
David Wu
84f5067d74
rk3368: i2c: add i2c sleep pinctrl
...
Signed-off-by: David Wu <wdc@rock-chips.com >
2015-04-22 02:21:04 +08:00
Zhaoyifeng
d438d9cceb
NAND : update dts config for nand.
...
nandc0reg are unused now,rknand_base.c will check boot media,if
boot form emmc,nand porbe will not enable clock.
2015-04-21 13:03:24 +08:00
Zhaoyifeng
627fe3d23e
NAND : add boot media check
...
Add boot media check , if boot from EMMC,no need to enable nand clock.
2015-04-21 12:57:56 +08:00
zxl
9279372228
RK3368 GPU version: Rogue L 0.14 Remove 'Instead kmalloc to kzalloc'
...
Signed-off-by: zxl <zhuangxl@rock-chips.com >
2015-04-21 11:03:28 +08:00
Sugar Zhang
5a79ff4cba
es8316: fix spk no sound.
...
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com >
2015-04-21 10:12:24 +08:00
Zhaoyifeng
84917a89f2
NAND : Fix 3368 dts nand clock config
...
hclk_emem_peri need config for nand.
2015-04-21 09:50:33 +08:00