firefly-linux-kernel-4.4.55.git
4 years agoARM64: DTS: Fix Firefly board audio driver release-20171130_firefly
T-Firefly [Thu, 30 Nov 2017 04:59:41 +0000 (12:59 +0800)]
ARM64: DTS: Fix Firefly board audio driver

4 years agoARM64: DTS: fix vdd_log's regulator bug
T-Firefly [Fri, 28 Jul 2017 06:38:52 +0000 (14:38 +0800)]
ARM64: DTS: fix vdd_log's regulator bug

Change-Id: Iad85f5037ba3657ea2f4a3656f6e3f4ad99d570d

4 years agoARM64: DTS: enabled RGA device
T-Firefly [Mon, 28 Aug 2017 10:27:30 +0000 (18:27 +0800)]
ARM64: DTS: enabled RGA device

Change-Id: I7b41a0d004314cee8a7f5de583566e02bfb7b1ad

4 years agoARM64: DTS: Add rk3399-firefly uart4 device, node as /dev/ttyS1
T-Firefly [Sat, 19 Aug 2017 02:15:39 +0000 (10:15 +0800)]
ARM64: DTS: Add rk3399-firefly uart4 device, node as /dev/ttyS1

Change-Id: I4910156f469c81b111bb30d5462db9f125d14312

4 years agoMerge branch 'firefly' into squashCM
T-Firefly [Sat, 19 Aug 2017 08:26:44 +0000 (16:26 +0800)]
Merge branch 'firefly' into squashCM

Change-Id: I53c4317c04c651aabdd91052263e64adef55bd5c

4 years agoARM64: firefly: Add rk3399-firefly board support
T-Firefly [Sat, 19 Aug 2017 08:12:28 +0000 (16:12 +0800)]
ARM64: firefly: Add rk3399-firefly board support

Change-Id: I42bc1c24cfbfdb0e713d8fd83fdd2e075fd66d9c

4 years agodt-bindings: rockchip: drm: add secure memory region
Mark Yao [Wed, 26 Jul 2017 08:01:21 +0000 (16:01 +0800)]
dt-bindings: rockchip: drm: add secure memory region

Change-Id: Ibbfae144d5b79972ffa913801c7054c8af4bcd41
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
4 years agodrm/rockchip: gem: support secure memory
Mark Yao [Tue, 25 Jul 2017 09:27:03 +0000 (17:27 +0800)]
drm/rockchip: gem: support secure memory

Change-Id: I91dfbbfbf5d13983edfb79585e9beb980566f784
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
4 years agodrm/rockchip: gem: add get phys ioctl
Mark Yao [Tue, 25 Jul 2017 03:55:45 +0000 (11:55 +0800)]
drm/rockchip: gem: add get phys ioctl

Change-Id: Ic9b8c6acfaeb47ec720dbad3d8f5141ef7b13e5d
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
4 years agodrm/rockchip: gem: support force alloc cma buffer with flags
Mark Yao [Wed, 26 Jul 2017 07:44:54 +0000 (15:44 +0800)]
drm/rockchip: gem: support force alloc cma buffer with flags

Change-Id: I4749eac53609f865d0d4230364b1cbaf39ee0955
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
4 years agodrm/rockchip: lvds: RGB output should enable LVDS channel 1
Sandy Huang [Wed, 9 Aug 2017 06:18:07 +0000 (14:18 +0800)]
drm/rockchip: lvds: RGB output should enable LVDS channel 1

Change-Id: Iaa7b95f1316fa77425992574288b3262d5af84e7
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
4 years agodrm/rockchip: lvds: set funcs structures to const
Sandy Huang [Tue, 8 Aug 2017 12:34:32 +0000 (20:34 +0800)]
drm/rockchip: lvds: set funcs structures to const

Change-Id: Ie118a1184a315c8cb7808a14a87f23c8c9a47757
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
4 years agodrm/rockchip: lvds: add pinctrl for rk3288 rgb output
Sandy Huang [Mon, 7 Aug 2017 09:53:30 +0000 (17:53 +0800)]
drm/rockchip: lvds: add pinctrl for rk3288 rgb output

Change-Id: I4c483eb269d021860fe4249a3d25bcfb6c4f3f5f
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
4 years agovideo/rockchip: rga2: correct BGRA stride
Mark Yao [Wed, 9 Aug 2017 07:00:10 +0000 (15:00 +0800)]
video/rockchip: rga2: correct BGRA stride

Change-Id: I019e2e410936f43b244ddde260cbd51c16a175e4
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
4 years agoPM / devfreq: rockchip_dmc: Fix locking when rounding rate
Finley Xiao [Wed, 9 Aug 2017 04:36:21 +0000 (12:36 +0800)]
PM / devfreq: rockchip_dmc: Fix locking when rounding rate

There's no need to take the rcu read lock when rounding rate.

This patch fixes the following BUG:
BUG: sleeping function called from invalid context at kernel/locking/mutex.c:620
in_atomic(): 0, irqs_disabled(): 0, pid: 153, name: kworker/u16:2
5 locks held by kworker/u16:2/153:
 #0:  ("%s"("devfreq_wq")){......}, at: [<ffffff80080b8cf4>] process_one_work+0x1c4/0x58c
 #1:  ((&(&devfreq->work)->work)){......}, at: [<ffffff80080b8cf4>] process_one_work+0x1c4/0x58c
 #2:  (&devfreq->lock){......}, at: [<ffffff80089534c8>] devfreq_monitor+0x28/0x8c
 #3:  (&vop->vop_lock){......}, at: [<ffffff80084c826c>] dmc_notifier_call+0x14/0x34
 #4:  (rcu_read_lock){......}, at: [<ffffff80089557f0>] rockchip_dmcfreq_target+0x0/0x2e0
