Commit Graph

860661 Commits

Author SHA1 Message Date
Wyon Bi
fcfe49fdb3 phy/rockchip: naneng-edp: Add delay after release aux_idle
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Id82b2983c174f8d99c686af61586c731a9ec91f9
2020-12-14 17:56:32 +08:00
Sandy Huang
ee81411850 drm/rockchip: vop2: update vop scale factor
Change-Id: I2bb22e56de8f2daafb510d8f3eec49928d1fa213
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-12-14 17:10:47 +08:00
Shunqing Chen
d5d2966907 drm/rockchip: rk618: rgb: fix find bridge fail
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I0ac8b1b2b3db90e5608a3bc8e5372cdb4863182a
2020-12-14 17:00:50 +08:00
Sandy Huang
8877840a6f drm/rockchip: vop2: add support gamma function
Change-Id: I8e86cfa4e7229d26cfcf729890445d6180a1c0c5
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-12-14 16:04:00 +08:00
Sandy Huang
cb8a4f52ea arm64: dts: rockchip: rk3568: add vop gamma register
Change-Id: I8d589ce5ab98dfb5f6b8ca1dc23c1150edacfef9
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-12-14 16:04:00 +08:00
Luo Wei
d5dd0267d5 arm64: dts: rockchip: add dts file for rk3566-evb5
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I3eeb023b7ce622acd8ed151f0948489d5cd07ad8
2020-12-14 15:42:01 +08:00
Liang Chen
f7a1c6f2a1 cpufreq: interactive: fix deadlock
up_read() may wakeup some tasks, so do not call up_read() in scheduler,
or it will cause deadlock as below:

Thread #4 5 (Name: cpu3, state: debug-request) (Suspended : Container)
	queued_spin_lock_slowpath() at qspinlock.c:369 0xffffff8008119120
	queued_spin_lock() at qspinlock.h:88 0xffffff8008f0a470
	do_raw_spin_lock() at spinlock.h:180 0xffffff8008f0a470
	__raw_spin_lock() at spinlock_api_smp.h:143 0xffffff8008f0a470
	_raw_spin_lock() at spinlock.c:144 0xffffff8008f0a470
	rq_lock() at sched.h:1,244 0xffffff80080f2f4c
	ttwu_queue() at core.c:2,442 0xffffff80080f2f4c
	try_to_wake_up() at core.c:2,658 0xffffff80080eb998
	wake_up_q() at core.c:450 0xffffff80080eb6a8
	rwsem_wake() at rwsem-xadd.c:703 0xffffff800811a44c
	__up_read() at rwsem.h:107 0xffffff8008118930
	up_read() at rwsem.c:122 0xffffff8008118930
	cpufreq_task_boost() at cpufreq_interactive.c:1,449 0xffffff8008a4bdb4
	enqueue_task_fair() at fair.c:5,285 0xffffff80080f7814
	enqueue_task() at core.c:1,324 0xffffff80080ec15c
	activate_task() at core.c:1,346 0xffffff80080ec15c
	ttwu_activate() at core.c:2,240 0xffffff80080f2fc0
	ttwu_do_activate() at core.c:2,299 0xffffff80080f2fc0
	ttwu_queue() at core.c:2,444 0xffffff80080f2fc0
	try_to_wake_up() at core.c:2,658 0xffffff80080eb998
	wake_up_q() at core.c:450 0xffffff80080eb6a8
	futex_wake() at futex.c:1,636 0xffffff8008159e78
	do_futex() at futex.c:3,714 0xffffff8008158fb0
	__do_sys_futex() at futex.c:3,770 0xffffff800815bd98
	__se_sys_futex() at futex.c:3,738 0xffffff800815bd98
	__arm64_sys_futex() at futex.c:3,738 0xffffff800815bd98
	__invoke_syscall() at syscall.c:36 0xffffff8008098d6c
	invoke_syscall() at syscall.c:48 0xffffff8008098d6c
	el0_svc_common() at syscall.c:117 0xffffff8008098d6c
	el0_svc_handler() at syscall.c:163 0xffffff8008098ccc
	el0_svc() at entry.S:940 0xffffff8008083d08

Fixes: 2d367d61e8 (cpufreq: interactive: introduce boost cpufreq interface for task)

