Commit Graph

1073841 Commits

Author SHA1 Message Date
Yiqing Zeng
8334ade617 media: i2c: sc3336 reset/pwd gpio should set low output by default for normal case
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I026cc9b6026d3641df861d60111d08369097fd59
2023-03-07 20:05:02 +08:00
Algea Cao
279b6f645c drm/bridge: synopsys: dw-hdmi-qp: Filter resolution that frequency less than 25 Mhz
RK3588 don't support pixel repetition function,
so resolution that frequency less than 25 Mhz
is unsupported.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I6c3f3af73738e5c96ef359abebbaf4884261c81e
2023-03-07 18:49:58 +08:00
Chandler Chen
868cbbf3b0 video: rockchip: mpp: rkvdec2: fix reset issue for link mode
for vdpu382 rkvdec, use soft reset first

Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
Change-Id: I99f369609f882eae9924f6ac59d3d6e5522004ad
2023-03-07 18:48:47 +08:00
Yandong Lin
9e961c37ec video: rockchip: mpp: add soft reset
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I769aa8cc187ac87dcb2068d56c8b0798b0f6adc3
2023-03-07 18:48:47 +08:00
Jianwei Fan
9ddeea6daf arm64: dts: rockchip: rk3562-evb2: add dual camera configuration
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I99f5d30a3424fe9cf3395e5e5f12fa6d8f34910d
2023-03-07 18:38:11 +08:00
Chandler Chen
2224a7421a video: rockchip: mpp: add iommu flush tlb before jpegdec run
Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
Change-Id: I3a17b812f12b3833d62b4ba82d77ef5b7da11144
2023-03-07 15:22:58 +08:00
Shawn Lin
15d9d94d2e PCI: rockchip: Fix compile error without CONFIG_PCIEASPM
drivers/pci/controller/dwc/pcie-dw-rockchip.c: In function 'rk_pcie_downstream_dev_to_d0':
drivers/pci/controller/dwc/pcie-dw-rockchip.c:2207:38: error: 'struct pci_dev' has no member naned 'l1ss'

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I67c0ed74183bc5bf7cb8975b8bcbcc4bebaa5ad5
2023-03-07 15:15:59 +08:00
Tony Xie
d58452d02a arm64: dts: rockchip: rk3562: add cpuidle node
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Change-Id: I14886e67165d87e0871b243aa53aba52b4ce1c48
2023-03-07 14:20:22 +08:00
Finley Xiao
3f303ef773 arm64: dts: rockchip: rk3562: add rktimer node
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Iebe1916d6971983c567c8e7248d12b465284475c
2023-03-07 14:19:47 +08:00
Wyon Bi
a5be0ba345 drm/bridge: maxim-max96745: Make lock GPIO optional
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I45f6469f98ab7cbbab3fb5d04aa6a9be03324422
2023-03-07 14:14:25 +08:00
Zefa Chen
964565ca62 media: i2c: ar0230 add delay up to 20ms after software reset
otherwise may write register fail

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: If9079e4840b1df81533db4f3d2d0d5a2806b6c0e
2023-03-07 09:13:15 +08:00
Tao Huang
3e16f28d5e ANDROID: clk: Enable writable debugfs files only if CONFIG_ANDROID_BINDER_IPC=y
Restore CLOCK_ALLOW_WRITE_DEBUGFS define when system is Linux
without Android runtime.

Fixes: 861a024589 ("ANDROID: clk: Enable writable debugfs files")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I7e5e8bade70191ceeca819dbbb45d84c687925c7
2023-03-06 14:22:16 +08:00
Binyuan Lan
4089e3ba56 arm64: dts: rockchip: rk3562-iotest: enable dsi and sdhci
Change-Id: I7414dd411307dbbcbd58fee57dfc6a57016a2c3e
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2023-03-06 14:20:23 +08:00
Wangqiang Guo
0036e5e728 arm64: dts: rockchip: rk3562-tablet: config DCDC_REG4 on in suspend.
Fixed Sleep Wake touch invalid.

Change-Id: Ia5b3935cf7c54685578f3913e3ac7a8e1ae7b7ab
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
2023-03-06 14:20:01 +08:00
Caesar Wang
632220ff9d arm64: dts: rockchip: rk3562-evb1-lp4x-v10: update vcc_sd regulator
Fixes the SD cards bootup and upgrade issues.

