Commit Graph

406435 Commits

Author SHA1 Message Date
Shawn Lin
cfde21f0da mmc: rk_sdmmc: fix NULL pointer in printout
This patch fix NULL pointer to chan_id while requsting
external dma channel failed.

Change-Id: I0abe1acb0a892cbaec0cadb24fe215b46e2e9abb
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2015-10-23 17:19:50 +08:00
zhangqing
26a23edb4c rk3228: thermal: support tsadc for rk3228
add rk3228 tsadc in rockchip-thermal.c

Change-Id: I86db35d5b551031ca464df1caaed836a3d56e779
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
2015-10-23 16:41:47 +08:00
chenzhen
47d867a972 rk3288, mali_t760: add 'static' on DEVICE_ATTR variables.
Change-Id: I73ca6930e50d1a834ffa97741842944ae420f6da
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2015-10-23 11:26:46 +08:00
chenzhen
aa0e1c7169 rk312x, mali_400: add 'static' on DEVICE_ATTR variables.
Change-Id: Icaaf3ce9626e78fe12e74587cc0812bfcfa3de2e
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2015-10-23 11:13:00 +08:00
Huang, Tao
e6947ea9c1 ARM: rockchip: rockchip_defconfig: enable DEBUG_INFO
Better support for DS-5

Change-Id: If54a51c32c0ece2df08f3a6d79da1bff8a51eda6
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-10-22 15:19:31 +08:00
Zhang Zhijie
0c87e75a8e OP-TEE: build optee_linuxdriver into kernel
Change-Id: I4cacc3b0670643ab02af592549de988f11c378df
Signed-off-by: Zhang Zhijie <zhangzj@rock-chips.com>
2015-10-22 12:13:58 +08:00
Chen Liang
b9e14c193d ARM: dts: rk3228: add syscon node for sgrf\grf\cru\ddrpctl\msch
Change-Id: I00bdb4b64a4e5e0a7f5fcd9dd29ec76fd4aba218
Signed-off-by: Chen Liang <cl@rock-chips.com>
2015-10-22 10:03:26 +08:00
zhangqing
913995e603 ARM: dts: rk3228: support cru soft reset
support cru soft reset for rk3228.

Change-Id: I7bd1a58d55bdd2b2f1eb3ae9fc80705ffb74c1be
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
2015-10-21 12:52:15 -07:00
Kamal Mostafa
52a5fc5a79 thermal: rockchip: fix an error code
3.19.8-ckt2 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Dan Carpenter <dan.carpenter@oracle.com>

commit 0d0a2bf6ed upstream.

There is a copy and paste bug, "->clk" vs "->pclk", so we return the
wrong error code here.

Change-Id: I3ef649ce940016fd9214ea924b243a07bdc58248
Fixes: cbac8f6394 ('thermal: rockchip: add driver for thermal')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Caesar Wang <wxt@rock-chips.com>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Tested-by: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2015-10-21 18:17:37 +08:00
chenzhen
44f997ff54 rk312x, mali_400: make it more 'difficult' to disable one core in low load.
Change-Id: I8f9aaa5d442a1d0f7a7685ba1885ad39b89ee097
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2015-10-21 18:14:55 +08:00
David Wu
d989b5b65c rk3368: thermal: remove unused code and fix style
Change-Id: Ie9e370082e422f528b4156a56b4ebc881686b12a
Signed-off-by: David Wu <wdc@rock-chips.com>
2015-10-21 18:11:56 +08:00
Xiao Feng
625813c9bd cpufreq: rockchip: fix scale rate error when resume
If the return value is 0, it will change voltage in DVFS and lead to
error when resume. Here it change frequency unsuccessfully in fact, so
it need return -EINVAL.

