Chen Liang [Thu, 22 Oct 2015 02:03:26 +0000 (10:03 +0800)]
ARM: dts: rk3228: add syscon node for sgrf\grf\cru\ddrpctl\msch
Change-Id: I00bdb4b64a4e5e0a7f5fcd9dd29ec76fd4aba218
Signed-off-by: Chen Liang <cl@rock-chips.com>
zhangqing [Wed, 21 Oct 2015 19:52:15 +0000 (12:52 -0700)]
ARM: dts: rk3228: support cru soft reset
support cru soft reset for rk3228.
Change-Id: I7bd1a58d55bdd2b2f1eb3ae9fc80705ffb74c1be
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
Kamal Mostafa [Wed, 17 Jun 2015 22:23:00 +0000 (15:23 -0700)]
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
0d0a2bf6ed4b489eef9a84450b3d90e6e001ce63 upstream.
There is a copy and paste bug, "->clk" vs "->pclk", so we return the
wrong error code here.
Change-Id: I3ef649ce940016fd9214ea924b243a07bdc58248
Fixes: cbac8f639437 ('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>
chenzhen [Wed, 21 Oct 2015 00:59:41 +0000 (08:59 +0800)]
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>
David Wu [Tue, 20 Oct 2015 09:10:58 +0000 (17:10 +0800)]
rk3368: thermal: remove unused code and fix style
Change-Id: Ie9e370082e422f528b4156a56b4ebc881686b12a
Signed-off-by: David Wu <wdc@rock-chips.com>
Xiao Feng [Mon, 19 Oct 2015 09:22:03 +0000 (17:22 +0800)]
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>
xiaoyao [Thu, 15 Oct 2015 09:02:17 +0000 (17:02 +0800)]
ARM: rk3228: dts: add SDCard/SDIO/eMMC DTS node for RK3228 SDK board
Change-Id: I32b778c73a7aeb9461c462b0328f98eca0a06fdc
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
xiaoyao [Thu, 15 Oct 2015 09:00:37 +0000 (17:00 +0800)]
ARM: rk3228: dtsi: add SDCard/SDIO/eMMC DTS node for RK3228 Chip
Change-Id: I172bceadc7bb4a09394837fd6bb81bbbedd7ddae
Signed-off-by: xiaoyao <xiaoyao@rock-chips.com>
chenzhen [Mon, 19 Oct 2015 02:00:05 +0000 (10:00 +0800)]
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>
Xu Xuehui [Mon, 19 Oct 2015 03:08:20 +0000 (11:08 +0800)]
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>
Shen Zhenyi [Mon, 19 Oct 2015 03:21:25 +0000 (11:21 +0800)]
video: rockchip: tve: support rk3228
Change-Id: I7046f5b42de442c8bf7946a537d3e26922882d1d
Signed-off-by: Shen Zhenyi <szy@rock-chips.com>
Shen Zhenyi [Fri, 16 Oct 2015 07:49:24 +0000 (15:49 +0800)]
ARM: dts: rk3228: add tve config
Change-Id: I455e94459078632d42e9653b926d3fc4d06bddb4
Signed-off-by: Shen Zhenyi <szy@rock-chips.com>
Zhang Zhijie [Tue, 20 Oct 2015 02:47:31 +0000 (10:47 +0800)]
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>
chenzhen [Fri, 16 Oct 2015 11:04:59 +0000 (19:04 +0800)]
ARM: rockchip_defconfig: add config for mali_400_ko.
Change-Id: I6f28c56fd5a9f9fb77980e09ed2f15c6f997337c
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
Mark Yao [Thu, 15 Oct 2015 02:33:33 +0000 (10:33 +0800)]
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>
Mark Yao [Wed, 14 Oct 2015 10:22:33 +0000 (18:22 +0800)]
rk3228: dts: add series nodes for display
Change-Id: I488ac645ceb7ccd7ecd7512f711ce5418553e431
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Mark Yao [Wed, 14 Oct 2015 10:11:37 +0000 (18:11 +0800)]
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>
Mark Yao [Wed, 14 Oct 2015 10:04:08 +0000 (18:04 +0800)]
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>
Simon Xue [Fri, 16 Oct 2015 02:38:12 +0000 (10:38 +0800)]
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>
Yunzhi Li [Thu, 15 Oct 2015 03:51:04 +0000 (11:51 +0800)]
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>
chenzhen [Thu, 15 Oct 2015 01:15:59 +0000 (09:15 +0800)]
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>
Zheng Yang [Wed, 14 Oct 2015 11:09:11 +0000 (19:09 +0800)]
ARM: dts: rk3228: add hdmi and hdcp22
Change-Id: I4c2081ce5bbede0880361b54aa38478c79e529fa
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Wed, 14 Oct 2015 08:50:18 +0000 (16:50 +0800)]
video: rockchip: hdmi: support rk3228
Change-Id: I3b1e3d4042c5b14e0759418c29e112dfae7d50b1
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
chenzhen [Wed, 23 Sep 2015 03:40:15 +0000 (11:40 +0800)]
rk312x, mali_400: correct coding style in platform_dependent_part.
Change-Id: I312b59f8875fd5d115a3a1c1e925a38afe8e7fa6
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
Simon Xue [Wed, 14 Oct 2015 02:43:25 +0000 (10:43 +0800)]
ARM: dts: rk3228: add vop/vpu/hevc/iep iommu config
Change-Id: Id784598ad7af4ddb5569423a4f77e035b4a7c9d0
Signed-off-by: Simon Xue <xxm@rock-chips.com>
zhangqing [Wed, 14 Oct 2015 15:42:16 +0000 (08:42 -0700)]
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>
Sugar Zhang [Wed, 14 Oct 2015 06:18:40 +0000 (14:18 +0800)]
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>
Huang Jiachai [Wed, 14 Oct 2015 02:41:00 +0000 (10:41 +0800)]
video: rockchip: fb: distinguish between RGB YUV and FBDC data format
Change-Id: Ia351340cf05e5264d798348178b488917ada4482
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
Huang Jiachai [Tue, 13 Oct 2015 10:12:14 +0000 (18:12 +0800)]
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>
Zheng Yang [Wed, 14 Oct 2015 03:50:59 +0000 (11:50 +0800)]
video: rockchip: hdmi: v2: phy support clk 59.4MHz
Change-Id: Ibce9bcd09fa8011642c7a9e8de9f4b3471c23e8b
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Simon Xue [Tue, 13 Oct 2015 10:11:39 +0000 (18:11 +0800)]
ARM: dts: rk3228: add gpu config
Change-Id: Ib8dbc4ede8abd4816e501454fe4a1f21fe3f54ad
Signed-off-by: Simon Xue <xxm@rock-chips.com>
Zheng Yang [Tue, 29 Sep 2015 01:25:55 +0000 (09:25 +0800)]
video: rockchip: hdmi: 3288w: support HDCP2.2
Change-Id: Ie20cba47fa925b5a3cce49ec2557e47ce737459e
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit
db93f1aadfa06f47a0b9041b172cfcc4028e4928)
Shen Zhenyi [Mon, 12 Oct 2015 12:37:31 +0000 (20:37 +0800)]
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>
Chen Liang [Tue, 13 Oct 2015 06:47:24 +0000 (14:47 +0800)]
rk3128-box: add dts file for NS kernel
Change-Id: I987886db8624e09deacc1fb6f19b4e5bf90cf6d8
Signed-off-by: Chen Liang <cl@rock-chips.com>
Chen Liang [Tue, 13 Oct 2015 06:37:23 +0000 (14:37 +0800)]
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>
Sugar Zhang [Tue, 13 Oct 2015 02:25:47 +0000 (10:25 +0800)]
dts: rk3228: add i2s, spdif dts node
Change-Id: Icbec983c72b81cc584bf552522e02e9fcbc0c29c
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Shen Zhenyi [Mon, 12 Oct 2015 06:27:00 +0000 (14:27 +0800)]
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>
Zheng Yang [Mon, 12 Oct 2015 03:46:43 +0000 (11:46 +0800)]
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>
Zheng Yang [Sat, 10 Oct 2015 08:22:15 +0000 (16:22 +0800)]
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>
Huang, Tao [Sat, 10 Oct 2015 11:43:29 +0000 (19:43 +0800)]
arm64: dts: Makefile: Add more rockchip target in dtbs list
Change-Id: I85902304639d6c938df2ff3f1702d5a2531b26d1
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Huang, Tao [Sat, 10 Oct 2015 09:31:24 +0000 (17:31 +0800)]
ARM: dts: Makefile: Add more rockchip target in dtbs list
Change-Id: Ieaa459bed8b3a6f6b67b52c78d4a37d9e50836d3
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
zhangqing [Sat, 10 Oct 2015 14:39:11 +0000 (07:39 -0700)]
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>
Xiao Feng [Sat, 10 Oct 2015 06:46:01 +0000 (14:46 +0800)]
arm: rockchip: rk3228: dts: add DMAC support
Change-Id: Ic6f8a106e8ecdcdf153873a65b90567b3edb48ad
Signed-off-by: Xiao Feng <xf@rock-chips.com>
Shen Zhenyi [Wed, 30 Sep 2015 09:40:46 +0000 (17:40 +0800)]
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>
xxh [Thu, 8 Oct 2015 06:18:55 +0000 (14:18 +0800)]
esp8089: fix ESP8089 wifi can not work when use CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOT
Change-Id: Ib08bcc45f3c11e2de0f29c9739772d56071d467f
Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
Zheng Yang [Thu, 8 Oct 2015 06:36:23 +0000 (14:36 +0800)]
video: rockchip: hdmi: v2: get phy register setting from dts
We can configurate phy setting in dts node "rockchip,phy_table"
with following format:
<maxfreq pre-emphasis slopeboost clklevel data0level data1level data2level>
Phy setting table must list from low freq to high freq and cover
all supported frequency, for example:
&hdmi {
status = "okay";
rockchip,phy_table =
<
165000000 0 0 17 17 17 17>,
<
340000000 0 0 14 17 17 17>,
<
594000000 0 0 9 17 17 17>;
};
If dts node is not exist, we use default setting defined in code.
Change-Id: I06731419057a2a8cf4d210bf566b1206edc39ea1
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Wed, 7 Oct 2015 02:55:33 +0000 (10:55 +0800)]
video: rockchip: hdmi: fix error of 8/10 bit color depth selection
Change-Id: I3c9c35dced4db9b5f103d0d3de482f33d7257ae0
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Thu, 17 Sep 2015 09:01:37 +0000 (17:01 +0800)]
video: rockchip: hdmi: redefine input/output color relationship
For YCbCr420 mode, input color and output color must be same as
HDMI_COLOR_YCBCR420.
Change-Id: I302c1a0572d706abdebf5d2d35bd100e0242edf9
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
(cherry picked from commit
c3ed688f02f76dfc5533124c41bbb8c016e3cc97)
Mark Yao [Wed, 7 Oct 2015 06:54:39 +0000 (14:54 +0800)]
rk3288: dts: support popmetal opensource board
Change-Id: I42fd55bfa73d25643a9e0435af93e311d3ed3206
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Mark Yao [Wed, 7 Oct 2015 07:37:36 +0000 (15:37 +0800)]
lcd: vga: add some vga timing
Change-Id: I6e54d0025b4622cdfcc3a4ceac443e441c7e1742
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Zheng Yang [Wed, 30 Sep 2015 03:20:02 +0000 (11:20 +0800)]
video: rockchip: lcdc: 312x: output color according to input screen parameter
Change-Id: I3d9b8982a247462ee3a6a0e00636881d35be9b4b
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
David Wu [Wed, 30 Sep 2015 03:17:02 +0000 (11:17 +0800)]
rk3x: i2c: prevent i2c xfer, when i2c shut down.
if rk818 driver's shutdown func called, it should not do i2c transfer.
And rk818's shutdown func is behind of i2c driver's shutdown func.
Change-Id: Iec96ad4640894f604493d8c764a2f98e75397885
Signed-off-by: David Wu <wdc@rock-chips.com>
Mark Yao [Wed, 30 Sep 2015 06:28:10 +0000 (14:28 +0800)]
rk3228: lcdc: default build-in rk3228 vop
Change-Id: Ia0d9ac5000122d8f782b4eebb21af3f427119978
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Mark Yao [Fri, 25 Sep 2015 05:31:08 +0000 (13:31 +0800)]
rk3228-fpga: dts: add series nodes for display
rk_fb display need ion and backlight node,
so add ion and backlight node.
Change-Id: I89ed88e429a2ea56e19bc12bc818ffba71f9e3b2
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Mark Yao [Mon, 21 Sep 2015 07:57:50 +0000 (15:57 +0800)]
Documentation: add rockchip,rk3228-lcdc to rockchip_lcdc.txt
Change-Id: I0c81e8d340fd3d714dc1e85e0198bdee7dfd5bd6
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Mark Yao [Mon, 21 Sep 2015 07:57:30 +0000 (15:57 +0800)]
rk_fb: video: add rk3228 vop support
Change-Id: Iaa8ea3da4de2746c4cff5e0e820b8f0508c44d55
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Mark Yao [Mon, 28 Sep 2015 02:05:37 +0000 (10:05 +0800)]
rk_fb: add output colorspace define
Change-Id: I2507bd1b17e782501fd7b4cb4f67d5ddbb45da90
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Mark Yao [Wed, 23 Sep 2015 08:28:12 +0000 (16:28 +0800)]
rk_fb: add bt2020/bt709/bt601 colorspace support
Change-Id: I55177d4e40bb8111787efe654f18e3e21c016491
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Zhangbin Tong [Tue, 29 Sep 2015 01:36:47 +0000 (09:36 +0800)]
power_supply: cw2015_battery: Add msleep(200) when recover from sleep mode
Change-Id: I66f0ee349622f24646376822948d331922676ad3
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
Huang Jiachai [Wed, 23 Sep 2015 10:12:58 +0000 (18:12 +0800)]
dtsi: lcd-F402: CABC lut need the last 128 gray
Change-Id: Iff405b5f377826b6f6369f511b49689155f5acff
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
(cherry picked from commit
c7d371ea3c2485a6b52b3bab51d1f6da5533f229)
Huang Jiachai [Wed, 23 Sep 2015 10:21:39 +0000 (18:21 +0800)]
video: rockchip: lcdc: 3288: update CABC lut addr
Change-Id: Ifcd0e7c76962fff628c2c372057937809ee850da
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
(cherry picked from commit
92e3d58d7ffc7d0687e032409de56b93f2e30d51)
Zhangbin Tong [Tue, 29 Sep 2015 00:51:55 +0000 (08:51 +0800)]
power-supply: cw2015_battery: fix incorrect bracketing on a test
Change-Id: Id4910e148852ab64d9396b17d3daf403d1fcb4b2
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
Huang, Tao [Mon, 28 Sep 2015 11:16:34 +0000 (19:16 +0800)]
Merge tag 'lsk-v3.10-15.09-android'
LSK Android 15.09 v3.10
Zhangbin Tong [Mon, 28 Sep 2015 03:36:31 +0000 (11:36 +0800)]
power_supply: cw2015_battery: code style fixes
Change-Id: I3cf0af574e11b7fd32adaaecbd6dbe83e72c83c9
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
alpha.lin [Tue, 22 Sep 2015 08:44:04 +0000 (16:44 +0800)]
IEP: add capabilities query interface
add capabilities query interface for userspace to query
iep device feature in current soc.
Change-Id: I377e686b2ce0357aa75445e4e47e9e4883a077ae
Signed-off-by: alpha.lin <alpha.lin@rock-chips.com>
Mark Yao [Wed, 23 Sep 2015 08:03:31 +0000 (16:03 +0800)]
rk_fb: rename yuv444 10bit
HAL_PIXEL_FORMAT_YCrCb_420_SP_10 means yuv444 10bit format, but its
name looks like yuv 420sp 10bit, that is wrong.
Change-Id: I71db8577df6e3d912427ddafe057905870622ab2
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Alpha Lin [Tue, 15 Sep 2015 11:01:29 +0000 (19:01 +0800)]
IEP: re-caculate the uv address when 4k video input in iommu enable case.
In above case, old code will generate a fault address for
uv address if 4k video input or output.
Change-Id: I22e9793fbaa2da250097ba69a3fd4fdf58585b78
Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
alpha.lin [Wed, 23 Sep 2015 06:11:42 +0000 (14:11 +0800)]
VPU: Support both syscon and virtual address while access to grf resource.
If CONFIG_MFD_SYSCON macro define but no grf resource
define in dts will cause a error before this revision.
Change-Id: I70432530fba9c7a5d0b8f5a0c996d67237eb8198
Signed-off-by: alpha.lin <alpha.lin@rock-chips.com>
Huang Jiachai [Tue, 22 Sep 2015 11:00:00 +0000 (19:00 +0800)]
video: rockchip: lcdc: 3288: update for VOP YUV420 to HDMI
Change-Id: I3dbe2208e10318acf99b66e858d853c3d4efab04
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
Huang Jiachai [Mon, 21 Sep 2015 07:40:13 +0000 (15:40 +0800)]
video: rockchip: lcdc: 3288: delele some special config for vop full v1.0
Change-Id: Iec4db13e5cde5567d9c9a96f3e063ceb3656b256
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
Huang Jiachai [Fri, 18 Sep 2015 06:37:45 +0000 (14:37 +0800)]
video: rockchip: lcdc: 3288: update CABC config
Change-Id: I88dd84335943580cf81850cffe530ba73190fa7e
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
Wu Liang feng [Tue, 22 Sep 2015 03:42:59 +0000 (11:42 +0800)]
usb: gadget: accessory: add compatibility ioctl
Change-Id: I301c1f2f17c906d0a3912248fa16bc20b4a32b3c
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
Zheng Yang [Fri, 18 Sep 2015 08:58:52 +0000 (16:58 +0800)]
video: rockchip: hdmi: 3288/3368: set ddc clock to 50KHz.
Change-Id: I00ba32eb9115fe63606b6ccb441ca3b7e3378880
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Huang Jiachai [Fri, 18 Sep 2015 09:44:27 +0000 (17:44 +0800)]
dtsi: lcd-F402: update cabc gamma lut
Change-Id: I799d6f607b953912755a4a6517b89a0bd659e6cc
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
Huang Jiachai [Fri, 18 Sep 2015 09:47:47 +0000 (17:47 +0800)]
video: rockchip: fb: vop driver struct select depend on lcdc id from extent screen
Change-Id: Ied1a53b86ee2e524707a017ba65cd5e648e93bae
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
Huang Jiachai [Fri, 18 Sep 2015 09:08:36 +0000 (17:08 +0800)]
video: rockchip: fbsys: add node to display a picture
1. su & stop;
2. copy the picture bin to /data/fb0.bin;
3. echo "n xsize ysize format" > /sys/class/graphics/fb0/dsp_buf;
ps:
a. n is the number of picture
b. xsize and ysize is the picture resolution
c. format:
RGBA=1,RGBX=2,RGB=3,YUV420_SP=17
Change-Id: Id256bee73958b6ab6250a17a723b0b73e7197874
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
Chen Liang [Thu, 17 Sep 2015 12:12:23 +0000 (20:12 +0800)]
rk3228: add dts file for sdk
Change-Id: I628f67408e84974d88645363140f77b887143658
Signed-off-by: Chen Liang <cl@rock-chips.com>
Huibin Hong [Thu, 17 Sep 2015 11:04:26 +0000 (19:04 +0800)]
rk3368.dtsi: fiq debug baud rate comment, change 115000 to 115200
Change-Id: I55fe0e8f5cae2d5aa16952e9612331ecc928335d
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Chen Liang [Thu, 17 Sep 2015 06:50:29 +0000 (14:50 +0800)]
rk3228: initialize platform data
Change-Id: Id7fd0d98ef70641a62bd8520b72214141b5cf199
Signed-off-by: Chen Liang <cl@rock-chips.com>
Huang Jiachai [Wed, 16 Sep 2015 10:49:21 +0000 (18:49 +0800)]
video: rockchip: lcdc: 3288: add support yuv420 output
Change-Id: Id1cdc222774b37594eec3ed15633f9c138e6e9b1
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
Huibin Hong [Wed, 16 Sep 2015 11:28:21 +0000 (19:28 +0800)]
fiq debugger: driver update
1. Change fiq debugger trigger mode, enter “fiq” instead of
F5 with SecureCRT
Change-Id: I3b52ad435af3211675a8416c6e016147886def8d
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Zheng Yang [Tue, 15 Sep 2015 03:40:35 +0000 (11:40 +0800)]
video: rockchip: fb: recalculate logo offset to match new screen size
Change-Id: I9f62088f4d0868a9284d1794718da8f5a044f24a
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Tue, 15 Sep 2015 03:38:21 +0000 (11:38 +0800)]
video: rockchip: lcdc: 3288/3368: read screen regs in uboot mode
Change-Id: I36db50471140d041fd0220283bc4e6ce59ec9d74
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Tang Yun ping [Fri, 11 Sep 2015 03:46:36 +0000 (11:46 +0800)]
rk3368 ddr: add configure ddr timing function
1.add the function of configure ddr timing such us sr_idle, pd_idle, odt
disable frequency, dll bypass frequency, odt strength, driver strength in dts.
2.make sure commit
8be554a50237051e45e ("rk3368 dts: add ddr timing node in
rk3368.dtsi" add ddr timing node in dts that user can configure ddr timing in
dts file.) was merged.
3.bl30 must update to rk3368bl30_v2.11.bin.
Change-Id: Ie8ae559c8128eb01788271a4333c465e21954ab1
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
Xiao Feng [Tue, 15 Sep 2015 02:54:46 +0000 (10:54 +0800)]
dvfs: rockchip: modify the pvtm_info of RK3368_v0
Change-Id: If3216b4d8d220411e0c54a657357187315a5d4b5
Signed-off-by: Xiao Feng <xf@rock-chips.com>
zhangqing [Tue, 15 Sep 2015 14:20:56 +0000 (07:20 -0700)]
pmic: rk808: slove set voltage error
rk808 setting voltage had a overshoot question
so we set voltage must step by step.
support 12.5mv/step.
Change-Id: Idfce7b57d6717e51afaff2c170eff7bd16de23af
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
Chris Zhong [Tue, 15 Sep 2015 03:47:41 +0000 (11:47 +0800)]
ARM: dts: fix some code style issues
Change-Id: I3f1f5637729171079ca7d108ba59521018c9561d
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Zheng Yang [Tue, 15 Sep 2015 01:34:26 +0000 (09:34 +0800)]
video: rockchip: hdmi: 3368: support vesa dmt mode
Change-Id: Ic2a910cd50beb9b49baff7bd732f6c1bdd78790f
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Tue, 15 Sep 2015 01:30:33 +0000 (09:30 +0800)]
video: rockchip: hdmi: 3288/3368: phy pll support more vesa dmt clock
Change-Id: I7382e5554664f2014bb5aa579a2524bf1738d971
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Tue, 15 Sep 2015 01:29:05 +0000 (09:29 +0800)]
video: rockchip: hdmi: support some vesa dmt mode
Change-Id: I28e935c717ae69fb2b48a7c243f8ce3cc7101a86
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Chris Zhong [Tue, 15 Sep 2015 01:29:44 +0000 (09:29 +0800)]
ARM: dts: add a alias for rockchip_suspend
Since we need overwrite this rockchip_suspend node in sub dts file,
sometimes. Add a alias for before it.
Change-Id: I6d951d1c0bfff1cde619906eb9f11256d057a9fe
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Huang, Tao [Mon, 14 Sep 2015 11:17:07 +0000 (19:17 +0800)]
media: camsys_soc_priv: use cpu_is_rk3288 instead of soc_is_rk3288
Change-Id: If54087f71e0b6c923a11a6a37a4420ba86211070
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Zheng Yang [Mon, 14 Sep 2015 10:28:25 +0000 (18:28 +0800)]
video: fbdev: Add additional vesa modes
Change-Id: I485601d679687db9a655f06b48929e66883bdadd
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Kevin Hilman [Mon, 14 Sep 2015 21:16:21 +0000 (14:16 -0700)]
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android
Kevin Hilman [Mon, 14 Sep 2015 21:15:32 +0000 (14:15 -0700)]
Merge tag 'v3.10.88' of git://git./linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.10
This is the 3.10.88 stable release
* tag 'v3.10.88' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (48 commits)
Linux 3.10.88
arm64/mm: Remove hack in mmap randomize layout
crypto: caam - fix memory corruption in ahash_final_ctx
libfc: Fix fc_fcp_cleanup_each_cmd()
drm/radeon: add new OLAND pci id
EDAC, ppc4xx: Access mci->csrows array elements properly
localmodconfig: Use Kbuild files too
dm thin metadata: delete btrees when releasing metadata snapshot
perf: Fix fasync handling on inherited events
mm/hwpoison: fix page refcount of unknown non LRU page
ipc/sem.c: update/correct memory barriers
ipc,sem: fix use after free on IPC_RMID after a task using same semaphore set exits
Linux 3.10.87
mm, vmscan: Do not wait for page writeback for GFP_NOFS allocations
md/bitmap: return an error when bitmap superblock is corrupt.
kvm: x86: fix kvm_apic_has_events to check for NULL pointer
signal: fix information leak in copy_siginfo_from_user32
signal: fix information leak in copy_siginfo_to_user
signalfd: fix information leak in signalfd_copyinfo
ARM: 7819/1: fiq: Cast the first argument of flush_icache_range()
...
Chris Zhong [Wed, 2 Sep 2015 07:59:38 +0000 (15:59 +0800)]
pinctrl: rockchip: fix rk3288 gpio0 configuration
On rk3288, for gpio bank 0, the registers which configure pull-up,
iomux, and drive strength don't implement the enable bits in the upper
half of the register, unlike the other gpio configuration registers,
and so the kernel must perform a read-modify-write of the register to
update a particular gpio in that bank.
Change-Id: I4a6953839307e3a75b2ac554aac3dc865583617d
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Zheng Yang [Mon, 14 Sep 2015 02:49:30 +0000 (10:49 +0800)]
video: rockchip: fb: resize uboot logo if screen size is changed
If hdmi is inserted or removed before android is launched, screen
size is changed and uboot logo is showing on wrong screen position.
For example, screen size is 720x576 in uboot, hdmi is inserted during
kernel is booting, screen size is changed to 1920x1080, logo size
is still 720x576 and shown on left-top.
This case is occurred on box, mid has no problem. So we need to resize
uboot logo to new screen size.
Change-Id: I6247bf8e77d181687986815c960ec72d4c59a757
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Greg Kroah-Hartman [Sun, 13 Sep 2015 16:08:15 +0000 (09:08 -0700)]
Linux 3.10.88
Yann Droneaud [Mon, 17 Nov 2014 23:02:19 +0000 (23:02 +0000)]
arm64/mm: Remove hack in mmap randomize layout
commit
d6c763afab142a85e4770b4bc2a5f40f256d5c5d upstream.
Since commit
8a0a9bd4db63 ('random: make get_random_int() more
random'), get_random_int() returns a random value for each call,
so comment and hack introduced in mmap_rnd() as part of commit
1d18c47c735e ('arm64: MMU fault handling and page table management')
are incorrects.
Commit
1d18c47c735e seems to use the same hack introduced by
commit
a5adc91a4b44 ('powerpc: Ensure random space between stack
and mmaps'), latter copied in commit
5a0efea09f42 ('sparc64: Sharpen
address space randomization calculations.').
But both architectures were cleaned up as part of commit
fa8cbaaf5a68 ('powerpc+sparc64/mm: Remove hack in mmap randomize
layout') as hack is no more needed since commit
8a0a9bd4db63.
So the present patch removes the comment and the hack around
get_random_int() on AArch64's mmap_rnd().
Cc: David S. Miller <davem@davemloft.net>
Cc: Anton Blanchard <anton@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Yann Droneaud <ydroneaud@opteya.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Cc: Matthias Brugger <mbrugger@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Horia Geant? [Tue, 11 Aug 2015 17:19:20 +0000 (20:19 +0300)]
crypto: caam - fix memory corruption in ahash_final_ctx
commit
b310c178e6d897f82abb9da3af1cd7c02b09f592 upstream.
When doing pointer operation for accessing the HW S/G table,
a value representing number of entries (and not number of bytes)
must be used.
Fixes: 045e36780f115 ("crypto: caam - ahash hmac support")
Signed-off-by: Horia Geant? <horia.geanta@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
projects / firefly-linux-kernel-4.4.55.git / log