CPU: 3 PID: 153 Comm: kworker/u16:2 Not tainted 4.4.77 #2573
Hardware name: Rockchip Sheep board (DT)
Workqueue: devfreq_wq devfreq_monitor
Call trace:
[<ffffff8008089930>] dump_backtrace+0x0/0x1c8
[<ffffff8008089b0c>] show_stack+0x14/0x1c
[<ffffff800839718c>] dump_stack+0x8c/0xac
[<ffffff80080c8d5c>] ___might_sleep+0x11c/0x128
[<ffffff80080c8ddc>] __might_sleep+0x74/0x84
[<ffffff8008c371a4>] mutex_lock_nested+0x4c/0x39c
[<ffffff80089458d8>] clk_prepare_lock+0x58/0xc8
[<ffffff8008946ec8>] clk_round_rate+0x34/0x94
[<ffffff800895589c>] rockchip_dmcfreq_target+0xac/0x2e0
[<ffffff80089533f4>] update_devfreq+0x100/0x1ac
[<ffffff80089534d0>] devfreq_monitor+0x30/0x8c
[<ffffff80080b8e1c>] process_one_work+0x2ec/0x58c
[<ffffff80080ba16c>] worker_thread+0x300/0x428
[<ffffff80080bf3e0>] kthread+0x104/0x10c
[<ffffff8008082840>] ret_from_fork+0x10/0x50

Change-Id: I31f75a55da72cab597796edd5c339222094fff97
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
4 years agoARM: dts: rk312x: add node for GPU
Zhen Chen [Tue, 8 Aug 2017 07:38:03 +0000 (15:38 +0800)]
ARM: dts: rk312x: add node for GPU

Change-Id: If5942626e2d99fcfd341cbceec3b367d0e9def1a
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
4 years agodrm/rockchip: vop: zpos set to INT_MAX if not enabled
Mark Yao [Tue, 8 Aug 2017 08:46:20 +0000 (16:46 +0800)]
drm/rockchip: vop: zpos set to INT_MAX if not enabled

Change-Id: Ia78c26f400d0cc4192cae183f83b7f06575c9332
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
4 years agodrm/rockchip: vop: correct win23 alpha define
Mark Yao [Tue, 8 Aug 2017 08:44:36 +0000 (16:44 +0800)]
drm/rockchip: vop: correct win23 alpha define

Change-Id: I3e3bfbb9164b35a9f96d4bc71ab4c023d8270fc5
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
4 years agodrm/rockchip: lvds: mipi_lvds_ctl set to mipi dsi controller base address
Sandy Huang [Mon, 7 Aug 2017 09:33:32 +0000 (17:33 +0800)]
drm/rockchip: lvds: mipi_lvds_ctl set to mipi dsi controller base address

So we can define reg offset according to TRM, otherwise it will make
us confused.

Change-Id: I1687542fcaf7ac4e6e78d863e8940f6604794407
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
4 years agodrm/rockchip: lvds: update rk336x according rk3288 lvds function define
Sandy Huang [Mon, 7 Aug 2017 09:29:35 +0000 (17:29 +0800)]
drm/rockchip: lvds: update rk336x according rk3288 lvds function define

Change-Id: I9dbb9dc55f3d6d7ae498e94f595e8de47c6a4d43
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
4 years agoRevert "sched/tune: Initialize raw_spin_lock in boosted_groups"
Tao Huang [Tue, 8 Aug 2017 08:48:53 +0000 (16:48 +0800)]
Revert "sched/tune: Initialize raw_spin_lock in boosted_groups"

This reverts commit 9a9259a78c5c723db2a5daaae322f929012d967a.

It seems schedtune_init_cgroups and schedtune_boostgroup_init
all call raw_spin_lock_init(&bg->lock), it is wrong.

Change-Id: Icbdfeaf81f4fb59fdcc02623ac5e26d41bd1e496
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
4 years agoarm64: dts: rockchip: rk3399: modify gpu opp table
Finley Xiao [Mon, 7 Aug 2017 11:00:37 +0000 (19:00 +0800)]
arm64: dts: rockchip: rk3399: modify gpu opp table

As gpu clock sources had been changed, the gpu frequencies also
should modifiy.
1. 297MHz is not support and replace it with 300MHz.
2. If enable tow vops, 500MHz is not support,
   so remove it from the default table.

Change-Id: If2a653571f0222e895f7df825eeb8ae43ce99332
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
4 years agodrm/rockchip: dsi: partial revert commit 47aef8
WeiYong Bi [Mon, 7 Aug 2017 09:55:06 +0000 (17:55 +0800)]
drm/rockchip: dsi: partial revert commit 47aef8

fix anomaly display issue for rk3368 caused by commit 47aef8

Fixes 47aef8 (drm/rockchip: dw-mipi-dsi: organize dw_mipi_dsi_set_mode function)

Change-Id: Ida274c65898b13468a2f984555efdf67cf32aab7
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
4 years agoARM: dts: rockchip: rk3288 add efuse_id for cpuinfo
Jianqun Xu [Wed, 2 Aug 2017 09:06:41 +0000 (17:06 +0800)]
ARM: dts: rockchip: rk3288 add efuse_id for cpuinfo

Add efuse_id for cpuinfo to get system serial number.

Change-Id: If197c2961611364a2cb94972c33171bea105c61b
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
4 years agodrm/rockchip: hdmi: fix parse phy table error
Zheng Yang [Fri, 4 Aug 2017 11:04:06 +0000 (19:04 +0800)]
drm/rockchip: hdmi: fix parse phy table error

The value of sym_ctr and term is reversed.

