Commit Graph

863177 Commits

Author SHA1 Message Date
Tao Huang
454d65eb27 arm64: dts: rockchip: Disable CPU_SLEEP idle state on rk3568-nvr
Reduce wake up latency.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I704c359338e2ef556f56af63875be54335974b52
2021-04-30 15:03:19 +08:00
Tao Huang
6409cc339e arm64: dts: rockchip: rkvdec use 64KB sram on rk3568-nvr
Without DDR freq, rkvdec can use all sram.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I17ddd8715ffff524613ba0a2f906d51ec12f4a94
2021-04-30 15:03:19 +08:00
Tao Huang
02c875c876 Revert "arm64: dts: rockchip: rk3568-nvr: remove rcb reference properties"
This reverts commit fc2f74ccdd.

Use sram can reduce the memory bandwidth usage.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5fae577671a905348239d0a40299d69e4cd8e6bb
2021-04-30 15:03:19 +08:00
Jianqun Xu
62618bd61d arm64: configs: rockchip_defconfig select ION_CMA_HEAP
This patch selects the ION_CMA_HEAP, for userspace to allocate continuous
memory area from ion cma-heap allocator.

Change-Id: I501f097cf8005bc7ecad8a0a23706f11b1987d3e
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-04-30 14:44:50 +08:00
Jianqun Xu
975372e2cb staging: android: ion: support partial cpu access
Change-Id: I8250c0bb26b776b8c8f5e4c3ee0cb71e26445743
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-04-30 08:29:06 +08:00
Alex Zhao
d37b518b0e arm64: dts: rockchip: rk356x board: give wifi some time after power-on.
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I29503ce3f328862361fda1c192aaff5d3b3781cb
2021-04-29 17:15:57 +08:00
Wyon Bi
075f963442 drm/bridge: analogix_dp: set correct dpms mode in loader_protect callback
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I2e99a3fac5ab51e94990d2e3e4720f1e885ff045
2021-04-28 16:06:04 +08:00
Wyon Bi
0311e832b5 Revert "arm64: rockchip_defconfig: enable CONFIG_PHY_ROCKCHIP_DP"
This reverts commit 621fa3942d.

Change-Id: If3f9ff54e0b1c2fc518c2f93b225b0382a5e0133
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-04-28 16:06:04 +08:00
Wyon Bi
84e9a413b9 ARM: rockchip_defconfig: remove CONFIG_PHY_ROCKCHIP_DP
The driver is gone, stop selecting it.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I3f618e97ea5f2d2fed643ef090262bf6a905b8b9
2021-04-28 16:06:04 +08:00
Wyon Bi
4d65711cc6 arm64: dts: rockchip: rk3368: Fix edp node
Change-Id: I96c3579d1772653ea04f4a3febf1b97ac0402047
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-04-28 16:06:04 +08:00
Wyon Bi
756ee85799 arm64: dts: rockchip: rk3399: Fix edp node
Change-Id: I84cb4bc0954d4d249a094b34512cd6558d2a58b9
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-04-28 16:05:35 +08:00
Joshua
63f7ae0482 media: i2c: add s5k4h7 camera driver.
Change-Id: Id291ef9cbeb48401e546e0c1be8c49845d96bf92
Signed-off-by: Joshua <joshua.huang@rock-chips.com>
2021-04-28 14:42:44 +08:00
Joshua
ba44eef6c6 media: i2c: add s5kgm1 camera driver.
Change-Id: I1b1e044af4be17cbcd19c6d480963c304b214696
Signed-off-by: Joshua <joshua.huang@rock-chips.com>
2021-04-28 14:41:28 +08:00
Caesar Wang
687c246020 arm64: configs: enable optee for rockchip_linux_defconfig
Enable the configs and had TEE information as below:

root@linaro-alip:~# dmesg |grep optee
[    0.181303] TEE core: Alloc the misc device "opteearmtz00" (id=0)
[    0.181507] TEE Core: Register the misc device "opteearmtz00" (id=0,minor=63)
[    0.848626] optee: probing for conduit method from DT.
[    0.848657] optee: revision 3.6 (c38b1925)
[    0.849045] optee: initialized driver