Change-Id: Ia9eff9f75060fcc79c1b275c19de8740754617de
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-10-21 14:55:03 +08:00
xiaoyao
5838ee16b4 ARM: rk3228: dts: add SDCard/SDIO/eMMC DTS node for RK3228 SDK board
Change-Id: I32b778c73a7aeb9461c462b0328f98eca0a06fdc
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
2015-10-21 09:03:04 +08:00
xiaoyao
2cb01afbb1 ARM: rk3228: dtsi: add SDCard/SDIO/eMMC DTS node for RK3228 Chip
Change-Id: I172bceadc7bb4a09394837fd6bb81bbbedd7ddae
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
2015-10-21 09:01:22 +08:00
chenzhen
1ced681940 rk312x, mali_400: add comments and reform some detail codes in PDP.
PDP: platform_dependent_part

Change-Id: I82fa8be69966ee6dddac48d899df5254ab38c87f
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2015-10-20 11:29:15 +08:00
Xu Xuehui
a8a47197e9 8723BU: Update 8723BU wifi driver to version v4.3.16_14189.20150519_BTCOEX2015119-5844
This driver is released by RealTek, main update as shown below:

1.  Support Android 5.0,5.1 and older
2.  Support Linux kernel 3.19.3 and older
3.  Improve Wi-Fi/BT Coexistence stability and performance
4.  Fix the problem of unexpected scan timeout
5.  Add TDLS function
6.  Fix STA mode disconnect problem caused by not checking TA of DEAUTH and DISASSOC frame
7.  Fix the failed association issue with specific AP which supports only 11n MCS data rate

Change-Id: I103d22a06eecc456c9777f17afdd1049efe9ff6a
Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
2015-10-20 11:09:25 +08:00
Shen Zhenyi
69608ce414 video: rockchip: tve: support rk3228
Change-Id: I7046f5b42de442c8bf7946a537d3e26922882d1d
Signed-off-by: Shen Zhenyi <szy@rock-chips.com>
2015-10-20 11:02:25 +08:00
Shen Zhenyi
ef8538a7b0 ARM: dts: rk3228: add tve config
Change-Id: I455e94459078632d42e9653b926d3fc4d06bddb4
Signed-off-by: Shen Zhenyi <szy@rock-chips.com>
2015-10-20 11:02:07 +08:00
Zhang Zhijie
8e4b2eda3f OP-TEE: add optee driver from GitHub: optee_linuxdriver
Commit 4136b9d5a139(Fix TEESMC{32,64}_FASTCALL_RETURN_FROM_RPC)

Change-Id: I389e4f79270e3bc6e8844ec81758f8b5546192a1
Signed-off-by: Zhang Zhijie <zhangzj@rock-chips.com>
2015-10-20 10:47:31 +08:00
chenzhen
a1fd352edd ARM: rockchip_defconfig: add config for mali_400_ko.
Change-Id: I6f28c56fd5a9f9fb77980e09ed2f15c6f997337c
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2015-10-19 11:49:43 +08:00
Mark Yao
bb39eefecc video: lcdc: 3228: update colorspace config
Add windows bt601 and bt709 convert

Change-Id: I0a24227e91c5bf7643f72ef79acaadde1a37be25
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-10-19 11:42:51 +08:00
Mark Yao
2b9ec02c09 rk3228: dts: add series nodes for display
Change-Id: I488ac645ceb7ccd7ecd7512f711ce5418553e431
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-10-19 11:36:25 +08:00
Mark Yao
8eccb6ceef video: lcdc: 3228: fix alpha when only one layer enable
rk3228 not support ppixel_alpha mode when only one layer enable.

Change-Id: I4de3a46f2f876230932a09fd202f318b130a5709
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-10-19 10:32:18 +08:00
Mark Yao
60444e27e7 video: lcdc: 3228: fix post colorspace display
fix table offset, config and overlay mode.