Change-Id: I29adaf9a8590ff27c912d22e2370db2ef5b2c305
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
4 years agoARM: dts: rockchip: rk322x: add spi node and spi pinctrl
Huibin Hong [Wed, 2 Aug 2017 11:37:00 +0000 (19:37 +0800)]
ARM: dts: rockchip: rk322x: add spi node and spi pinctrl

Change-Id: I5bf28e2319ceb90bdc52d732cce2f646b29cae36
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
4 years agoARM: dts: rockchip: rk3288-andriod: fix dmc auto-min-freq
Finley Xiao [Mon, 7 Aug 2017 09:25:56 +0000 (17:25 +0800)]
ARM: dts: rockchip: rk3288-andriod: fix dmc auto-min-freq

Change-Id: Iaaa3c7cd250b92c36bf16b294fc14779e5aa3996
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
4 years agosched/fair: fix start_cpu lockdep warning
Tao Huang [Mon, 7 Aug 2017 08:56:18 +0000 (16:56 +0800)]
sched/fair: fix start_cpu lockdep warning

Should warn on !rcu_read_lock_sched_held.

Change-Id: Id4b38e8c2dee83aedb4b7a2f19588b31b07c1116
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
4 years agophy: rockchip-inno-mipi-dphy: enable PLL only when the PHY is power on
WeiYong Bi [Sat, 5 Aug 2017 01:24:04 +0000 (09:24 +0800)]
phy: rockchip-inno-mipi-dphy: enable PLL only when the PHY is power on

Change-Id: I6ff1a0a533a9f45f13d5be39fd5f68b5a0e18deb
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
4 years agodrm/rockchip: vop: fixup post scale configure
Mark Yao [Fri, 4 Aug 2017 09:06:43 +0000 (17:06 +0800)]
drm/rockchip: vop: fixup post scale configure

Fixes: 7f1f1ef ("drm/rockchip: vop: don't force enable post scale")
Change-Id: I57b44e7fe00bce7615ecde2e1f23837c74532c68
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
4 years agonet: wireless: rockchip_wlan: add rtl8723bs support
zzc [Thu, 3 Aug 2017 06:44:12 +0000 (14:44 +0800)]
net: wireless: rockchip_wlan: add rtl8723bs support

update rtl8723bs wifi driver to version v4.4.2_17831.20160519_BTCOEX20151223-654a

Change-Id: I1976f1ece2f318ab7eb11308bc019691ff84d319
Signed-off-by: zzc <zzc@rock-chips.com>
4 years agodt-bindings: Document the Rockchip RGA bindings
Jacob Chen [Fri, 4 Aug 2017 00:40:23 +0000 (08:40 +0800)]
dt-bindings: Document the Rockchip RGA bindings

Add DT bindings documentation for Rockchip RGA

Change-Id: Ie53383728c30a1245cd26a097622d3a564db7aa2
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
4 years agoFROMLIST: rockchip/rga: v4l2 m2m support
Jacob Chen [Thu, 3 Aug 2017 06:19:24 +0000 (14:19 +0800)]
FROMLIST: rockchip/rga: v4l2 m2m support

Rockchip RGA is a separate 2D raster graphic acceleration unit. It
accelerates 2D graphics operations, such as point/line drawing, image
scaling, rotation, BitBLT, alpha blending and image blur/sharpness

The drvier is mostly based on s5p-g2d v4l2 m2m driver
And supports various operations from the rendering pipeline.
 - copy
 - fast solid color fill
 - rotation
 - flip
 - alpha blending