Change-Id: I9607faa5ede3a662e7f2f55da29b08fc328f4d43
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-12-14 14:11:26 +08:00
Hu Kejun
d811fd17a0 media: spi: rk1608: fix compile error by module
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Idfd973e154eb8d97eee0deb4a73c26a8a711d462
2020-12-14 14:07:06 +08:00
Hu Kejun
15f6bb1725 media: i2c: restore vcm_config ioctl
restore vcm_config ioctl deleted by commit a3907e42d2 ("media: add motor driver of MP6507 for camera IRIS/FOCUS/ZOOM")

Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I391ec77a31291c65fbb04da1915647be25dcf4b5
2020-12-14 11:42:12 +08:00
Jon Lin
495203b0c3 soc: rockchip: thunderboot_sfc: Change to wait for SFC idle
Change-Id: Idc7e1b8ae8d14c0f0bbac5714f53f50914982a65
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-12-14 11:11:56 +08:00
Jon Lin
d7437bb47f drivers: rkflash: Wait for SFC DMA finished when thunder boot
Change-Id: I361d6edb3d458557ea05586e0274a0a9f13e6bdf
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-12-14 11:11:56 +08:00
Hu Kejun
2364c7140f media: rockchip: ispp: fix compile error in rkispp_compat_ioctl32
fix compile error: implicit declaration of function 'rkisp_ioctl'

Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ic4822eb6697d300c76d0845d90284ae5940caa4a
2020-12-14 10:32:22 +08:00
Bian Jin chen
032a7bd94d arm64: rockchip_defconfig: enable CONFIG_VM_EVENT_COUNTERS by default.
Test:
    CtsAppExitTestCases
    android.app.cts.ActivityManagerAppExitInfoTest#testLmkdKill

Android R Go's lmkd needs this configuration to correctly match vmstat,
enable it to make lmkd work properly.

Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
Change-Id: I0b88921d9fadb33b91512a9dd911bca811c4bc31
2020-12-11 17:54:47 +08:00
Bian Jin chen
343854360c ARM: rockchip_defconfig: enable CONFIG_VM_EVENT_COUNTERS by default.
Test:
    CtsAppExitTestCases
    android.app.cts.ActivityManagerAppExitInfoTest#testLmkdKill

Android R Go's lmkd needs this configuration to correctly match vmstat,
enable it to make lmkd work properly.

Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
Change-Id: I57ee648f70f7b44755f7ddb0d8bb3082273e926b
2020-12-11 17:52:27 +08:00
Sandy Huang
c35604c21e drm/rockchip: vop2: add win dsp size check
Change-Id: I1a548ee5f8887c30100d9a0364acef7c991c4d2c
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-12-11 17:47:00 +08:00
Elaine Zhang
36d3e741d9 rtc: rtc-rk808: use flag to distinguish chip differences
RK808\RK818 have November 31st,Other chips fixed the problem.