Change-Id: I1e0af6c2b56db9a509495c17b53835c1722b68ba
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2015-10-19 10:31:28 +08:00
Simon Xue
80e6ef2ae1 rk3228: gpu: fix rk3228 gpu pd issue
1. For compatible with other SOC,more dig into gpu pd when init gpu pd
2. Add cpu_is_rk3228 macro for gpu

Change-Id: I3adf4ab32d98c0cfebb0f0e769fac1b84f525c6f
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2015-10-16 10:44:45 +08:00
Yunzhi Li
86f351f5ec usb: rk3368: set disconnect threshold to 625 mV
The disconnect threshold of 28nm usb phy from innosilicon is
imprecise, if the value set to 575 mV will trigger unnecessary
disconnect interrupt.

Change-Id: I63985fb9257a1142bdad476583c0c141de70618d
Signed-off-by: Yunzhi Li <lyz@rock-chips.com>
2015-10-15 18:09:05 +08:00
chenzhen
549cd3f338 rk312x, mali_400: modify period_of_notifying_mali_utilization to 20 ms.
This is a rk_custom_in_common_part.

Change-Id: I3d691c01ed199a17980dadf03e6d3c1b711f9159
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2015-10-15 15:50:51 +08:00
Zheng Yang
9f2cff5e9e ARM: dts: rk3228: add hdmi and hdcp22
Change-Id: I4c2081ce5bbede0880361b54aa38478c79e529fa
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-10-15 10:59:01 +08:00
Zheng Yang
85e63917ea video: rockchip: hdmi: support rk3228
Change-Id: I3b1e3d4042c5b14e0759418c29e112dfae7d50b1
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-10-15 10:58:41 +08:00
chenzhen
29295b2618 rk312x, mali_400: correct coding style in platform_dependent_part.
Change-Id: I312b59f8875fd5d115a3a1c1e925a38afe8e7fa6
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
2015-10-14 18:40:21 +08:00
Simon Xue
e26f41d409 ARM: dts: rk3228: add vop/vpu/hevc/iep iommu config
Change-Id: Id784598ad7af4ddb5569423a4f77e035b4a7c9d0
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2015-10-14 16:28:18 +08:00
zhangqing
7ce90f99da ARM: dts: rk3228: clk: rename gpu clk name
change gpu clk name aclk_gpu to clk_gpu.

Change-Id: I0ee1fc47b94d7459914c6040aa3bcfc616626a83
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
2015-10-14 16:27:54 +08:00
Sugar Zhang
298e89389d video: rockchip: hdmiv1: fix no sound/noise problem
when hdmi mute audio, need to reset the audio logic and fifo.
otherwise, this may lead no sound/noise sometimes.

this patch add power down hdmi audio logic when mute audio,
and then power up hdmi audio logic when unmute audio.

Change-Id: Ifb8beac9690764b4ec1c6d3e1dfdb4253a05df51
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2015-10-14 16:27:20 +08:00
Huang Jiachai
9f2ef4bf49 video: rockchip: fb: distinguish between RGB YUV and FBDC data format
Change-Id: Ia351340cf05e5264d798348178b488917ada4482
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2015-10-14 16:02:21 +08:00
Huang Jiachai
e8d09becad video: rockchip: lcdc: 3288: fix iommu pagefault when user set win3 dsp size bigger than act size
Change-Id: Icf474cf35c9bbf37deccd415e810f7d0a0c2142d
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
2015-10-14 16:01:05 +08:00
Zheng Yang
87f79c169f video: rockchip: hdmi: v2: phy support clk 59.4MHz
Change-Id: Ibce9bcd09fa8011642c7a9e8de9f4b3471c23e8b
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-10-14 15:47:00 +08:00
Simon Xue
37261359a2 ARM: dts: rk3228: add gpu config
Change-Id: Ib8dbc4ede8abd4816e501454fe4a1f21fe3f54ad
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2015-10-14 10:05:49 +08:00
Zheng Yang
c7eae6490c video: rockchip: hdmi: 3288w: support HDCP2.2
Change-Id: Ie20cba47fa925b5a3cce49ec2557e47ce737459e
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit db93f1aadfa06f47a0b9041b172cfcc4028e4928)
2015-10-14 08:51:36 +08:00
Shen Zhenyi
c196bbf342 video: rockchip: display-sys: Add the same display interface device naming convention
When multiple same type display interface is registered, such as TV, named TV, TV1, TV2.