The code in rga-hw.c is used to configure regs accroding to operations
The code in rga-buf.c is used to create (1-Level)mmu table for RGA
The tables is stored in a list, and be removed when buffer is cleanup
(am form https://patchwork.linuxtv.org/patch/42846/)

Change-Id: I3ddd885beb2388be2ef23fe75806719d1fda8695
Signed-off-by: Jacob Chen <jacob-chen@iotwrt.com>
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
4 years agoFROMLIST: v4l: add porter duff blend controls
Jacob Chen [Mon, 31 Jul 2017 06:31:13 +0000 (14:31 +0800)]
FROMLIST: v4l: add porter duff blend controls

At peresent, we don't have a control for Compositing and Blend.
All drivers are just doing copies while actually many hardwares
supports more functions.

So Adding V4L2 controls for Compositing and Blend, used for for
composting streams.
(am from https://patchwork.linuxtv.org/patch/42848/)
The values are based on porter duff operations.
Defined in below links.
https://developer.xamarin.com/api/type/Android.Graphics.PorterDuff+Mode/

Change-Id: I16245fc8389a433ebdcb228081a80daa48e8c539
Suggested-by: Nicolas Dufresne <nicolas@ndufresne.ca>
Signed-off-by: Jacob Chen <jacob-chen@iotwrt.com>
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
4 years agoarm64: dts: rk3399: change rga node for v4l2 rga
Jacob Chen [Fri, 4 Aug 2017 00:39:39 +0000 (08:39 +0800)]
arm64: dts: rk3399: change rga node for v4l2 rga

remove some unnecessary prop

Change-Id: I37c841b6048fcacaa7442cfc23872e2ccaf92e6c
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
4 years agoARM: dts: rk3288: change rga node for v4l2 rga
Jacob Chen [Fri, 4 Aug 2017 00:39:18 +0000 (08:39 +0800)]
ARM: dts: rk3288: change rga node for v4l2 rga

remove some unnecessary prop

Change-Id: Ibdb8e781d7a6ab6ede4041f8e78f9c61674da498
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
4 years agoARM: rockchip_linux_defconfig: change to use v4l2 rga
Jacob Chen [Mon, 31 Jul 2017 06:20:04 +0000 (14:20 +0800)]
ARM: rockchip_linux_defconfig: change to use v4l2 rga

At present no component in linux depend on drm RGA, i'd like to remove it

Change-Id: I92e12e716e881463985fdf7c1430d47e34ba4155
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
4 years agoarm64: rockchip_linux_defconfig: change to use v4l2 rga
Jacob Chen [Mon, 31 Jul 2017 06:19:51 +0000 (14:19 +0800)]
arm64: rockchip_linux_defconfig: change to use v4l2 rga

At present no component in linux depend on drm RGA, i'd like to remove it

Change-Id: Ibf531641d3dd30bd87f83dbfe1fd06af2d3dffcb
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
4 years agodrm/rockchip: remove rga driver
Jacob Chen [Mon, 31 Jul 2017 06:19:35 +0000 (14:19 +0800)]
drm/rockchip: remove rga driver

we have to many rga drivers.. let's remove it to avoid misunderstanding

Change-Id: I807c9ff7dc967a00d30ccba5adc5d234e27b9d6a
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
4 years agoarm64: dts: rockchip: rk3399: Correct DPHY PLL clock
WeiYong Bi [Thu, 3 Aug 2017 01:56:05 +0000 (09:56 +0800)]
arm64: dts: rockchip: rk3399: Correct DPHY PLL clock

clk_24m --> Gate --> clk_mipidphy_ref --> Gate --> clk_dphy_pll

Change-Id: Icb5283c0854a475a5f2fc436e7d4448393b5ac95
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
4 years agodrm/rockchip: dsi: fix Non-SNPS PHY power on sequence
WeiYong Bi [Fri, 4 Aug 2017 01:09:12 +0000 (09:09 +0800)]
drm/rockchip: dsi: fix Non-SNPS PHY power on sequence

Change-Id: If9f131ec6ebc8b194034bf231ca2bcc120440860
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
4 years agodrm/rockchip: get connector in bridge mode
Huang Jiachai [Mon, 31 Jul 2017 11:53:15 +0000 (19:53 +0800)]
drm/rockchip: get connector in bridge mode

Change-Id: I08535f5c2d83783dc86ae641daeb530dedec36e6
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
4 years agodrm/rockchip: add loader protect for encoder
Huang Jiachai [Thu, 27 Jul 2017 07:23:31 +0000 (15:23 +0800)]
drm/rockchip: add loader protect for encoder

Change-Id: I9fa1e949a55d8778b44ff809630337d5d35ffa11
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
4 years agodrm/rockchip: lvds: support external bridge
Huang Jiachai [Tue, 25 Jul 2017 02:36:20 +0000 (10:36 +0800)]
drm/rockchip: lvds: support external bridge

Change-Id: If4a0da37f8c2062d0efd09bf71cd566091043127
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
4 years agodrm/rockchip: lvds move dpms/commit to enable ops
Huang Jiachai [Thu, 3 Aug 2017 09:02:24 +0000 (17:02 +0800)]
drm/rockchip: lvds move dpms/commit to enable ops

Change-Id: I23d9f2ebdcd55ecd2a3922cc3e06bb162a68b6e5
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
4 years agodrm/panel: simple: Documentation: add description of same properties
Jerry Xu [Mon, 31 Jul 2017 09:45:19 +0000 (17:45 +0800)]
drm/panel: simple: Documentation: add description of same properties

Change-Id: I94eba21a76c10b7ce71031c2070388642f4cabbe
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
4 years agoARM64: dts: rockchip: modify the name of the delay time for panel
Jerry Xu [Thu, 3 Aug 2017 01:37:40 +0000 (09:37 +0800)]
ARM64: dts: rockchip: modify the name of the delay time for panel

Change-Id: Ia5be1987321873273f5ebbe79270bb66375acba6
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
4 years agoARM: dts: rk3288-x7811-rk818-dual-dsi: modify the link of the panel node
Jerry Xu [Wed, 2 Aug 2017 09:54:02 +0000 (17:54 +0800)]
ARM: dts: rk3288-x7811-rk818-dual-dsi: modify the link of the panel node

Change-Id: Iefe04a23ff8e922a89bf86ea7d9a672c5743f012
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
4 years agodrm/rockchip: dw-mipi-dsi: configure grf register for 3399
Jerry Xu [Thu, 3 Aug 2017 08:49:27 +0000 (16:49 +0800)]
drm/rockchip: dw-mipi-dsi: configure grf register for 3399

1. Fixes: 6cd4eabae71d("drm/rockchip: dw-mipi-dsi: add dual-channel dsi support")
2. add for dual-channel dsi

Change-Id: I69a25fcf8087872f3e7d254f4606ea08e458c295
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
4 years agonet: rfkill-wlan: fix read wifi mac address failed
zzc [Wed, 2 Aug 2017 01:43:56 +0000 (09:43 +0800)]
net: rfkill-wlan: fix read wifi mac address failed

Change-Id: I4eea5e32a063bca45671c8a70d48b26bb2e7bd44
Signed-off-by: zzc <zzc@rock-chips.com>
4 years agodrm/rockchip: dw-mipi-dsi: modify the way to find the panel node
Jerry Xu [Wed, 2 Aug 2017 09:58:48 +0000 (17:58 +0800)]
drm/rockchip: dw-mipi-dsi: modify the way to find the panel node

Change-Id: Ib88c11d5c44d9dc465604ddf9b00e361ff7ac958
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
4 years agoARM: dts: rk322x: add reboot mode support.
Wenping Zhang [Wed, 2 Aug 2017 07:22:10 +0000 (15:22 +0800)]
ARM: dts: rk322x: add reboot mode support.

Change-Id: I5018ba43bb8dbdadbb7273042ac4237a1663168a
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
4 years agodrm/rockchip: vop: Fix unregister devfreq notifier unsuccessfully
Finley Xiao [Wed, 2 Aug 2017 08:19:50 +0000 (16:19 +0800)]
drm/rockchip: vop: Fix unregister devfreq notifier unsuccessfully

Change-Id: I0d1e02eea2af59d63ea2948e14277aa6ad9955b6
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
4 years agoarm64: dts: rockchip: rk3399: Correct reset-names for dsi
WeiYong Bi [Wed, 2 Aug 2017 08:38:49 +0000 (16:38 +0800)]
arm64: dts: rockchip: rk3399: Correct reset-names for dsi

Change-Id: Icf9b7e6dd7e1f660ca109dae4d13a9b0c6192ae3
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
4 years agoarm64: rockchip_linux_defconfig: disable unless options
Randy Li [Thu, 20 Jul 2017 01:29:03 +0000 (09:29 +0800)]
arm64: rockchip_linux_defconfig: disable unless options

Those driver will never be used at rockchip platform and features
may not be widely used is disabled this time.

1. Ethernet drivers for the other platforms.
2. Network features which are used for IPSec(VPN), bandwidth
control or network management.
3. Disable strange input devices.
4. Disable those filesystems only used for special purposes.
5. Some misc devices only used in a few situations.
6. Disable all the security model except the unix default.

Change-Id: Iba9cef28099e6db4c44378fbb1a99c8d9a220847
Signed-off-by: Randy Li <randy.li@rock-chips.com>
4 years agodrm: fix mutex lock on connector register
Mark Yao [Wed, 2 Aug 2017 02:52:51 +0000 (10:52 +0800)]
drm: fix mutex lock on connector register

Fixes: c4a3cc5 ("drm: Paper over locking inversion after registration rework")
Change-Id: I43c8ec8ed7e21416a1e2531cd84d04ba148ad0c4
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
4 years agodrm/rockchip: vop: reference vblank before queue to flip worker
Mark Yao [Wed, 2 Aug 2017 01:48:43 +0000 (09:48 +0800)]
drm/rockchip: vop: reference vblank before queue to flip worker

Reference vblank after the fb_unref_worker may have a problem:
    queue fb_unref_work
                         <--- unfer_worker:drm_crtc_vblank_put()
    drm_crtc_vblank_get

Following Warning may cause by this race:

[11749.638812] WARNING: at drivers/gpu/drm/drm_irq.c:1272
[11749.638818] Modules linked in:
[11749.638825]
[11749.638833] CPU: 4 PID: 8446 Comm: kworker/u12:1 Not tainted 4.4.77 #2428
[11749.638841] Hardware name: Rockchip RK3399 Excavator Board edp (Android) (DT)
[11749.638864] Workqueue: events_unbound flip_worker
[11749.638873] task: ffffffc0f1a7db00 ti: ffffffc0da3f8000 task.ti: ffffffc0da3f8000
[11749.638884] PC is at drm_vblank_put+0x34/0xac
[11749.638890] LR is at drm_crtc_vblank_put+0x20/0x2c
[11749.642771] [<ffffff8008473cb0>] drm_vblank_put+0x34/0xac
[11749.642778] [<ffffff8008473d48>] drm_crtc_vblank_put+0x20/0x2c
[11749.642786] [<ffffff80084a2894>] vop_fb_unref_worker+0x14/0x28
[11749.642792] [<ffffff800848c2a0>] flip_worker+0xa8/0xe8
[11749.642801] [<ffffff80080b73f4>] process_one_work+0x218/0x3e0
[11749.642808] [<ffffff80080b7df4>] worker_thread+0x2e8/0x404
[11749.642814] [<ffffff80080bc738>] kthread+0xf8/0x100
[11749.642821] [<ffffff8008082840>] ret_from_fork+0x10/0x50

Change-Id: I2b7f8a84d18e4635122b5028d39ec8192c6ca70b
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
4 years agoRK3368 GPU: Update to Rogue 5.12.
ZhuangXiaoLiang [Mon, 10 Jul 2017 09:14:17 +0000 (17:14 +0800)]
RK3368 GPU: Update to Rogue 5.12.

1. PP_fix_KM patch from IMG.
2. Fix PVRSRVDevicePreClockSpeedChange failed.

Change-Id: I8380b5b90a1a493f15cee73fd272b6eeaf5b8135
Signed-off-by: ZhuangXiaoLiang <zhuangxl@rock-chips.com>
4 years agoarm64: configs: rockchip_defconfig enable PowerVR G6110.
ZhuangXiaoLiang [Tue, 1 Aug 2017 06:30:48 +0000 (14:30 +0800)]
arm64: configs: rockchip_defconfig enable PowerVR G6110.

Change-Id: Iae2151ddf2a75c1257bdae16faa3aaad860326a0
Signed-off-by: ZhuangXiaoLiang <zhuangxl@rock-chips.com>
4 years agoRK3368 GPU: Rogue N Init.
ZhuangXiaoLiang [Mon, 10 Jul 2017 09:09:56 +0000 (17:09 +0800)]
RK3368 GPU: Rogue N Init.

1. Init Rogue_DDK_Android_REL_1.8.RTM@4610191_kbuild_overlay.tgz.
2. Add rockchip support for DDK 1.8.RTM@4610191.

Change-Id: If89d9656bf8d57b7a3db88b049461d9ebeb9b11a
Signed-off-by: ZhuangXiaoLiang <zhuangxl@rock-chips.com>
4 years agodrm/rockchip: dsi: Documentation: modify the dsi node
Jerry Xu [Tue, 1 Aug 2017 02:16:17 +0000 (10:16 +0800)]
drm/rockchip: dsi: Documentation: modify the dsi node

1. rename mipi_dsi to dsi0
2. add some properties, such as dual-channel
3. add dsi1 node

Change-Id: I623d31e26ce21f28036a0f665f3e69d8d60b199b
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
4 years agodrm/panel: simple: modify the name of the delay time for dsi
Jerry Xu [Tue, 1 Aug 2017 01:59:59 +0000 (09:59 +0800)]
drm/panel: simple: modify the name of the delay time for dsi

Change-Id: Ib0ec9dd0d29f13fd6249903b292c997b293ce987
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
4 years agoARM: dts: rk3288: modify the name of the delay time for dsi
Jerry Xu [Tue, 1 Aug 2017 01:57:42 +0000 (09:57 +0800)]
ARM: dts: rk3288: modify the name of the delay time for dsi

Change-Id: If95824e556a9d1d75f4a674d4e95e332a8f16cae
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
4 years agodrm/rockchip: dw-mipi-dsi: use specific poll helper
Jerry Xu [Mon, 31 Jul 2017 10:10:51 +0000 (18:10 +0800)]
drm/rockchip: dw-mipi-dsi: use specific poll helper

As the documentation for readx_poll_timeout says, we want to use the
specialized macro for readl rather than using the generic version
directly.

Change-Id: I864b350f0e1b0e24bd3a7e2b0b1c4c231e9acc18
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
4 years agoARM: dts: rk3288: dts configuration example for dual-channel dsi panel
Jerry Xu [Mon, 31 Jul 2017 09:56:56 +0000 (17:56 +0800)]
ARM: dts: rk3288: dts configuration example for dual-channel dsi panel

Change-Id: I6557681b51026a0f216f873b9a49048dd374acef
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
4 years agoarm64: dts: rockchip: rk3399-android: add route-dsi1 node
WeiYong Bi [Thu, 6 Jul 2017 09:34:30 +0000 (17:34 +0800)]
arm64: dts: rockchip: rk3399-android: add route-dsi1 node

Change-Id: I0978d80237276d84f9df51d97997dd861aa8ae96
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
4 years agoarm64: dts: rockchip: rk3399: add dsi1 node
WeiYong Bi [Wed, 21 Jun 2017 01:09:57 +0000 (09:09 +0800)]
arm64: dts: rockchip: rk3399: add dsi1 node

Change-Id: I964f047b0cf9f6355d61630d03181f229fdd8c15
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
4 years agodrm/rockchip: vop: add data01_swap support
WeiYong Bi [Wed, 5 Jul 2017 09:17:27 +0000 (17:17 +0800)]
drm/rockchip: vop: add data01_swap support

Change-Id: I4a00e7d5efe49ee9621ed7218a10e0ef1628ee47
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
4 years agousb: dwc_otg_310: support battery charger detect for rk3288w
William Wu [Tue, 1 Aug 2017 07:23:06 +0000 (15:23 +0800)]
usb: dwc_otg_310: support battery charger detect for rk3288w

rk3288 and rk3288w use different compatible string, so add
"rockchip,rk3288w" to support rk3288w.

Change-Id: I828f09d26fea30921159f24ce9bdffd286df777a
Signed-off-by: William Wu <william.wu@rock-chips.com>
4 years agousb: ehci-platform: use no relinquish port quirk only for rk3288
William Wu [Tue, 1 Aug 2017 07:15:00 +0000 (15:15 +0800)]
usb: ehci-platform: use no relinquish port quirk only for rk3288

rk3288 and rk3288w use the same dts which includes no relinquish
port quirk, however rk3288w ohci can work well, so we need to add
an additional condition to disable ohci only for rk3288.

Change-Id: Ic2bd0ce577cbebe7ae2cf1b153f9e46935022f77
Signed-off-by: William Wu <william.wu@rock-chips.com>
4 years agousb: ohci-platform: disable ohci for rk3288
William Wu [Tue, 1 Aug 2017 06:59:42 +0000 (14:59 +0800)]
usb: ohci-platform: disable ohci for rk3288

rk3288 ohci doesn't actually work on hardware, so we
need to disable it in ohci-platform driver.

Change-Id: I72750edda67358ff1e8fe66047bf60420500997e
Signed-off-by: William Wu <william.wu@rock-chips.com>
4 years agoARM: dts: rockchip: enable ohci for rk3288-evb
William Wu [Tue, 1 Aug 2017 06:54:59 +0000 (14:54 +0800)]
ARM: dts: rockchip: enable ohci for rk3288-evb

Change-Id: I8eaa71694dd132a32b00ef273aaaeb8835a22cb9
Signed-off-by: William Wu <william.wu@rock-chips.com>
4 years agoARM: dts: rockchip: add usb ohci node for rk3288
William Wu [Tue, 1 Aug 2017 06:40:24 +0000 (14:40 +0800)]
ARM: dts: rockchip: add usb ohci node for rk3288

rk3288 and rk3288w have an ohci controller, although rk3288
ohci doesn't actually work on hardware, but rk3288w ohci can
work well, so we need to add usb ohci node in dts, and then
add a quirk in ohci driver to disable ohci for rk3288.

Change-Id: I0ce26a9851f6bc3c82cc8b7dc16ecc7b4ce2ca28
Signed-off-by: William Wu <william.wu@rock-chips.com>
4 years agoARM: dts: rockchip: fix reg size for rk3288 ehci
William Wu [Tue, 1 Aug 2017 06:25:12 +0000 (14:25 +0800)]
ARM: dts: rockchip: fix reg size for rk3288 ehci

According to rk3288 TRM, the size of usb ehci is 128K,
so let's fix it in dts.

Change-Id: I1adf02080033906a88b34cae877bb84ad0f63059
Signed-off-by: William Wu <william.wu@rock-chips.com>
4 years agoarm64: dts: rk3368: enable dfi and dmc nodes for sheep board
Finley Xiao [Thu, 6 Apr 2017 08:59:32 +0000 (16:59 +0800)]
arm64: dts: rk3368: enable dfi and dmc nodes for sheep board

Change-Id: I7b73448ab1bb812fc026931651be66f2db010e76
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
4 years agodrm/rockchip: vop: add mutex lock to two vops
Finley Xiao [Mon, 31 Jul 2017 10:53:48 +0000 (18:53 +0800)]
drm/rockchip: vop: add mutex lock to two vops

Each vop should add mutex lock when do ddr frequceny change.

Change-Id: Ie63c90b0b4421d1be6bf8bdc9ff3b179fdf2193d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
4 years agodrm/rockchip: vop: correct pin_pol define
Mark Yao [Tue, 1 Aug 2017 08:28:04 +0000 (16:28 +0800)]
drm/rockchip: vop: correct pin_pol define

Fixes: b2d8717 ("drm/rockchip: vop: split dclk_pol from pin_pol")
Change-Id: If756fe0791d41c7084296f4f28481cbc665f09c4
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
4 years agonet: wireless: rockchip_wlan: add rtl8723ds support
zzc [Tue, 1 Aug 2017 07:28:28 +0000 (15:28 +0800)]
net: wireless: rockchip_wlan: add rtl8723ds support

update rtl8723ds wifi driver to version v5.1.1.5_20523.20161209_BTCOEX20161208-1212

Change-Id: Ifd44ce917d1fcb47696b893f2293ed932952bdef
Signed-off-by: zzc <zzc@rock-chips.com>
4 years agodrm/rockchip: dw-mipi-dsi: add dual-channel dsi support
Jerry Xu [Fri, 28 Jul 2017 07:56:52 +0000 (15:56 +0800)]
drm/rockchip: dw-mipi-dsi: add dual-channel dsi support

Change-Id: I11f203794d9b07a6a60e0c583827154da8c9daf6
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
4 years agodrm/rockchip: dw-mipi-dsi: adjust the calculation of lane_mbps
Jerry Xu [Fri, 28 Jul 2017 07:09:55 +0000 (15:09 +0800)]
drm/rockchip: dw-mipi-dsi: adjust the calculation of lane_mbps

adjust the calculation of lane_mbps to distinguish between
two different phy. also convenient to add support for dual-channel

Change-Id: I2916d880202bba11b9db1fa48a7534fc1f65e331
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
4 years agoARM: dts: rk3288: add dual-channel dsi support
Jerry Xu [Fri, 28 Jul 2017 02:38:58 +0000 (10:38 +0800)]
ARM: dts: rk3288: add dual-channel dsi support

Change-Id: Ic28014af8e5a264f6ccf760caf7ef888392ff63d
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
4 years agousb: dwc_otg_310: set operational mode of phy to normal when suspend for rk3368
Meng Dongyang [Tue, 17 Jan 2017 03:46:57 +0000 (11:46 +0800)]
usb: dwc_otg_310: set operational mode of phy to normal when suspend for rk3368

The phy driver of otg port set operational mode to non-driving
when suspend and set to normal when resume. But if we connect
with low speed, it may be disconnected after suspend and resume
by the changing of operational mode. In addition, the linestate
change interrupt flag can't be cleared if the operational mode
is non-driving. This patch set operational mode to normal even
if the phy is suspended, and make sure that operational mode is
same during suspend and resume.

Change-Id: I670d2cbd4e7c4dc115a735feef848f36f120c295
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
Signed-off-by: William Wu <william.wu@rock-chips.com>
4 years agoARM: dts: rockchip: add RK3126 eavluation board devicetree
Chen Liang [Wed, 14 Jun 2017 06:42:54 +0000 (14:42 +0800)]
ARM: dts: rockchip: add RK3126 eavluation board devicetree

This patch add rk3126-evb.dts for RK3126 evaluation board.
Tested on RK3126 evb.

Change-Id: I56d416416e16e9a8f8f0a57d926aad7ac2fadbba
Signed-off-by: Chen Liang <cl@rock-chips.com>
4 years agoARM: dts: rockchip: add core dtsi file for RK3126 and RK3128 SoCs
Chen Liang [Wed, 14 Jun 2017 06:41:17 +0000 (14:41 +0800)]
ARM: dts: rockchip: add core dtsi file for RK3126 and RK3128 SoCs

This patch adds core dtsi file for Rockchip RK3126 and RK3128 SoCs.

Change-Id: I4b64594a8d0351f65a6947e16ec0682d6ac2520e
Signed-off-by: Chen Liang <cl@rock-chips.com>
4 years agoclk: rockchip: rk3128: modify rk3128 clk driver to support rk3126
Elaine Zhang [Mon, 24 Jul 2017 06:48:53 +0000 (14:48 +0800)]
clk: rockchip: rk3128: modify rk3128 clk driver to support rk3126

rk3128 and rk3126 have some gate registers describe differences.
So need to make some distinctions.
The RK3126 and RK3128 Same clock description we move it to
the common clock branches.
And the different clks description use the own clock branches.

Change-Id: If9571da0a86067d814c225629a6b6f07f0270f14
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
4 years agoarm64: dts: rockchip: support cluster idle feature for rk3366
tony.xie [Mon, 24 Jul 2017 06:29:20 +0000 (14:29 +0800)]
arm64: dts: rockchip: support cluster idle feature for rk3366

1) Add cluster sleep mode in cpu idle_states for RK3366 SoCs.
2) Modify cpu idle parameter.

