Xu Hongfei
ab2d34feaa
media: rockchip: isp: switch hdr_done interrupt according to hdrtmo cnt mode
...
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com >
Change-Id: Ibe1a23e5871daf32bf0646ccc022b2a7f371b08c
2021-02-21 11:50:29 +08:00
Tony Xie
fc4e5f879f
arm64: dts: rockchip: rk3568: add cpu-idle-states node.
...
Signed-off-by: Tony Xie <tony.xie@rock-chips.com >
Change-Id: I6689bbb109a3e2db7b1bd97875b6ff663f110dac
2021-02-21 11:31:48 +08:00
Huang zhibao
cb57c4f9d8
arm64: dts: rockchip: rk3568-nvr-demo-v10: disabled pcie for v10 borad
...
Signed-off-by: Huang zhibao <hzb@rock-chips.com >
Change-Id: I1e43f028786756ac49338250d5aea22df850a2f9
2021-02-21 10:40:37 +08:00
David Wu
e7373a13f7
ethernet: stmmac: dwmac-rk: Add automatic speed mode changed for 10/100/1000M
...
After the completion of Clause 37 auto-negotiation, xpcs automatically
switches to the negotiated speed.
Signed-off-by: David Wu <david.wu@rock-chips.com >
Change-Id: Id8ca8cd9cb22d4adbac3cdfdf1f2f500bb0301f1
2021-02-21 10:39:42 +08:00
Tony Xie
799783d175
arm64: dts: rockchip: rk3568: add rktimer node.
...
Signed-off-by: Tony Xie <tony.xie@rock-chips.com >
Change-Id: I18eb7c25796785aeffb7a2753007f02c9f82fb6e
2021-02-21 09:54:00 +08:00
Andy Yan
6c3f0fc415
drm/rockchip: vop2: No limit possible_crtc
...
Change-Id: Iaa297f9077ff2f3a12ef256dcac31dc2bec1c274
Signed-off-by: Andy Yan <andy.yan@rock-chips.com >
2021-02-19 16:18:00 +08:00
Sandy Huang
68a6c87b27
drm/rockchip: vop2: set correct primary plane for rk3566
...
set esmart0 as port0 primary plane, smart0 as port1 primary
plane, esmart1 as port2 primary plane.
Change-Id: I0307426769be62c65ae37ab6917f01ba5f8500de
Signed-off-by: Sandy Huang <hjc@rock-chips.com >
2021-02-19 16:16:51 +08:00
Tao Huang
3088a3b56c
soc: rockchip: power-domain: Fix lockdep warning
...
Use rockchip_dmcfreq_lock_nested().
Signed-off-by: Tao Huang <huangtao@rock-chips.com >
Change-Id: I0f5c2b716cc22be195885c7d74cd26c36b8eeff4
2021-02-18 09:46:39 +08:00
Tao Huang
29c90bf3e9
PM / devfreq: rockchip_dmc: Introduce rockchip_dmcfreq_lock_nested()
...
After commit c95036feef ("PM / devfreq: rockchip_dmc: Fix deadlock between dmcfreq and vop on/off"),
rockchip_dmcfreq_sem support down read recursive.
Try to avoid lockdep warning:
======================================================
WARNING: possible circular locking dependency detected
4.19.172 #9 Not tainted
------------------------------------------------------
composer@2.1-se/221 is trying to acquire lock:
00000000a1c9588b (&genpd->mlock){+.+.}, at: genpd_lock_mtx+0x14/0x1c
but task is already holding lock:
00000000cc938c9c (rockchip_dmcfreq_sem){++++}, at: rockchip_dmcfreq_lock+0x14/0x1c
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #2 (rockchip_dmcfreq_sem){++++}:
down_read+0x50/0x94
rockchip_dmcfreq_lock+0x14/0x1c
rockchip_pd_power+0x3c/0x200
rockchip_pd_power_off+0x24/0x2c
genpd_power_off+0x168/0x27c
genpd_power_off_work_fn+0x34/0x50
process_one_work+0x300/0x66c
worker_thread+0x238/0x4c0
kthread+0x148/0x158
ret_from_fork+0x10/0x18
-> #1 (&pmu->mutex){+.+.}:
__mutex_lock_common+0xc8/0x1014
mutex_lock_nested+0x28/0x30
rockchip_pd_power+0x38/0x200
rockchip_pd_power_off+0x24/0x2c
genpd_power_off+0x168/0x27c
genpd_power_off_work_fn+0x34/0x50
process_one_work+0x300/0x66c
worker_thread+0x238/0x4c0
kthread+0x148/0x158
ret_from_fork+0x10/0x18
-> #0 (&genpd->mlock){+.+.}:
lock_acquire+0x124/0x1ec
__mutex_lock_common+0xc8/0x1014
mutex_lock_nested+0x28/0x30
genpd_lock_mtx+0x14/0x1c
genpd_runtime_suspend+0x1d8/0x21c
__rpm_callback+0x150/0x24c
rpm_suspend+0x278/0x7b0
rpm_idle+0x6c/0x444
__pm_runtime_idle+0x78/0x9c
vop2_crtc_atomic_disable+0x5ac/0x6b4
drm_atomic_helper_commit_modeset_disables+0x234/0x440
rockchip_atomic_commit_complete+0x140/0x378
rockchip_drm_atomic_commit+0x1c4/0x224
drm_atomic_connector_commit_dpms+0x110/0x128
drm_mode_obj_set_property_ioctl+0x144/0x2b4
drm_connector_property_set_ioctl+0x3c/0x60
drm_ioctl+0x2c0/0x454
do_vfs_ioctl+0x4dc/0x794
__arm64_sys_ioctl+0x70/0x98
el0_svc_common+0x9c/0x16c
el0_svc_handler+0x28/0x60
el0_svc+0x8/0xc
other info that might help us debug this:
Chain exists of:
&genpd->mlock --> &pmu->mutex --> rockchip_dmcfreq_sem
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(rockchip_dmcfreq_sem);
lock(&pmu->mutex);
lock(rockchip_dmcfreq_sem);
lock(&genpd->mlock);
*** DEADLOCK ***
4 locks held by composer@2.1-se/221:
#0 : 0000000079852c0e (crtc_ww_class_acquire){+.+.}, at: drm_mode_obj_set_property_ioctl+0xe4/0x2b4
#1 : 00000000a8d2d1f1 (crtc_ww_class_mutex){+.+.}, at: drm_modeset_backoff+0x118/0x230
#2 : 000000008d649114 (&vop2->vop2_lock){+.+.}, at: vop2_crtc_atomic_disable+0x3c/0x6b4
#3 : 00000000cc938c9c (rockchip_dmcfreq_sem){++++}, at: rockchip_dmcfreq_lock+0x14/0x1c
stack backtrace:
CPU: 0 PID: 221 Comm: composer@2.1-se Not tainted 4.19.172 #9
Hardware name: Rockchip RK3566 EVB2 LP4X V10 Board (DT)
Call trace:
dump_backtrace+0x0/0x160
show_stack+0x14/0x1c
dump_stack+0xd8/0x128
print_circular_bug+0x580/0x588
__lock_acquire+0x1bc4/0x1bd0
lock_acquire+0x124/0x1ec
__mutex_lock_common+0xc8/0x1014
mutex_lock_nested+0x28/0x30
genpd_lock_mtx+0x14/0x1c
genpd_runtime_suspend+0x1d8/0x21c
__rpm_callback+0x150/0x24c
rpm_suspend+0x278/0x7b0
rpm_idle+0x6c/0x444
__pm_runtime_idle+0x78/0x9c
vop2_crtc_atomic_disable+0x5ac/0x6b4
drm_atomic_helper_commit_modeset_disables+0x234/0x440
rockchip_atomic_commit_complete+0x140/0x378
rockchip_drm_atomic_commit+0x1c4/0x224
drm_atomic_connector_commit_dpms+0x110/0x128
drm_mode_obj_set_property_ioctl+0x144/0x2b4
drm_connector_property_set_ioctl+0x3c/0x60
drm_ioctl+0x2c0/0x454
do_vfs_ioctl+0x4dc/0x794
__arm64_sys_ioctl+0x70/0x98
el0_svc_common+0x9c/0x16c
el0_svc_handler+0x28/0x60
el0_svc+0x8/0xc
Signed-off-by: Tao Huang <huangtao@rock-chips.com >
Change-Id: Ic743189e335b0e9ae7fed9c3d542bf1d57f5d33a
2021-02-18 09:46:39 +08:00
Guochun Huang
4c48b468d0
arm64: dts: rockchip: rk356x evb: dsi0 is mounted on vp1 by default
...
Change-Id: I4a1d2c8842dcd4880380962c952a6ba13ad8919d
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com >
2021-02-17 19:57:03 +08:00
Tao Huang
c0fa27867b
arm64: dts: rockchip: Sort Makefile
...
Sort the .dtb files alphabetically.
Change-Id: I3b7ff929d86707a50593cda0200142fcfd48f47b
Signed-off-by: Tao Huang <huangtao@rock-chips.com >
2021-02-17 17:23:49 +08:00
Wu Liangqing
fd54a3e552
arm64: dts: rockchip: rk3566-rk817-tablet update for v11 board
...
Change-Id: Ic5b846b2c3b1e51635e904ba15d7198a4fb95c28
Signed-off-by: Wu Liangqing <wlq@rock-chips.com >
2021-02-17 17:10:07 +08:00
Andy Yan
6182a760fc
drm/rockchip: vop2: No setup alpha if fb is NULL
...
We find sometimes hwc will post a plane with NULL
fb, this is no need to setup alpha.
Change-Id: I1ca475e7171c08a4182a3a98bf357d3bf00d8fdc
Signed-off-by: Andy Yan <andy.yan@rock-chips.com >
2021-02-17 15:45:41 +08:00
Andy Yan
7059ef6f76
drm/rockchip: vop2: Bind Cluster0/Esmart0/Smart0 to VP1, Cluster1/Esmart1/Smart1 to VP0
...
Change-Id: Ie7ef00d9813b8bc05d7e55d3719966d01e0a4e6d
Signed-off-by: Andy Yan <andy.yan@rock-chips.com >
2021-02-17 15:45:41 +08:00
Ziyuan Xu
bd52755f73
ARM: dts: rockchip: make the empty node of gmac not empty for rv1126-thunder-boot
...
The significant nodes will be deleted with CONFIG_DTC_OMIT_EMPTY.
therefore make it not empty.
Change-Id: Id5febc54e9efe2d769a30b6ded96288a37239e90
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com >
2021-02-17 10:47:57 +08:00
Cai YiWei
6d1700b91d
media: rockchip: isp: fix media link err for name don't match
...
Change-Id: I604754b36da12dbde9443580019a3bb1d7d6a884
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2021-02-08 17:19:58 +08:00
Guochun Huang
02784a9d24
arm64: dts: rockchip: rk3568-evb: assigned dclk_vop parents for multi displays
...
Change-Id: Iebf53e82dae2bfa092bff37f58cf2a29ce5a82e1
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com >
2021-02-08 17:19:58 +08:00
Andy Yan
b31986fbea
drm/rockchip: Change some WARN to printk
...
There are always some people treat the WARN
backtrace dump as a kernel panic, so we just
print warning message here.
Change-Id: I2a34a7d822768bc6f103d85deb311948b6ce3552
Signed-off-by: Andy Yan <andy.yan@rock-chips.com >
2021-02-08 17:19:58 +08:00
Sandy Huang
683c0c56aa
drm/rockchip: vop2: ERROR_HANDLER add video port id
...
Change-Id: I105e2938233a8cb771f04f10b9063498755336bd
Signed-off-by: Sandy Huang <hjc@rock-chips.com >
2021-02-08 17:19:58 +08:00
Cai YiWei
e3b2078f73
media: rockchip: isp: reorder of subdev stream
...
on: isp->phy->sensor(start to output)
off: sensor(stop already)->phy->isp
Change-Id: I592f8e8e36f4c912e3f38b3f4266e98bfd9e56e4
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2021-02-08 17:19:57 +08:00
Cai YiWei
3877d5ca77
media: rockchip: ispp: sync to free buf for multi dev stream off
...
Change-Id: If2c61d83cf33317cdc2ec69ceca7ffd899f11816
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2021-02-08 17:19:57 +08:00
Cai YiWei
b0ec07ceeb
media: rockchip: ispp: check scl stop if fec enable
...
Change-Id: I3bbdd113ca37b1faa2f091eeb255dab056189da9
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2021-02-08 17:19:57 +08:00
Weixin Zhou
a67fcd71a3
arm64: dts: rockchip: rk3566-rk817-eink-w6: adjust configs for lower consumption
...
1. set vcc3v3_pmu suspend voltage 3v
2. add touch regulator
Signed-off-by: Weixin Zhou <zwx@rock-chips.com >
Change-Id: Ic5ac610bea36675ad8f9dbe511a9ab604b30aa92
2021-02-08 17:19:57 +08:00
Weixin Zhou
a79f36ec04
input: touchscreen: ft5436: fix vdd can not be closed
...
Signed-off-by: Weixin Zhou <zwx@rock-chips.com >
Change-Id: I69fb237e2bd23ce6061172a0df68e7c54efe647b
2021-02-08 17:19:57 +08:00
Zorro Liu
226251b4ee
arm64: dts: rockchip: rk3566-rk817-eink-w103: set vcc3v3_pmu suspend voltage 3v
...
Signed-off-by: Zorro Liu <lyx@rock-chips.com >
Change-Id: I61b491040900b141dfbb7a07dc3ecec160e7a072
2021-02-08 17:19:57 +08:00
Zorro Liu
9d80578d3e
arm64: dts: rockchip: rk3566-rk817-eink-w103: add touch regulator
...
Change-Id: I47416a902fef654708deadaba296bb05632c928a
Signed-off-by: Zorro Liu <lyx@rock-chips.com >
2021-02-08 17:19:57 +08:00
Zorro Liu
2192f36c3b
input: touch: cyttsp5: add power control and early suspend
...
Change-Id: I49f0776c7f998e845b833e20c2cba2cff853b4e0
Signed-off-by: Zorro Liu <lyx@rock-chips.com >
2021-02-08 17:19:57 +08:00
Zorro Liu
881984f5d4
input: touch: wacom_w9013: add power regulator control
...
Change-Id: I9978f67a1679cdad09ba811cc03b6a8b6a78fb5e
Signed-off-by: Zorro Liu <lyx@rock-chips.com >
2021-02-08 17:19:57 +08:00
Cai YiWei
0339aa961f
media: rockchip: ispp: limit min clk to 50
...
Change-Id: Ia63b22af54df6f2b01c725084e416156aab168bc
Signed-off-by: Cai YiWei <cyw@rock-chips.com >
2021-02-08 17:19:57 +08:00
Jianqun Xu
af3b0010cd
staging: android: ion: system-heap adjust orders if swiotlb limit
...
This patch is useful for board with totalram size larger than 4GB.
Since swiotlb has memory size limitation, this will calculate the
maximum size locally, as a workaround to fix the orders[0].
With this patch:
[ 3.921612] orders[0] = 6
[ 3.921647] orders[1] = 4
[ 3.921715] orders[2] = 0
Change-Id: I9286f6ea53f679816c9afd378a6cfe620ef1b53e
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com >
2021-02-08 17:19:57 +08:00
Xu Hongfei
7f51aa1c40
media: rockchip: isp/ispp to version v1.5.1
...
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com >
Change-Id: Ie67690626c55f2c41a1b246f0b9349aff46972bb
2021-02-08 17:19:57 +08:00
Hu Kejun
799ad4b3f2
media: rockchip: ispp: check frame id when apply params
...
Change-Id: I4816fd87c4730c29716dd35a7721a66265eb3587
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com >
Signed-off-by: Hu Kejun <william.hu@rock-chips.com >
2021-02-08 17:19:57 +08:00
Xu Hongfei
4331ba1b1d
media: rockchip: isp: set lgmean related regs for tmo in hdr isr
...
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com >
Change-Id: I36442cf617c8ddbf54ae659071fe1f057bc9830b
2021-02-08 17:19:57 +08:00
Liang Chen
a8bfdf7855
nvmem: rockchip-otp: enable ecc and ecc-check for rk3568
...
Change-Id: I1bc8880d7ba8c3236d51d6982bf3689063d907b9
Signed-off-by: Liang Chen <cl@rock-chips.com >
2021-02-08 17:19:57 +08:00
Liang Chen
c95de52509
soc: rockchip: cpuinfo: fix bug: check efuse_buf before use it
...
Change-Id: I6318eba4e0281d54fe0d429425fce4ab6822eb46
Signed-off-by: Liang Chen <cl@rock-chips.com >
2021-02-08 17:19:57 +08:00
shengfei Xu
b05b22f9e8
mfd: rk808: config sleep pin polarity active need delay 2ms
...
Signed-off-by: shengfei Xu <xsf@rock-chips.com >
Change-Id: I404265384c2bc49274646cf749aa8ccf37b0899f
2021-02-08 11:40:02 +08:00
Yandong Lin
fdc069542d
video: rockchip: mpp: iep2: remove reduce_req function
...
1. Because of hw problems before, there will be problems with
high-frequency reset. So the frequency must be reduced before reset.
But this operation is unnecessary for now.
2. Iep share clk with rga on rk356x, so frequency reduction may affect rga.
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com >
Change-Id: I469d2d6ba2671560acd9eaf6b86d57411c7e3de5
2021-02-08 11:40:02 +08:00
Andy Yan
d913031608
drm/rockchip: vop2: Cleanup wb connector when unbind
...
Change-Id: Ia07909f423ee4479633b8c3b3c677300d12c0995
Signed-off-by: Andy Yan <andy.yan@rock-chips.com >
2021-02-08 11:40:01 +08:00
Jianqun Xu
7b61d4b92d
iommu/rockchip: fix error define for v2 iommu
...
Correct mapping is like following:
page table desc bit phys address bit
[ 7:4] [39:36]
[11:8] [35:32]
Fixes: a4318b7d29 ("iommu: rockchip: Add support iommu v2")
Change-Id: I2ebbd2ec37111f44960a7ba0e5b90a9102448e23
Signed-off-by: Simon Xue <xxm@rock-chips.com >
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com >
2021-02-08 11:40:01 +08:00
Tao Huang
3be30bd08d
ASoC: es7202: Add missing sentinel to es7202_dt_ids
...
BUG: KASAN: global-out-of-bounds in of_match_node+0x70/0xc0
Read of size 1 at addr ffffff900a0f06f0 by task swapper/0/1
CPU: 2 PID: 1 Comm: swapper/0 Not tainted 4.19.161 #54
Hardware name: Rockchip RK3566 EVB1 DDR4 V10 Board (DT)
Call trace:
dump_backtrace+0x0/0x1bc
show_stack+0x14/0x1c
dump_stack+0xd8/0x118
print_address_description+0x80/0x2e4
__kasan_report+0x164/0x1c4
kasan_report+0x10/0x18
__asan_load1+0x4c/0x54
of_match_node+0x70/0xc0
of_match_device+0x30/0x44
i2c_of_match_device+0x30/0xb8
i2c_device_match+0x48/0xc0
__driver_attach+0x44/0x1b0
bus_for_each_dev+0xa0/0xe8
driver_attach+0x30/0x3c
bus_add_driver+0x198/0x2a0
driver_register+0xf0/0x1c4
i2c_register_driver+0x6c/0xd0
es7202_modinit+0x1c/0x48
do_one_initcall+0xb0/0x344
do_initcall_level+0xec/0x1fc
do_basic_setup+0x68/0x80
kernel_init_freeable+0x108/0x194
kernel_init+0x14/0x2a0
ret_from_fork+0x10/0x18
The buggy address belongs to the variable:
es7202_dt_ids+0x190/0x200
Signed-off-by: Tao Huang <huangtao@rock-chips.com >
Change-Id: Ic41116912bc323005787878ab29318ad38efd07e
2021-02-08 11:40:01 +08:00
Jon Lin
a7cc0e6bee
drivers: rkflash: Remove cache bitflip detect 2
...
Part of spinand sram maybe change after read status register
Fixes: cf69491c97 ("drivers: rkflash: Add spinand program cache recheck")
Change-Id: Ia8f902fe51562d71a5b8e78a80e63eb26257df38
Signed-off-by: Jon Lin <jon.lin@rock-chips.com >
2021-02-08 11:40:01 +08:00
shengfei Xu
9f3a45ac0c
arm64: dts: rockchip: rk3566-rk817-tablet: add gate_function_disable
...
Signed-off-by: shengfei Xu <xsf@rock-chips.com >
Change-Id: I261c2cd92d913ed411649858b7c20b9645084d93
2021-02-08 11:40:01 +08:00
Shawn Lin
f28451cf39
phy: rockchip: naneng-combphy: Add ssc enable option from firmware
...
Change-Id: I0f620b6ff000ff4e7b9bc997ca2c30c14d3f8cde
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com >
2021-02-08 11:40:01 +08:00
Shawn Lin
179638095d
phy: rockchip: naneng-combphy: Adjust 100M refclk parameter for PCIe
...
Change-Id: I94321c0b6bb64cff279b79c44b54f273ee52c897
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com >
2021-02-08 11:40:01 +08:00
Yandong Lin
34760af996
video: rockchip: mpp: iep2: fix hw hang caused by OSD_MAX irq
...
Rootcause:
When hw detect there are more than eight rolling subtitles, it will
trigger a osd max irq but it still running, and that interruption make
the software takes for frame done and disable the clock gate, finally hw
hang when it access the bus.
Solution:
Ignore OSD MAX irq, clean and wait for frame done.
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com >
Change-Id: I660cefa013fe1419f7566b984556ea3450fe28e5
2021-02-08 11:40:01 +08:00
Andy Yan
3feb230a5e
drm/rockchip: vop2: Fixup soc_id
...
Change-Id: I29056b26d7917c72fee26b588cf0a990f4d461b6
Signed-off-by: Andy Yan <andy.yan@rock-chips.com >
2021-02-08 11:40:01 +08:00
Andy Yan
0f32f17ff0
drm/rockchip: vop2: Add support for rk3566
...
Change-Id: I6b02237f42de611dc0d77c1f4318f4692eae1bc6
Signed-off-by: Andy Yan <andy.yan@rock-chips.com >
2021-02-08 11:40:01 +08:00
Andy Yan
9cae432ce5
drm/rockchip: vop2: Force dsp_w of Esmart/Smart to even when scale down
...
Odd dsp_w pixel of Esmart/Smart will trigger scale down error.
Change-Id: Ie0fc620043270a387eed69aba8adf200a0d67f24
Signed-off-by: Andy Yan <andy.yan@rock-chips.com >
2021-02-08 11:40:01 +08:00
Jon Lin
d25b24d0cb
ubifs: Recovery for cases of unclean reboot
...
After power lost, spinand may work in a unkonw state and result in
bit flip, including:
1.Write to cache invalid and dirty cache data write to page's array
which result in node CRC error for some pages.
2.One page write fail but the next page write success result in
empty space corruption.
Change-Id: I212c237202b32de0217efc8dd5a4e84174953a3f
Signed-off-by: Jon Lin <jon.lin@rock-chips.com >
2021-02-05 10:43:56 +08:00
Jon Lin
cf69491c97
drivers: rkflash: Add spinand program cache recheck
...
Add spinand power lost situation protection to avoid
abnormal data written to flash array(recheck 1) or
just reduce error behavior(recheck 2)
Change-Id: Ic445fd09fd407c225b47310d666b39f095fcfb17
Signed-off-by: Jon Lin <jon.lin@rock-chips.com >
2021-02-05 10:43:56 +08:00