Change-Id: I33f7e12c4942c3bf7eb29cca8ef6037f9e78d1af
Signed-off-by: Shen Zhenyi <szy@rock-chips.com>
2015-10-13 18:59:52 +08:00
Chen Liang
bc2d3a7a84 rk3128-box: add dts file for NS kernel
Change-Id: I987886db8624e09deacc1fb6f19b4e5bf90cf6d8
Signed-off-by: Chen Liang <cl@rock-chips.com>
2015-10-13 17:41:44 +08:00
Chen Liang
c24a26eb38 rk312x: add psci support
This is just add psci code into kernel, if you want to enable psci, you must
add psci=enable in the Command Line.

Change-Id: I3a6a24e455a4f684d543938257dc2771c5c267e2
Signed-off-by: Chen Liang <cl@rock-chips.com>
2015-10-13 15:26:03 +08:00
Sugar Zhang
35e4ce9e3e dts: rk3228: add i2s, spdif dts node
Change-Id: Icbec983c72b81cc584bf552522e02e9fcbc0c29c
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2015-10-13 14:37:54 +08:00
Shen Zhenyi
5f6abdf11d rk_fb: add extern screen open iommu, when dual screen display using iommu
Change-Id: Ia216d102df6841d4497144fe3c53aaeea9860178
Signed-off-by: Shen Zhenyi <szy@rock-chips.com>
2015-10-12 15:44:50 +08:00
Zheng Yang
1d9b35e9d1 video: rockchip: hdmi: fix parsing 1st block edid
If parsing 1st block edid failed, we think it is good
only when there is more than one external block.

Change-Id: I1eb11405dade41ebb2ad041ba909de0c7ea120f8
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-10-12 14:13:07 +08:00
Zheng Yang
495b4a8232 video: rockchip: fb: delele obsolete code for box
There is no difference between mid and box on setting
RK_FBIOSET_CONFIG_DONE.

Change-Id: I8a454a318ad8663b5e0f94ac05c067c6b386801a
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
2015-10-12 10:17:29 +08:00
Huang, Tao
13b4f3e372 arm64: dts: Makefile: Add more rockchip target in dtbs list
Change-Id: I85902304639d6c938df2ff3f1702d5a2531b26d1
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-10-10 19:43:29 +08:00
Huang, Tao
e9bc5b18e5 ARM: dts: Makefile: Add more rockchip target in dtbs list
Change-Id: Ieaa459bed8b3a6f6b67b52c78d4a37d9e50836d3
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-10-10 17:47:34 +08:00
zhangqing
741e50a5c7 rk3228: clk: enable aclk_dmac_bus when clk init
modify enable aclk_dmac_bus control bits.
make aclk_dmac_bus enabled when clk init.

Change-Id: I670dbaabcf9ba6cf9ce683090b49c72e4cbd0410
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
2015-10-10 17:15:34 +08:00
Xiao Feng
f399038b27 arm: rockchip: rk3228: dts: add DMAC support
Change-Id: Ic6f8a106e8ecdcdf153873a65b90567b3edb48ad
Signed-off-by: Xiao Feng <xf@rock-chips.com>
2015-10-10 15:32:26 +08:00
Shen Zhenyi
172981dc89 video: rockchip: lcdc: 3288: set iommu_status to 0, when all layer closed
Change-Id: I494c54017be89e48836870f015f420a0c148c980
Signed-off-by: Shen Zhenyi <szy@rock-chips.com>
2015-10-09 17:13:30 +08:00