Change-Id: I538c0bead8642c3642448edfe9971a3b09e919e0
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
4 years agovideo: rockchip: vpu: add core&cabac&niu_a|h reset
Jung Zhao [Mon, 31 Jul 2017 09:11:21 +0000 (17:11 +0800)]
video: rockchip: vpu: add core&cabac&niu_a|h reset

Change-Id: Ied8f16b79ac0142fadbc1ce3a3f47ede7d22790b
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
4 years agosoc: rockchip: pvtm: fix undefined reference to rockchip_get_pvtm_value
Finley Xiao [Fri, 28 Jul 2017 07:36:07 +0000 (15:36 +0800)]
soc: rockchip: pvtm: fix undefined reference to rockchip_get_pvtm_value

This patch fixed compilation error when compiled rockchip_linux_defconfig
without CONFIG_ROCKCHIP_PVTM

Change-Id: Icb43485a9ce8dca0e40507b370487b89617813c4
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
4 years agoarm64: dts: rockchip: rk3399-android: enable pvtm
Finley Xiao [Fri, 28 Jul 2017 07:35:23 +0000 (15:35 +0800)]
arm64: dts: rockchip: rk3399-android: enable pvtm

Change-Id: Id84681069a4e83c8307cdf5baef3a6126af0edb2
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
4 years agoarm64: dts: rockchip: rename mipi to dsi for rk3399
WeiYong Bi [Wed, 31 May 2017 07:56:16 +0000 (15:56 +0800)]
arm64: dts: rockchip: rename mipi to dsi for rk3399