Change-Id: I5fef57e4966abbe6ebf582b9aab124290015dae1
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2023-03-06 14:18:07 +08:00
Chandler Chen
5afe9dd58f video: rockchip: mpp: disable irq during timeout reset
Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
Change-Id: Idb91a22e55f3eaedfebf23fd7780ed4014e0da98
2023-03-06 14:16:08 +08:00
Zhang Yubing
feaa0f093e drm/rockchip: dw-dp: fix alignment fault when memory copy
the dst is device memory, when accessing dst, it need alignment, use
memcpy_toio instead of memcpy.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: Ie761ac1660ef841b44bc835671b7f9bd6a0f66e4
2023-03-06 09:52:34 +08:00
Binyuan Lan
c4aebfded9 arm64: dts: rockchip: rk3562-test2: enable dsi
Change-Id: I810615f5c278096f3d5aff05a923e62e4b80c884
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2023-03-06 09:44:38 +08:00
Finley Xiao
8881354a16 arm64: dts: rockchip: rk3562: Add cooling devices
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I33d312dff628b78f3fee446b2f039ed869b77b1b
2023-03-04 18:59:23 +08:00
Finley Xiao
c800548c78 soc: rockchip: rockchip_system_monitor: Fix panic when devfreq is NULL
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I00c5fb9d4d68c2643b382ae40603f3bb25d9e0f5
2023-03-04 14:57:33 +08:00
Cai YiWei
e175652953 media: rockchip: isp1: pm_runtime_put change to sync
Change-Id: If6ff03a7aced3c2795b150b5b807e31f521031c1
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-03-03 18:37:55 +08:00
Chandler Chen
fe52018169 arm64: dts: rockchip: rk3562: add shootdown-entire for vcodec mmu
Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
Change-Id: I5631a0d7376bfaca08ec99e40affced7e2cc2574
2023-03-03 11:48:47 +08:00
Jianwei Zheng
994f4d2c33 ARM: dts: rockchip: add usb2phy node for rk3036
This patch add usb2phy node for rk3036.

Signed-off-by: Jianwei Zheng <jianwei.zheng@rock-chips.com>
Change-Id: Icf21cb73d125876b507b18e768f9ff652c1a720e
2023-03-03 11:44:54 +08:00
Sugar Zhang
6026cf7136 ASoC: rockchip: multicodecs: Fix potential NULL point reference
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I43399292c8f242e98139cb8e285f5bc732889894
2023-03-03 11:30:20 +08:00
Sugar Zhang
b4652bb42b ASoC: rockchip: hdmi: Fix potential NULL point reference
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I9d0c2adbdffc268d88bac31c1db31507fd82661d
2023-03-03 11:30:20 +08:00
Cai YiWei
3a15fce889 phy: rockchip: fix build warning
Change-Id: Ibc3998b3b624e51463dd5e0746839bbd31cb0158
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-03-03 10:55:56 +08:00
Cai YiWei
37c278bce0 media: rockchip: fix isp and cif build warning
Change-Id: I6924f6a833679c945fe0469efa07b66b28440edc
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-03-03 10:04:12 +08:00
Jianqun Xu
9b6c6fdc27 rknpu: make rknpu_mem_sync_ioctl to use dma apis
Before this patch, the rknpu mem uses the partial sync ops from dmabuf,
which is not upstream patch. this patch makes the sync ioctl to use dma
apis directly.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Id648f567af86a36459d10e96db2aec2cd4177fce
2023-03-02 18:12:40 +08:00
Wyon Bi
aabe565c15 drm/rockchip: vop2: Fix dual channel setup
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ica99e16464d414535d151b80cbc1fc5cba0c2a1a
2023-03-02 18:11:04 +08:00
Su Yuefu
8d67eb0d2e ARM: configs: rv1106-cvr: add A/D Converter compilation to use AHD sensor
Signed-off-by: Su Yuefu <yuefu.su@rock-chips.com>
Change-Id: I3ac3dfc10513772e89fd5047f134eb97471cf146
2023-03-02 18:10:48 +08:00
Su Yuefu
322ab30e47 ARM: dts: rockchip: support tp2855 and sc530ai for rv1106-evb-cvr-dual-cam.dtsi
based on rv1106g-evb1-v11-cvr.dts

Signed-off-by: Su Yuefu <yuefu.su@rock-chips.com>
Change-Id: I5e65e1ff7bc63838fa59cecd0f3c60634fbe8ac3
2023-03-02 16:55:27 +08:00
Jianqun Xu
3c65f6f3c3 video: rockchip: mpp: fix dma buf sync start dma address
Locate the start dma address with the dma address from the first sg and
the offset, since the sg_dma_address for the other sg will return a
invalid mapping address (-1).