Fixes: f076ef44a4 ("rtc: rk808: Compensate for Rockchip calendar
deviation on November 31st")
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I8977a14abcc3973728b5941951d17d493b3955d4
2020-12-11 17:16:56 +08:00
Zefa Chen
3f7be43b4f dt-bindings: media: Add bindings for OV12D2Q
Add device tree binding documentation for the OV12D2Q sensor.

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Id73ef1715af9f25b6c333fbcec1177fc450c0d13
2020-12-11 15:48:41 +08:00
Zefa Chen
3b533c6841 media: i2c: support ov12d2q camera driver
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic0538c8c8767f68e8df2c82c6409697d04790d6e
2020-12-11 15:31:17 +08:00
Zefa Chen
74b4549fd0 dt-bindings: media: Add bindings for OV2775
Add device tree binding documentation for the OV2775 sensor.

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I17d6b0ef08e59289768b0155b9cec43f2d08943e
2020-12-11 15:28:51 +08:00
Zefa Chen
660614dacf media: i2c: support ov2775 camera driver
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia16b59fb06972e1a622180103ee090aac7d5029b
2020-12-11 15:26:12 +08:00
Hu Kejun
1ccbbccd38 media: rockchip: isp: fix setting drc register is not correct
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Iba9b20bdb7edc1889b19b84d8641ff15ffa0f3ec
2020-12-11 14:39:47 +08:00
William Wu
4244fc70bb phy: rockchip: inno-usb2: select bvalid of phy for otg port
Since RK356x, the USB PHY GRF adds new registers to select
bvalid from USB PHY or GRF. And in RK356x Maskrom USB driver,
it selects the bvalid from GRF and sets the bvalid value to 1,
it aims to improve the compatibility of various USB circuits
for Maskrom USB. However, the charger detection and USB PHY
power consumption control depends on the bvalid of USB PHY.
So this patch selects bvalid from USB PHY for otg port.

Change-Id: I3fc9faf06f30e0a3390bc4fd40c732fb856131f8
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-12-11 14:35:48 +08:00
Andy Yan
14b10bcb2c drm/rockchip: vop2: Change > to >= for gt2/gt4 check
According to test: Cluster can work with >, But
Esmart must enable gt2 when src_h = 2 * dst_h;

Change-Id: I3347eb4e340df093f7ab29afcb3a80ae5e03b0cc
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-12-11 11:17:20 +08:00
Weixin Zhou
e7d7c8aa1b arm64: dts: rockchip: rk3568-evb2-lp4x-v10: correct vccio6 to 3v3
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I5bb1ea9b0b87ad444c5099bb7c2fd34b5f1249ec
2020-12-11 10:12:14 +08:00
Xing Zheng
1762f2c1a7 arm64: dts: rockchip: rk3568-evb: rename 'pdm-mic_array' to 'pdm-mic-array'
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: Ia01c6c351e5f21748381b15f7ac31c1988b648ae
2020-12-10 11:49:55 +00:00
Wyon Bi
93ec807dae drm/bridge: analogix_dp: Remove fast training detection from loader protect
Fixes: 5beeda4a26 ("drm/bridge: analogix_dp: Add loader protect for psr function")
Change-Id: If49e3b88bfc08dcb5dfe610a63ad0f4f340ef872
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-12-10 18:45:36 +08:00
Xing Zheng
3defb0a34f arm64: dts: rockchip: rk3568: add pdm pinctrl
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I5997c2582f787b2f17c6c0b2fcfb26492710db12
2020-12-10 18:41:55 +08:00
shengfei Xu
3041737a51 arm64: dts: rockchip: rk3568-evb: config the sleep voltage
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I0998e9070689406303d7196776a3c76bcaca1818
2020-12-10 16:47:15 +08:00
shengfei Xu
624e4b8a5a arm64: dts: rockchip: rk3566-rk817-tablet: config the sleep voltage
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I3fd46cad17c05aee70e907a162d606e05b527f80
2020-12-10 16:47:07 +08:00
Caesar Wang
597397698e arm64/configs: update rockchip_linux_defconfig
1) Increase uart number to 10
2) Enable digital codec interface
3) Add wacom_9013 and cyttsp5 touch drivers
4) enable es7202 & es7243e

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: Ifd78e2d021a829f868017837a0e5916aba95b070
2020-12-10 15:21:30 +08:00
Zorro Liu
3016f5a8b5 arm64: dts: rockchip: add rk3566-evb2-lp4x-v10-eink.dts
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: Ifa5d3fb3f707ef818ae6ea2ab14c1f3575c2f8ce
2020-12-10 14:48:19 +08:00
Sandy Huang
fe736116ba drm/rockchip/rk628: Add GVI driver
Change-Id: Ie511a993867a2a2dd974862253eb6f56ee6c0d84
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-12-10 14:18:09 +08:00
Sandy Huang
9c1aa796d8 ARM: dts: rockchip: rk628: add ref clk for gvi
GVI only can use VOP sclk as combtxphy reference clock.

Change-Id: I919bdceaac6d7bb97658d958fecb52971117c82b
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-12-10 14:18:09 +08:00
Sandy Huang
4267ed97e7 drm/rockchip/rk628: combtxphy: update for GVI mode
Change-Id: Iea5a38e5c8ee1f1e3af44f7765f34e37147ffedf
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-12-10 14:18:09 +08:00
zhangqing
7840bf51dc clk: rockchip: rk3568: fix up the clk_rtc32k_frac definition error
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
Change-Id: I302ef30015d9afca7ad6ded20d6ee35167bec121
2020-12-10 14:12:32 +08:00
William Wu
f1c95218b2 usb: dwc3: gadget: fix time out waiting for setup phase when stop gadget
If dwc3 failed to init ep0 in __dwc3_gadget_start(), the ep0state will
be uninitialized, aka, ep0state is EP0_UNCONNECTED, in this case, we
don't need to wait for control transfer completion when stop gadget
because no usb control transfer in process. This patch can help to avoid
the following warning in RK356x Boards during shutdown process.

[   30.735323] usb ffs open    D    0   309      1 0x0400002d
[   30.735330] Call trace:
[   30.735336]  __switch_to+0xe4/0x138
[   30.735348]  __schedule+0x2f4/0x930
[   30.735358]  schedule+0x38/0xa0
[   30.735368]  schedule_timeout+0x194/0x478
[   30.735378]  wait_for_common+0x130/0x1e8
[   30.735388]  wait_for_completion_timeout+0x10/0x18
[   30.735399]  dwc3_gadget_pullup+0x68/0xc8
[   30.735411]  usb_gadget_disconnect+0xf0/0x110
[   30.735422]  usb_gadget_remove_driver+0x24/0x70
[   30.735431]  usb_gadget_unregister_driver+0xd0/0x120
[   30.735441]  unregister_gadget+0x20/0x50
[   30.735450]  unregister_gadget_item+0x24/0x38
[   30.735461]  ffs_data_clear+0x120/0x130
[   30.735471]  ffs_data_reset+0x14/0x58
[   30.735480]  ffs_data_closed+0x88/0xd8
[   30.735490]  ffs_ep0_release+0x10/0x20
[   30.735501]  __fput+0x88/0x1b8
[   30.735510]  ____fput+0xc/0x18
[   30.735521]  task_work_run+0x94/0xb0
[   30.735531]  do_exit+0x334/0xa28
[   30.735540]  do_group_exit+0x34/0x98
[   30.735550]  get_signal+0xe4/0x828
[   30.735557]  do_signal+0x1c0/0x298
[   30.735563]  do_notify_resume+0xd0/0x118
[   30.735568]  work_pending+0x8/0x10
[   30.735602] sysrq: Kill All Tasks