Change-Id: I6c6fb4e0399b805dfa012cc5562ad71103aa85e9
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
4 years agowatchdog: dw_wdt: fix overflow issue in dw_wdt_top_in_seconds
Huibin Hong [Thu, 27 Jul 2017 12:27:09 +0000 (20:27 +0800)]
watchdog: dw_wdt: fix overflow issue in dw_wdt_top_in_seconds

If top is 15, (1 << (16 + top)) may be negative.

Change-Id: I76e4a603a54f093e64a4b266008570e3afcdb35a
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
4 years agoARM: dts: rockchip: rk3288-android add vmalloc=496M
Jianqun Xu [Fri, 28 Jul 2017 08:02:11 +0000 (16:02 +0800)]
ARM: dts: rockchip: rk3288-android add vmalloc=496M

Change-Id: Ia26646946a74554aa298bc5a13d9fcadb5bd0a21
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
4 years agodrm/rockchip: vop: add dual-channel dsi support
WeiYong Bi [Sat, 24 Jun 2017 02:33:47 +0000 (10:33 +0800)]
drm/rockchip: vop: add dual-channel dsi support

Change-Id: Ibddc064c6c588d0733a238b08b7ba4c5bd4518a2
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
4 years agoRevert "clk: rockchip: rk3368: Add CLK_IGNORE_UNUSED flag for mipi phy refclk"
WeiYong Bi [Wed, 19 Jul 2017 01:11:21 +0000 (09:11 +0800)]
Revert "clk: rockchip: rk3368: Add CLK_IGNORE_UNUSED flag for mipi phy refclk"