Unable to handle kernel paging request at virtual address ffffff8000000000
Mem abort info:
  ESR = 0x96000146
  EC = 0x25: DABT (current EL), IL = 32 bits
  SET = 0, FnV = 0
  EA = 0, S1PTW = 0
Data abort info:
  ISV = 0, ISS = 0x00000146
  CM = 1, WnR = 1
swapper pgtable: 4k pages, 39-bit VAs, pgdp=0000000001caa000
[ffffff8000000000] pgd=000000007fffb003, p4d=000000007fffb003, pud=000000007fffb003, pmd=0000000000000000
Internal error: Oops: 96000146 [#1] PREEMPT SMP
Modules linked in: rk_vcodec [last unloaded: rk_vcodec]
CPU: 0 PID: 2173 Comm: mpp_mjpege_217 Not tainted 5.10.110 #389
Hardware name: Rockchip PX30 mini evb ddr3 board (DT)
pstate: 80400005 (Nzcv daif +PAN -UAO -TCO BTYPE=--)
pc : __clean_dcache_area_poc+0x20/0x38
lr : arch_sync_dma_for_device+0x20/0x2c
sp : ffffffc0136fbb90
x29: ffffffc0136fbb90 x28: 000000000000026f
x27: 0000000000000000 x26: ffffff805fa22c00
x25: 0000000000000000 x24: ffffff8045543800
x23: 0000000000100000 x22: 0000000000000000
x21: 0000000041100000 x20: 000000000000026f
x19: 0000000000000001 x18: ffffffc012139060
x17: 0000000000000000 x16: 00000000000000c0
x15: 0000000000000004 x14: 0000000000003fff
x13: ffffffc011c8c7f0 x12: 0000000000000000
x11: 0000000000000000 x10: 0000000000000001
x9 : 0000000100000000 x8 : 0000000000000000
x7 : 7320302074657366 x6 : ffffffc011e764a0
x5 : ffffffffffffffff x4 : 0000000000000000
x3 : 000000000000003f x2 : 0000000000000040
x1 : ffffff800000026f x0 : ffffff8000000000
Call trace:
 __clean_dcache_area_poc+0x20/0x38
 iommu_dma_sync_single_for_device+0x40/0x54
 dma_sync_single_for_device+0x2c/0xe8
 mpp_dma_buf_sync+0x138/0x184 [rk_vcodec]
 vepu_alloc_task+0x2a0/0x390 [rk_vcodec]
 mpp_process_task_default+0x5c/0x218 [rk_vcodec]
 mpp_dev_ioctl+0x39c/0x5e0 [rk_vcodec]
 __arm64_compat_sys_ioctl+0x104/0x158
 el0_svc_common+0xac/0x1ac
 do_el0_svc_compat+0x1c/0x28
 el0_svc_compat+0x10/0x1c
 el0_sync_compat_handler+0x60/0x8c
 el0_sync_compat+0x164/0x180

Fixes: 3fb2e28edd ("video: rockchip: mpp: change the way to refresh the dma cache")
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I7d9fc844df602e38ee8fa0e303a0e251a58b072a
2023-03-02 16:52:06 +08:00
Tao Huang
b3cfdcd677 Revert "ARM64: defconfig: add the basic config for 3399 ChromeOS"
This reverts commit 5ce147aff1.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4c868a4bc277d1d4f93556061bb707fd0a0027b6
2023-03-02 15:49:46 +08:00
Su Yuefu
5ac9e8096d media: i2c: support techpoint driver
Signed-off-by: Su Yuefu <yuefu.su@rock-chips.com>
Change-Id: Ia579416e730ae7da65d614d35997683a3caf1bd7
2023-03-02 15:35:57 +08:00
Simon Xue
fa6dbf5e59 iommu/rockchip: Backport from UPSTREAM linux-5.15
Change-Id: I110dbe10b49d6e61a7e48a0f85864389641526de
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2023-03-02 15:15:01 +08:00
Jason Zhu
205c5a8113 ASoC: codecs: rk_dsm: clean up code
Delete unused definition and modify the error register definition.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I255c17049bc28faf108dbca8ec0337d3ccb11555
2023-03-02 14:51:21 +08:00
Jason Zhu
df50198904 ASoC: codecs: rk_dsm: fix channel disorder
The dsm sound may be channel disorder when play sometimes,
we can reset the rk_dsm to reconfigure the IP and make it
work well.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Iece70267c478c0ec60f685ab85e39ff365b16f4c
2023-03-02 14:51:21 +08:00
Yiqing Zeng
2566a239df ARM: dts: rockchip: add rv1106g-evb1-v11-dual-cam dts
based on rv1106g-evb1-v10-dual-cam.dts

Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: Ib4cced42d19af4af43c13ba95386910a57f24304
2023-03-02 14:46:11 +08:00
Sugar Zhang
24fd898a83 ASoC: rockchip: i2s: Add support for clk compensation
This patch introduces a method to handle clk drift and compensation.

e.g:

/# amixer contents
numid=1,iface=PCM,name='PCM Clk Compensation In PPM'
; type=INTEGER,access=rw------,values=1,min=-1000,max=1000,step=1
: values=0

/# arecord -D hw:0,0 --period-size=1024 --buffer-size=4096 -r
16000 -c 2 -f s16_le /dev/zero &

/# amixer -- cset numid=1 -10
numid=1,iface=PCM,name='PCM Clk Compensation In PPM'
; type=INTEGER,access=rw------,values=1,min=-1000,max=1000,step=1
: values=-10

/# amixer -- cset numid=1 10
numid=1,iface=PCM,name='PCM Clk Compensation In PPM'
; type=INTEGER,access=rw------,values=1,min=-1000,max=1000,step=1
: values=10

Change-Id: I6be8d7275ccf985f43ebc2980ce284c83504ddbc
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2023-03-02 10:04:58 +08:00
Yu Qiaowei
d1e360f3b0 video: rockchip: rga3: fix timeout not returning error code
Update driver version to 1.2.25

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I718ccbbe3512de3194b5a5b4da549971b3999d14
2023-03-02 09:34:37 +08:00
Yu Qiaowei
bfcf44d74a video: rockchip: rga3: clean timeout job before matching scheduler
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I3f476ac2b519953a290587bb7399c68153a5bae3
2023-03-02 09:34:37 +08:00
Yu Qiaowei
7f9bf911cd video: rockchip: rga3: fix abort when virt_addr is free
Physically contiguous virt_addr needs to add the offset of the first
page when obtaining the phys_addr.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I8076ad2aac31ad61d8a5e0d4332fe69f702d2adb
2023-03-02 09:34:37 +08:00
Yu Qiaowei
2c2f6687dc video: rockchip: rga3: improve the resolution limitation of VSP
When the horizontal input exceeds 2k (here refers to 1996), need to switch
from BI-cubic to BI-linear. When there is an HSD(horizontal scale down),
need to check the horizontal input after the HSD.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I3e4ceeb0e85811ccb131c22fe77ebaa571b8a922
2023-03-02 09:34:37 +08:00
Yu Qiaowei
e16186b552 video: rockchip: rga3: fix the exception of acquire fence
Modify recognition that acquire_fence has been signaled

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Id7d9ba288dae05b8c50ebb2090e3aa7ae8b61671
2023-03-02 09:34:37 +08:00
Elaine Zhang
28822b16c6 thermal: rockchip: The temperature ranges from -60 to 180°C
-40 to 125°C reliable, outside the range existed unreliability.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I7f24809bd7a4aa89a7fa12763081258468281fee
2023-03-02 09:32:24 +08:00
Jianwei Zheng
b80051be40 phy: rockchip: inno-usb2: change HS disconnect detect mode for RV1106
This patch set HS disconnect detect mode to single ended detect mode
for RV1106, fix RV1106 can not recognize device plug out sometimes.

Signed-off-by: Jianwei Zheng <jianwei.zheng@rock-chips.com>
Change-Id: I6ee6ded4cc12032cf2825eadd207c1e5003957cd
2023-03-01 17:29:16 +08:00
Yiqing Zeng
f368f6b087 ARM: rv1106-evb.config: enable CONFIG_VIDEO_GC2053
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I67865797e830f991b37b30b7bc9eb974cf9ec3db
2023-03-01 16:56:59 +08:00
Yiqing Zeng
f1238c6c04 ARM: dts: rockchip: support dual gc2053 for rv1106-evb-dual-cam.dtsi
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: If236dcd35e77583ca106f788f627d5d9279d4d4d
2023-03-01 16:53:53 +08:00
Damon Ding
7a06461290 drm/rockchip: vop2: remove the version check in core_dclk_div setting
Fixes: f8882d308d94("drm/rockchip: vop2: fix the core_dclk_div_sel setting")
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I46b402035e8ab3cb76a1adea0c2393a17e633e5a
2023-03-01 16:52:54 +08:00
Caesar Wang
c55b5512e8 arm64: dts: rockchip: add rk3562-iotest-lp3-v10-linux.dts
Change-Id: I784aa391ca03b9d511919daa1b601a2564b94f1a
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2023-03-01 16:51:48 +08:00