Commit Graph

861792 Commits

Author SHA1 Message Date
Allon Huang
dd29de10cd Revert "phy: rockchip: mipi-rx: support rk3568 mipi dphy rx"
This reverts commit 9cb5128ee0.

Replaced by commit 118103 and 118606:
e0e682453e ("phy: rockchip: add rk3568 mipi dphy hw driver")
a9e17370bb ("phy: rockchip: csi2-dphy: add mipi dphy dual mode driver for rk3568")

Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I3a8f70860c859724199197b9aa10d75565cb6c5e
2021-01-28 14:10:49 +08:00
Allon Huang
26e6c34da6 arm64: dts: rockchip: rk3568: add csi2 dphy for dual mode
replace csi_dphy with csi2_dphy0, csi2_dphy1 and csi2_dphy2
for rk356x csi2 dphy dual mode

Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I53f5edcf36bcf3cdf84174d44cb6c99703940ea3
2021-01-28 10:40:54 +08:00
Wang Panzhenzhuan
e7030eb33c arm64: configs: rockchip_defconfig: enable ov5648
This is needed for rk3566-rk817-eink-w6

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I4362a200b7eada146b387d08a5d2bcc58c69f47f
2021-01-28 09:36:47 +08:00
Wang Panzhenzhuan
b8599ea508 arm64: dts: rockchip: rk3566-rk817-eink-w6: adjust camera config
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I64196132d765397170babdb5c56da01270d5a623
2021-01-28 09:36:30 +08:00
Zorro Liu
dfaa34c764 arm64: dts: rockchip: add npu config and update battery capacity for rk3566-rk817-eink-w103 board
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I1269e41b910a8b8997b655a2d8d025475e59b654
2021-01-27 17:46:47 +08:00
Zorro Liu
37bfc5ea16 arm64: dts: rockchip: rk3566 eink: delete no use panel,direct_mode defined
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I292f7258db938c7761c4c23a46693dceced0e8d6
2021-01-27 17:41:51 +08:00
Zorro Liu
668fc59a25 drm/rockchip: ebc_dev: release version v1.02
1.improve first overlay frame
2.add ebc on/off notify
3.overlay use osd buf

Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I33e9f9ed9d4eb78148ebb5c2ad178eb95c28ee63
2021-01-27 17:41:44 +08:00
Weixin Zhou
eb27d7ba43 arm64: dts: rockchip: rk3566-rk817-eink-w103: add charge led
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I7ffbbadef1aa9df8d8234a318ef5043418db73d1
2021-01-27 17:34:23 +08:00
Weixin Zhou
3bd6077b1d arm64: dts: rockchip: rk3566-rk817-eink-w6: adjust some configs
1.sync some configs for sleep from w103 board
2.remove unuse touch virtual key
3.fix leds configs

Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I74d043d02d58c3127efb6382096125970098d797
2021-01-27 15:56:32 +08:00
David Wu
0dc5b4e01c i2c: i2c-rk3x: Clean wakeup warning form i2c restart
This patch fixs the following warning:
[   41.482651] WARNING: CPU: 0 PID: 1 at kernel/sched/core.c:1763 set_task_cpu+0x1c0/0x220
[   41.589204] Call trace:
[   41.589441]  set_task_cpu+0x1c0/0x220
[   41.589776]  try_to_wake_up+0x2a8/0x408
[   41.590124]  default_wake_function+0x14/0x1c
[   41.590511]  autoremove_wake_function+0x18/0x58
[   41.590920]  __wake_up_common+0xbc/0x138
[   41.591280]  __wake_up_common_lock+0x74/0xc4
[   41.591662]  __wake_up+0x14/0x1c
[   41.591966]  rk3x_i2c_irq+0x43c/0x620
[   41.592300]  rk3x_i2c_restart_notify+0x3c/0xe4
[   41.592708]  atomic_notifier_call_chain+0x4c/0x84
[   41.593139]  do_kernel_pre_restart+0x20/0x28
[   41.593525]  machine_restart+0x20/0x58
[   41.593864]  kernel_restart+0xf4/0x100
[   41.594200]  __arm64_sys_reboot+0x140/0x20c
[   41.594585]  el0_svc_common+0x98/0x160
[   41.594921]  el0_svc_compat_handler+0x18/0x20
[   41.595315]  el0_svc_compat+0x8/0x34
[   41.595638] ---[ end trace 8a090dd86c5af601 ]---

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I075d2189ece5f54822ac6515ee3d390aa46e8708
2021-01-27 15:05:49 +08:00
Zorro Liu
a6584f838e input: touchscreen: cyttsp5: suspend support eink idle mode
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I263381c76541808ef51858ae20480059e93f2ac2
2021-01-27 14:42:06 +08:00
XiaoDong Huang
6023eb7d3e arm64: dts: rockchip: support ultra mode for rk3566-rk817-eink-w103.dts
Change-Id: I9583461ae87e0e3cdc9d637cfdcbc22369ddad81
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2021-01-27 14:35:24 +08:00
Wu Liangqing
e8ad38b098 arm64: dts: rockchip: rk3568: add evb4/evb5/evb7
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: Ic50490f650e0de5f78ba1e73c373b0920b0d44bd
2021-01-27 10:09:15 +08:00
Tao Huang
d66813cea8 arm64: dts: rockchip: Fix typo in rk3568 evb compatible
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I922e7b506fbe81f6b537be37cc9d07bdab31a142
2021-01-27 09:55:55 +08:00
Zorro Liu
9b6b975254 drm/rockchip: ebc_dev: tps65185: improve power on/off and temperture read
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: Id11b7574fa9125f875a55c9a3823a5ade3d28276
2021-01-27 09:31:53 +08:00
Wenping Zhang
ed6cd522c1 drm/rockchip: ebc_dev: tps68185: optimize the power up sequence.
Only do the i2c configs at the first time or after entering suspend
mode, and add mutex protect during suspend and resume.

Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Change-Id: Id3e16da88c526332238682421976a43c5974c936
2021-01-27 09:31:30 +08:00
Andy Yan
adafb5ebfb drm/rockchip: vop2: Exit standby after display timing config done
When clear standby bit, the vop post will start scan out
with the old timing immediately(no need config done bit).

