Commit Graph

863161 Commits

Author SHA1 Message Date
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
Dingxian Wen
9aaf90192c media: i2c: rk628csi: upgrade the driver version to v0.0.2
1.The hpd effective level can be configured to be inverted, when the hpd
output circuit is reversed.
2.Insertion detection adds debounce operation.
3.Lock the configuration operation of hdmirx phy and controller to
prevent re-entry during hot swap and resolution switching. Used to solve
the problem of abnormal images when hot plugging.
4.Increase the recovery mechanism when the insertion is not detected
correctly.
5.Fix the issue that csitx may cause the image to shift left or right or
shift up or down.
6.Add PDEC interrupt for judging that the image format is correctly
detected.

Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I3cf70b626ac4dbbffb990a370d0ea7e903fb79de
2021-04-23 16:00:18 +08:00
Dingxian Wen
c038565de7 drm: rockchip: rk628: the combrxphy cable mode wait for clk to stabilize
Signed-off-by: Dingxian Wen <shawn.wen@rock-chips.com>
Change-Id: I7502b8f71f4fcc376a925045adbe6148ebdc2d3f
2021-04-23 16:00:18 +08:00
Ding Wei
2d09e1f8e0 video: rockchip: mpp: Encapsulate the rw lock of IOMMU as functions
Change-Id: I5e176bbcdc33bacafeaa8c3b80b5f8337d13bb9a
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-04-23 14:35:24 +08:00
Ding Wei
bcb1f3291b ARM: dts: rv1126: rkvdec: Add compatible for special path
Change-Id: I7ce33a6ce414fbed68ae8f2f4d4beea91961d9d7
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-04-22 17:47:35 +08:00
Herman Chen
8285fceb43 video: rockchip: mpp: workaround patch for rv1126 iommu issue
tips:
rv1126/rv1109 use mmu-v1 which may trigger bug, and log shown below.

[  150.542230] rk_iommu ffb80480.iommu: Page fault at 0x02176000 of type write
[  150.542264] rk_iommu ffb80480.iommu: iova = 0x02176000: dte_index: 0x8 pte_index: 0x176 page_offset: 0x0
[  150.542277] rk_iommu ffb80480.iommu: mmu_dte_addr: 0x3ebaf000 dte@0x3ebaf020: 0x375df001 valid: 1 pte@0x375df5d8: 0x10957007 valid: 1 page@0x10957000 flags: 0x6
[  150.542288] mpp_rkvdec ffb80000.rkvdec: fault addr 0x02176000 status ab
[  150.542296] mpp_task_dump_mem_region:1546: --- dump mem region ---
[  150.542304] mpp_task_dump_mem_region:1552: reg[  0]: 0x00000000, size 1000
[  150.542311] mpp_task_dump_mem_region:1552: reg[  4]: 0x0041e000, size 200000
[  150.542319] mpp_task_dump_mem_region:1552: reg[  6]: 0x00201000, size 1000
[  150.542326] mpp_task_dump_mem_region:1552: reg[  7]: 0x02176000, size 1f4000
[  150.542333] mpp_task_dump_mem_region:1552: reg[ 10]: 0x011d6000, size 1f4000
[  150.542340] mpp_task_dump_mem_region:1552: reg[ 11]: 0x013ca000, size 1f4000
[  150.542347] mpp_task_dump_mem_region:1552: reg[ 12]: 0x01b9a000, size 1f4000
[  150.542354] mpp_task_dump_mem_region:1552: reg[ 13]: 0x01b9a000, size 1f4000
[  150.542361] mpp_task_dump_mem_region:1552: reg[ 14]: 0x01b9a000, size 1f4000
[  150.542368] mpp_task_dump_mem_region:1552: reg[ 15]: 0x01b9a000, size 1f4000
[  150.542375] mpp_task_dump_mem_region:1552: reg[ 16]: 0x01b9a000, size 1f4000
[  150.542382] mpp_task_dump_mem_region:1552: reg[ 17]: 0x01b9a000, size 1f4000

method:
    Flush extra iommu tlb before running a task.

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: Ic1a501bab6583e87c1c340c54e06dc7d021e99fc
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-04-22 17:47:12 +08:00
Ding Wei
41bfddb997 video: rockchip: mpp: Reduce frequent malloc/free for dma buffer
Change-Id: I5474dad5b1ba08d05edce8d35765abc13d453a9b
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-04-22 15:09:45 +08:00
Huibin Hong
c5b4ed4716 ARM: dts: rv1126: add mcu log for ramoops
1. mcu-log-size means the total buffer size for mcu
2. mcu-log-count means the count of mcu on the soc
3. every mcu has log buffer size that is mcu-log-size/mcu-log-count

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: Iec1887ddfd13f956cd27fd07398edb845fc01f85
2021-04-21 20:13:25 +08:00
Huibin Hong
f1b65cf0e1 fs: pstore: add mcu log
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: Iaa73a2826f5f4d52095399fb7879b8d099676b4e
2021-04-21 20:13:05 +08:00
Andy Yan
2ea9965c24 drm/rockchip: vop2: Dump all connectors on crtc
Change-Id: I4fea3d14f50aa6bfbf9cc8e2d62e4cad12cc36e0
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-04-21 15:26:42 +08:00
Cai YiWei
ee17c1285b media: rockchip: ispp: disable sharp output if it bypass
Change-Id: I094dcce7ee12f77e5f524a46d9565a63f4523801
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-04-21 15:25:59 +08:00
Xing Zheng
2ef70c2688 dt-bindings: sound: rockchip: Add an optional properties 'pa-ctl-gpios'
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I2d6d574fc2abed562ec8efeccd1804624f1ee84b
2021-04-21 15:24:23 +08:00
Sugar Zhang
8c0143a892 ASoC: codecs: rk_codec_digital: Add PA control for amplifier
Change-Id: I7ab899f305c6cae3fdcd314b2418ea91bd04ec6b
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2021-04-21 15:24:14 +08:00
Zhichao Yu
2592f0397b media: i2c: jx_h62: fix set gain bug
Signed-off-by: Zhichao Yu <zhichao.yu@rock-chips.com>
Change-Id: I2375125c5eafea26c983ef6f08a0ba88c4ccec7d
2021-04-21 09:26:55 +08:00
Andy Yan
4b0af1a9d7 drm/rockchip: vop2: skip fist frame when port_mux is changed
we must make sure the port_mux configuration is take effet
before configure a window that is moved from another VP.

Change-Id: I4ca581292e08ef30cc4b6eb47aef02e678f38a66
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-04-20 18:57:21 +08:00
Elaine Zhang
9cef538887 arm64: dts: rockchip: rk3568: add rockchip,clk-init for uboot
Change-Id: I6a8709a4263aa561bfd6f03f25230da05ca6d337
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-04-20 17:04:46 +08:00
Sandy Huang
fc05c4b821 drm/rockchip: rgb: attach CONNECTOR_ID prop to identify multi RGB
Change-Id: Idf2e6c3a90cc30747aa381d146b769700a70b1e6
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-04-20 16:54:04 +08:00