root@linaro-alip:~# realpath /dev/tee*
/dev/tee0
/dev/teepriv0

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I2e818978c2b3203d859e169f10b86bee1bdac125
2021-04-28 11:01:06 +08:00
Finley Xiao
cd4f956b82 ARM: dts: rv1126: Adjust opp table for low performance chips
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ib8eb3392050b25c3ac8e969348e1cca85a212d08
2021-04-28 10:08:33 +08:00
Zefa Chen
b149896cbb media: i2c: imx415 add HDR exposure exception handling
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I76dea27e13442d5907cead4c7d7bd9d8b6e0696b
2021-04-28 10:05:57 +08:00
Zefa Chen
eac935caac media: i2c: add camera driver imx464
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Iae18497edac0c4fdd24bd2f74a5348aa5271f4e4
2021-04-28 09:48:41 +08:00
Zefa Chen
6725889649 media: i2c: support get dcg ratio from sensor
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I47e07dc1bb282e0fb24db87f3802dd3ef93907a8
2021-04-28 09:45:04 +08:00
Yu Qiaowei
4d505d61eb video/rockchip: rga2: Add new features in compat_ioctl.
Some features are not updated to compat_ioctl, so add them.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Id89a0826a4125af97398200f7ce6e3cc73de4342
2021-04-27 17:45:49 +08:00
Yu Qiaowei
f598231499 video/rockchip: rga2: Fix the wrong judgment of err_get_sg.
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Iec9ac3492642bb00e212b9c2862bf9fa1d8a964c
2021-04-27 17:45:49 +08:00
Xiao Ya peng
f158169dc7 arm64: dts: rockchip: rk3568-nvr-demo-v10-spi-nand: disabled pcie for v10 borad
Signed-off-by: Xiao Ya peng <yp.xiao@rock-chips.com>
Change-Id: If25306404edc6bad153ed48a1b3786f14f71dc76
2021-04-27 17:03:49 +08:00
Nickey Yang
58eb535459 arm64: rockchip_linux_defconfig: Enable CONFIG_ENERGY_MODE
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: I058c64e5fefa0d4f8d01c5645f886b596cec20fd
2021-04-27 17:02:31 +08:00
Finley Xiao
7dc0f80427 clk: rockchip: rv1126: Fix ispp parents' name
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I5bb9437320835a2a0cdb16c039aabd846bf1d682
2021-04-27 15:52:36 +08:00
Sandy Huang
0b9a779825 drm/rockchip: vop: fix rk3399 y2r csc coe error
Change-Id: I3767e90335ff9e2509ca45048807b8fd4f649801
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-04-27 14:24:22 +08:00
David Wu
4715f67919 ARM: dts: rk312x: Add ethernet alias for uboot write MAC address
Now we use U-Boot to write the MAC address into DTB, to
solve the problem of getting the MAC address in the vendor
partition too late at the kernel level, so the Ethernet
alias is added for U-Boot to quickly find the gmac DTB node.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ibeae8b4cc09bbf3cfb7b64e51f6f6aa35820bf0d
2021-04-26 16:49:04 +08:00
David Wu
5b77836aba ARM: dts: rk322x: Add ethernet alias for uboot write MAC address
Now we use U-Boot to write the MAC address into DTB, to
solve the problem of getting the MAC address in the vendor
partition too late at the kernel level, so the Ethernet
alias is added for U-Boot to quickly find the gmac DTB node.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I603946b27ab4668ed5ff4dbb629f3ed9b8741b08
2021-04-26 16:47:53 +08:00
David Wu
4ac088b60f arm64: dts: rockchip: rk1808: Add ethernet alias for uboot write MAC address
Now we use U-Boot to write the MAC address into DTB, to
solve the problem of getting the MAC address in the vendor
partition too late at the kernel level, so the Ethernet
alias is added for U-Boot to quickly find the gmac DTB node.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ie7ec87208811e2fd7a217558d97e0f1bd46d122d
2021-04-26 16:46:29 +08:00
David Wu
47f179e528 ARM: dts: rv1126: Add ethernet alias for uboot write MAC address
Now we use U-Boot to write the MAC address into DTB, to
solve the problem of getting the MAC address in the vendor
partition too late at the kernel level, so the Ethernet
alias is added for U-Boot to quickly find the gmac DTB node.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ic12cdbf3f4116a5f20b7aeb8b1c665be229c5e32
2021-04-26 16:40:16 +08:00
Xing Zheng
bfccb20a08 dt-bindings: sound: rockchip: Add an optional properties 'rockchip,pa-ctl-delay-ms'
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: Ib1d05daf82127544137215136f7e4cd4505172ce
2021-04-26 15:28:41 +08:00
Xing Zheng
9cbbdcfaf4 ASoC: codecs: rk_codec_digital: add pa-ctl on startup/shutdown
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: Iac08054b117652a838412a816714a025b8928d24
2021-04-26 15:28:41 +08:00
Vicent Chi
f444508fb0 media: platform: cif: hotplug reset add quick stream opt
Change-Id: I7934ddc2fe13cdf7fe4e0b763ba3286203c24741
Signed-off-by: Vicent Chi <vicent.chi@rock-chips.com>
2021-04-26 14:57:02 +08:00
Jianqun Xu
da6f4621d7 staging: ion: ion_system_heap implement ION_FLAG_DMA32
Change-Id: I580b9cc9f256252b16bbb1211a116bf31c9eacd8
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-04-26 10:38:00 +08:00
Jianqun Xu
781ccbba7a staging: ion: uapi: add ION_FLAG_DMA32 flag
Add a new flag for system heap to allocat pages in normal zone.