Sometime the old timing is verery different with the
current timing we want config(switch from 4K to 720P),
this may cause problems at some point.

So we clear standby after a new timing config done.

Change-Id: Id621bea6a622c151d3e339b102c6791a6244ac08
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-01-27 09:25:13 +08:00
Andy Yan
bd11b0fed8 drm/rockchip: vop2: wait for frame start by vcnt
Sometimes isr is disabled, wait for frame start
by poll vcnt is more safe.

Change-Id: I0f3d63e1d51a623d22eedef05920bcff5d63a75d
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-01-27 09:25:13 +08:00
Andy Yan
2cc91f4dfb drm/rockchip: vop2: No need to wait when config same VP
Just overwrite config done bit for the same VP.

Change-Id: I41931e0fc595b3bfbf4f0fa04e615c5af2326f70
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-01-27 09:25:13 +08:00
XiaoDong Huang
c75258fee8 arm64: dts: rockchip: rk3568: add rockchip-suspend node
Change-Id: I1b298724bdcb527c91a5fc2656590865730539bb
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2021-01-26 19:29:40 +08:00
XiaoDong Huang
4485e65cb4 soc: rockchip: support rk3568 pm config
Change-Id: I800cfe6a34d06085d194ec27a5708837c06ac027
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2021-01-26 19:29:40 +08:00
XiaoDong Huang
ab7f089cfa soc: rockchip: pm-config: support mem_lite/mem_ultra config
Change-Id: I6086e8cd94d0b1d96bcc92fee5050b23a910b163
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2021-01-26 19:29:40 +08:00
XiaoDong Huang
362667b0e3 PM / sleep: support mem_lite/mem_ultra mode
Change-Id: Iab2e11a2f63b1a3f38c1c9b6c4b675ee2660f244
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2021-01-26 19:29:35 +08:00
Jianhui Wang
23de275f5e soc: rockchip: system_monitor: add ddr devfreq callback for eink
Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
Change-Id: I832be44e594942d854e75aca4e4075659e5c5fdc
2021-01-26 18:48:51 +08:00
Jianhui Wang
a99d9117ce arm64: dts: rockchip: rk3566-eink: Optimize the power consumption
Signed-off-by: Jianhui Wang <wjh@rock-chips.com>
Change-Id: I15948c95a841cfd9ba89248c7bf03e19a5139434
2021-01-26 18:47:45 +08:00
Cai YiWei
2ae52f15a0 media: rockchip: isp: fix array overflow
Fixes: 5358e9d0b6 ("media: rockchip: isp: 64 align y size for fbcgain format")
Change-Id: Ic73e28ade0800562eeca1863277dc414c85e49d6
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-01-26 17:57:46 +08:00
Allon Huang
474c2aa03d drivers: media: platform: rockchip: cif: restruct cif reset monitor
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Iec0b8499f4a3da086421bc7ab28566bb27ca6aa8
Signed-off-by: Vicent Chi <vicent.chi@rock-chips.com>
2021-01-26 14:19:14 +08:00
Shawn Lin
d7c0bd4acd phy: phy-rockchip-snps-pcie3: Remove unused reset signal
We have move p30x1 and p30x2 reset signal to corresponding
controller drivers. So we need to remove them in PHY driver
in order not to add misleading debug message.