This reverts commit 71d279801cbef49aa6d5c2355c5015aee4a4c6e2.

Change-Id: I2e258616f64458a29845308cf697b00be2e0460c
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
4 years agoarm64: dts: rockchip: remove unused "rockchip,dsi-panel" property
WeiYong Bi [Fri, 14 Jul 2017 07:48:00 +0000 (15:48 +0800)]
arm64: dts: rockchip: remove unused "rockchip,dsi-panel" property

Change-Id: I144776a377bf3eeb5e56065fa9aff7c2c43c8e6d
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
4 years agodrm/rockchip: dsi: Clearly distinguish between SNPS PHY and Non-SNPS PHY
WeiYong Bi [Thu, 13 Jul 2017 07:15:13 +0000 (15:15 +0800)]
drm/rockchip: dsi: Clearly distinguish between SNPS PHY and Non-SNPS PHY

Change-Id: Ia947050f444eac75e951ddc8cd7e0b4453673094
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
4 years agoarm64: dts: rockchip: rk3368: export MIPI DPHY PLL clock
WeiYong Bi [Mon, 17 Jul 2017 02:58:32 +0000 (10:58 +0800)]
arm64: dts: rockchip: rk3368: export MIPI DPHY PLL clock

Change-Id: I15ef0a01cde0459d1993110f5653f6bf10f99a64
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
4 years agoarm64: dts: rockchip: rk3366: export MIPI DPHY PLL clock
WeiYong Bi [Thu, 13 Jul 2017 07:12:14 +0000 (15:12 +0800)]
arm64: dts: rockchip: rk3366: export MIPI DPHY PLL clock

Change-Id: I99a4c252f877ff36a16f991ee2e94bb110401e47
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
4 years agophy: rockchip-inno-mipi-dphy: export PLL clock
WeiYong Bi [Thu, 13 Jul 2017 08:19:08 +0000 (16:19 +0800)]
phy: rockchip-inno-mipi-dphy: export PLL clock

Change-Id: I1eb96241930e380997dd66f3a3b479fe53a72a98
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
4 years agoarm64: dts: rockchip: fix pwm3 pinctrl for rk3368
Zhou weixin [Mon, 24 Jul 2017 08:24:31 +0000 (16:24 +0800)]
arm64: dts: rockchip: fix pwm3 pinctrl for rk3368

Change-Id: I0e232a4df41d88afadd6a99011a71bbacab6e375
Signed-off-by: Zhou weixin <zwx@rock-chips.com>