Change-Id: I3534b710804e099d857149b0b0b58a7a7236b8fc
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-12-10 09:55:32 +08:00
Bian Jin chen
737d1b5f7b arm64: rockchip_defconfig: enable CONFIG_INCREMENTAL_FS by default
Test:
    CtsIncrementalInstallHostTestCases
    android.incrementalinstall.cts.IncrementalFeatureTest

This config will enable the Incremental File System, which allows
Android OS to receive streamed APKs over adb.

Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
Change-Id: I4237fdeb1f5edf0e5f662236e6c97a6d7aae19e3
2020-12-09 17:58:14 +08:00
Shawn Lin
eb5b4e2042 PCI: rockchip: dw: Fix compile error for debug function
It seem we lose struct dw_pcie  definition on the way of
rebasing the orinial commit. Fix it.

Change-Id: I0f97b20960f5647251257cf65e862aeaa39f2b7d
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-12-09 17:24:10 +08:00
Shawn Lin
d38988a104 PCI: rockchip: dw: decrease linking timeout to 10s
The original waiting time is too long for setting up a link, so
let's decrease it to 10s which is enough for real usecase.

Change-Id: Ifb1eb0d7784e9afeef165f084bc3bda49b41618e
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-12-09 17:24:10 +08:00
Yu Qiaowei
2af29f5de3 video/rockchip: rga2: Modify the initial value of ktime_t.
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ibb7226351956951ac9f805c6e79fa6ac720e209d
2020-12-09 14:19:51 +08:00
Sandy Huang
1b7d995fb2 drm/rockchip: vop2: add support post scale
Change-Id: I564235c41a59b767f433cfc2eb85cf8f71eea74c
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-12-09 14:18:37 +08:00
Tao Huang
2a4e295a77 arm64: dts: rockchip: Remove rk3568-android.dtsi from rk3568-evb1-ddr4-v10.dtsi
rk3568-android.dtsi should included in dts.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I08ee2e2930152f74c726359e9b8880122255dd80
2020-12-09 11:43:56 +08:00
Zefa Chen
7055320802 arm64: dts: rockchip: rk3568 evb1 ddr4 add camera config
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib02978e551304dd287bed948c221ab776346d229
2020-12-09 10:56:47 +08:00
Jianqun Xu
f8e80bc98a pinctrl: rockchip: rk3568: fix strength setting bug
This patch fix following pins error design:
4a7/4b7/4c7/4d7, 3a7/3b7/3c7/3d7, 2a7/2b7/2c7/2d7, 1b7/1c7/1d7
share register with:
4a6/4b6/4c6/4d6, 3a6/3b6/3c6/3d6, 2a6/2b6/2c6/2d6, 1b6/1c6/1d6

Change-Id: I66fa6b261f2bec26b75750a77a56b372282b222f
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-12-09 10:03:02 +08:00
Zhenke Fan
78e78be266 media: i2c: add gc4663 driver
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I27ed48edc0773fd5fb0c6c9c8c80d5c43957521f
2020-12-08 20:43:44 +08:00
Alex Zhao
cee4c3d6b8 net: rockchip_wlan: update rtl8821cs to "v5.12.0-8-g39bbb8dd2.20201015_COEX20200730-5151"
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I0678acad3e33911177f865a26e34ca6639187004
2020-12-08 20:40:47 +08:00
Jianqun Xu
8095f58fbf ARM: configs: rv1126_defconfig: CONFIG_CMA_ALIGNMENT = 0
Change-Id: Iaaab6972679208ee25da8c08e888cf5130657b60
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-12-08 20:40:47 +08:00
Jianqun Xu
d84775858a cma: decrease CMA_ALIGNMENT lower limit to 0
Change-Id: Ia1cde062e3ab9fd3f94d757f08a9b3ca953728f2
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-12-08 20:40:46 +08:00
Shawn Lin
3ca937494c arm64: dts: rockchip: Add PCIe for rk3566-evb2-lp4x-v10
Change-Id: Idf823c7657942290a03eddba615bb44e6ccc5d7a
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-12-08 20:40:46 +08:00
Shawn Lin
c07bd0ba5e phy: rockchip: naneng-combphy: Add external refclk support
Change-Id: Iac968aa7ffd862533c7ca76dea82e083e957345c
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-12-08 20:40:46 +08:00