Change-Id: I5f180bf51a449ce2db6c49f937d3898a61d7c4d9
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2021-01-26 14:09:04 +08:00
Zorro Liu
9de289947d arm64: dts: rockchip: rk3566-eink: add int pin for tps65185
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I923d0441d9155d477e742b54e4f66a0060be77ef
2021-01-26 09:19:57 +08:00
Zorro Liu
d53a8a4015 drm/rockchip: ebc_dev: tps68185: add int to do power err
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I09ec350480a9d61549b3cc72aeb69281255d299e
2021-01-26 09:19:17 +08:00
William Wu
b41682e5e7 usb: dwc3: core: do gadget exit when drd init fails during probe
If it fails to do dwc3_drd_init() during probe, call the
dwc3_gadget_exit() to release the gadget resource when
the flag dwc->en_runtime is enabled.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I12903841db4d83a7811b7e05d0a950932b4d3085
2021-01-26 09:17:43 +08:00
Sandy Huang
53491bd312 drm/rockchip: vop2: alpha_cal_mode use ALPHA_NO_SATURATION is better
set Ad0" = Ad0_" to instead of Ad0" = Ad0_" + (Ad0_" >> 7), than VOP
some alpha result is same with GPU output.

Change-Id: If05f561c16b4eb6e46671f4a130fae0fe50191c2
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-01-25 20:25:25 +08:00
Andy Yan
49eae01a53 drm/rockchip: vop2: Set wb_axi_yrgb/uv id
Set wb_axi_yrgb_id to 0xd
set wb_axi_uv_id to 0xe

Change-Id: Ie8188c2c307d2167ea237b4a176b03cfdab73792
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-01-25 19:25:07 +08:00
Sandy Huang
38db9d9604 drm/rockchip: vop2: update for alpha config
Change-Id: Idf269d18464108bbe5e340bd8b34183e8e4716f9
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-01-25 17:34:15 +08:00
Huang zhibao
acfeb3f707 ARM: dts: rv1126: uvc: fix cpll to 491520000
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: Ibd6df2bbcb24ea5ba72c40a8146d8a6d1c3e32a7
2021-01-25 15:50:03 +08:00
Shunqing Chen
0eae5a230c arm64: dts: rockchip: rk3566-rk817-eink-w103: add low power sleep support
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: Ie3ca658f3e7a774515b67c6affafede86f10ff89
2021-01-25 15:22:11 +08:00
Shunqing Chen
9c3442728c arm64: dts: rockchip: rk3566-rk817-eink-w6: add low power sleep support
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: If93766f70889e59453f0c6c11c0f28769032912c
2021-01-25 15:22:05 +08:00
Shunqing Chen
ff9607fe94 power: rk817-battery: Add low power support in suspend
Some platforms (such as Eink) during suspend the current
is very low (low than 2Ma), if long time to sleep, it will
cause the dsoc to drain faster.

Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I25330a3a79f9684487bea0f523d97d61b8098e8a
2021-01-25 15:21:45 +08:00
Yandong Lin
29f57122a3 video: rockchip: mpp: Fix irq state err.
Set handled state, only when a valid irq

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I0db013066c795dc2d5ae896e84dc23c42026aabf
2021-01-25 15:18:50 +08:00
Shawn Lin
a9bdf904a0 PCI: rockchip: Disable ltssm after waiting for L2 handshake
We should not disable it before L2, otherwise all L2 transaction
event would be lost for RC side, leading to unstable L2 link stage.

Change-Id: Ia87f8749d4a0acc9aeb1215682209c853672a84d
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2021-01-25 11:27:46 +08:00
Yu Qiaowei
2d6a3e38e1 video/rockchip: rga2: Modify the judgment of first req.
Fixed the error that color fill would cause "req argument is inval".

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I94ebfc2061f16916813a0d85630f8a9862728b0e
2021-01-25 10:57:41 +08:00
Yu Qiaowei
93e6da0968 video/rockchip: rga2: Fix a crash cause by rga timeout.
Because update_patten_buff_mode is not currently used,
it is removed.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I48c97e75d27d475eee528ed6c838c67fdaa430f8
2021-01-25 10:57:31 +08:00
Jon Lin
08e8386122 soc: rockchip: mtd_vendor_storage: Save the initialization result to flash
Change-Id: I7ae9dc6dd328680257922559e981cc9adf74b7ee
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-01-22 20:43:36 +08:00
Weixin Zhou
ab15d7f901 power: rk817-battery: move resume work to workqueue
Reduced resume elapsed time

Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I074d86934537bc05f7d18f9eb62278d9a9053cdf
2021-01-22 20:13:01 +08:00
Shawn Lin
c296f63fe3 PCI: rockchip: dw: Fix unblance pm call for fake probe
We move all the probe stuff to kthread so that it won't block
the system to go on probing other drivers. But that introduced
it bug that PM calls would not be removed by driver core. We
trace back the platform driver to add PM callbacks if we really
detect active devices.

Fixes: 79ac46bdea ("PCI: rockchip: dw: Add kthread to probe PCIe devices")
Change-Id: I93a331fe6c17d97b71010780fba4afbc2dbf6216
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2021-01-22 20:13:01 +08:00
Wang Panzhenzhuan
413608a70d arm64: dts: rockchip: rk3566-evb3: enabled dvp camera
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: If10982b21a59f8d73f61196c0e3323738fe6b1f5
2021-01-22 20:13:01 +08:00
Ziyuan Xu
c0a95fe38f net: rfkill-wlan: fixes WARN if WIFI,poweren_gpio is not assigned
Change-Id: I85cf17f0b7efd95eb515a2708497dd17f15337b2
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2021-01-22 20:13:01 +08:00
Cai YiWei
1afd77fecc media: rockchip: ispp: remove debug log
Change-Id: I44512687d6edd2c1b8242d5c770f26a785007e66
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-01-22 20:13:01 +08:00
Sandy Huang
d716237f7f drm/rockchip: vop2: Add delay number for cluster win1
Change-Id: If70cb8fc03e5551cd8fc142e4400a2d2bbb3628a
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-01-22 20:13:01 +08:00
Zhichao Yu
26e77bc0b1 media: i2c: imx307: support 60fps linear mode
Signed-off-by: Zhichao Yu <zhichao.yu@rock-chips.com>
Change-Id: I011f058014e4e59a6d80fc9c44101e5e6172c903
2021-01-22 20:13:01 +08:00