Change-Id: I851b7fa412c181a6c3222aeadffddc84aba74c1e
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-04-26 10:38:00 +08:00
Cai YiWei
beabbf3531 media: rockchip: isp: max height 3072 for isp21
Change-Id: I02ef7a19679597f9a4028c29e55d134d597091c4
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-04-26 10:17:54 +08:00
Zhen Chen
18ffa2c09b MALI: midgard: fix compiler warnings when CONFIG_DEBUG_FS is not defined
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: I2f34229c003ec9520bbc2a9d053de733d3a95b70
2021-04-26 09:00:01 +08:00
Shunhua Lan
0071310637 media: i2c: rk628csi: fix mask for clkrate and fs audio align to 100
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I15b290319463f1b41e6908e54caa99ef9c6db4f4
2021-04-25 17:35:16 +08:00
Alex Zhao
5e5a7e0cfb net: rockchip_wlan: support rtl8723cs to "v5.12.2-6-g7dd36f8de.20201207_COEX20180330-1e00"
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I236127e7d5aa5aed356a49b46d0cd47eb7e7de39
2021-04-25 17:34:08 +08:00
Yiqing Zeng
b78f04564a media: i2c: jx_k04 fix upload wrong pixelrate bug
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: Iebf1a5bea4c69907c90f7c8447048c4c6f1ca2f4
2021-04-25 17:32:36 +08:00
Wang Panzhenzhuan
fee5a59959 media: i2c: gc8034: add 2lane support
1. add 2lane support
2. add some debug info
3. adjust gc8034_g_mbus_config function

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I7f40c2c9ce0aea543ea629efb46585ebee387515
2021-04-25 17:32:10 +08:00
Jianqun Xu
cf61f72acc arm64: dts: rockchip: rk3568-pinctrl add blank lines
Change-Id: I98885cf5522073e1cd16ff0f24484f92077d4145
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-04-25 17:31:22 +08:00
Wang Panzhenzhuan
37294a27db media: i2c: sp250a: update sp250a sensor driver
1. adjust power on/off sequence
2. add some debug info

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I6d7e1b56b136d6132b9a25a84eb3ebc01bafc678
2021-04-25 17:20:09 +08:00
Zorro Liu
31a315bf40 arm64: dts: rockchip: rk3566-eink: eink mem reserved start from 0x10800000
Since the cma reserved start from 0x10000000, size 0x00800000,
so fix the eink reserved default start from 0x10800000

Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: Iff6933137e77ac678bb7dd815968a9d447476623
2021-04-25 15:55:29 +08:00
Fenrir Lin
b00a220b72 ARM: dts: rv1126-thunder-boot: modify memory-region-thunderboot to rkisp_vir1
Signed-off-by: Fenrir Lin <fenrir.lin@rock-chips.com>
Change-Id: I8ab1e80e40c22a14759439293d2fe1cf47eb1556
2021-04-25 11:35:05 +08:00
Yiqing Zeng
d513aba573 media: i2c: os02g10 update init setting
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: If0465c723970e5027d051eabfc039d9c29c68295
2021-04-25 11:34:25 +08:00
Cai YiWei
63288861f2 media: rockchip: isp: use same api to set clk
Change-Id: I0229675cc2ff13ca4c30e3c32b4e69e4318ff6d8
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-04-25 11:27:18 +08:00
Wu Liangqing
65a3eeea66 arm64: dts: rockchip: add not-save-power-en to rk356x board
fix reboot block as follows log:
[   15.874382] binder: release 247:268 transaction 4234 in, still active
[   15.874418] binder: send failed reply for transaction 4234 to 395:455
[   15.959849] binder: undelivered TRANSACTION_ERROR: 29189
[   16.085993] binder: 147:147 transaction failed 29189/-22, size 100-0 line 3059
[   16.128154] android_work: sent uevent USB_STATE=DISCONNECTED
[   16.145570] logd.klogd: 24 output lines suppressed due to ratelimiting
[   16.690141] cpu cpu0: min=816000, max=816000
[   16.696558] rk808 0-0020: reboot: force RK817_RST_FUNC_REG ok!
[   33.769778] vcc5v0_otg: disabling
[   33.770099] vcc3v3_lcd0_n: disabling
[   33.770424] vcc3v3_lcd1_n: disabling
[   37.699768] rcu: INFO: rcu_preempt detected stalls on CPUs/tasks:
[   37.700342] rcu: 	3-...0: (0 ticks this GP) idle=b52/1/0x4000000000000000 softirq=4194/4194 fqs=2012
[   37.701150] rcu: 	(detected by 0, t=6302 jiffies, g=3301, q=16)
[   37.701684] Task dump for CPU 3:
[   37.701981] init            R  running task        0     1      0 0x0400000a
[   37.702609] Call trace:
[   37.702851]  __switch_to+0xe4/0x138
[   37.703166]  lock_timer_base+0x5c/0xa0
[   37.703502]  try_to_del_timer_sync+0x30/0x98
[   37.703883]  del_timer_sync+0x50/0x60
[   37.704220]  schedule_timeout+0x19c/0x478
[   37.704582]  clk_gate_endisable+0x2c/0xc8
[  100.716421] rcu: INFO: rcu_preempt detected stalls on CPUs/tasks:
[  100.716991] rcu: 	3-...0: (0 ticks this GP) idle=b52/1/0x4000000000000000 softirq=4194/4194 fqs=7921
[  100.717799] rcu: 	(detected by 0, t=25207 jiffies, g=3301, q=19)
[  100.718334] Task dump for CPU 3:
[  100.718632] init            R  running task        0     1      0 0x0400000a
[  100.719260] Call trace:
[  100.719500]  __switch_to+0xe4/0x138
[  100.719816]  lock_timer_base+0x5c/0xa0
[  100.720152]  try_to_del_timer_sync+0x30/0x98
[  100.720533]  del_timer_sync+0x50/0x60
[  100.720870]  schedule_timeout+0x19c/0x478
[  100.721231]  clk_gate_endisable+0x2c/0xc8
[  163.733075] rcu: INFO: rcu_preempt detected stalls on CPUs/tasks:
[  163.733643] rcu: 	3-...0: (0 ticks this GP) idle=b52/1/0x4000000000000000 softirq=4194/4194 fqs=13833
[  163.734462] rcu: 	(detected by 0, t=44112 jiffies, g=3301, q=20)
[  163.734997] Task dump for CPU 3:
[  163.735294] init            R  running task        0     1      0 0x0400000a
[  163.735921] Call trace:
[  163.736160]  __switch_to+0xe4/0x138
[  163.736475]  lock_timer_base+0x5c/0xa0
[  163.736811]  try_to_del_timer_sync+0x30/0x98
[  163.737192]  del_timer_sync+0x50/0x60
[  163.737528]  schedule_timeout+0x19c/0x478
[  163.737889]  clk_gate_endisable+0x2c/0xc8

Change-Id: I663b6b3e0b081ad17bf2845629b34e2ec9d2d76d
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2021-04-25 11:26:47 +08:00
Zorro Liu
d4ad99af25 drm/rockchip: ebc_dev: release version v1.10
1.add auto_cur_image buf to save cur osd buf, improve osd buf display
when auto_bg_image update
2.remove rw lock to improve osd display speed
3.protect osd buf when change mode from overlay to normal mode
4.pvi_waveform: support du4 parse
5.rkf_waveform: support lut table improve

Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: Idc5f7a260eb3542e21bd984b4f8bc613a282092b
2021-04-23 17:50:08 +08:00
Ding Wei
6b8b1d9a47 video: rockchip: mpp: Reduce frequent malloc/free for memory region
tips: In the whole process, task is the unit, and it can only be
one state. And mem_region is an internal element, so no lock is
required.

Change-Id: I07955d0d7064c3c6aec6968d0d38d6e0ad378289
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-04-23 16:48:57 +08:00
Vicent Chi
42e4c8f39a media: i2c: techpoint: tp2855 add quick stream opt
Change-Id: Ibb6dd23505b2db4afe240ff9a0e8c2e6254c2c11
Signed-off-by: Vicent Chi <vicent.chi@rock-chips.com>
2021-04-23 16:14:15 +08:00
Dingxian Wen
597c44c6be ARM: dts: rockchip: rk628: support hpd level inversion configuration
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: Ida889b7cfb0b617158e6f3f31fa1c72c6a6f631c
2021-04-23 16:00:18 +08:00