Commit Graph

863122 Commits

Author SHA1 Message Date
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
Sandy Huang
63d0fc6329 drm/rockchip: lvds: attach CONNECTOR_ID prop to identify multi LVDS
Change-Id: Ibd55eecb8ed74529249d60a665f81a6f114223e5
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-04-20 16:54:04 +08:00
Cliff Chen
533e2c6e8d ANDROID: fuse: fix deadlock for reply of FUSE_CANONICAL_PATH
There is a deadlock when the reply of FUSE_CANONICAL_PATH from user-
space client, because the kern_path function will issue a new request
and wait the respond from client which has been in wait state. The ba-
cktrace is like this:

<6>[  518.977731] ntfs-3g         S    0  2138      1 0x04000000
<4>[  518.977745] Call trace:
<4>[  518.977757]  __switch_to+0x130/0x13c
<4>[  518.977767]  __schedule+0x740/0x964
<4>[  518.977777]  schedule+0x70/0x90
<4>[  518.977794]  __fuse_request_send+0x1a0/0x340
<4>[  518.977808]  fuse_simple_request+0x178/0x1c8
<4>[  518.977818]  fuse_lookup_name+0xfc/0x220
<4>[  518.977829]  fuse_lookup+0x48/0x134
<4>[  518.977842]  __lookup_slow+0xc8/0x154
<4>[  518.977853]  walk_component+0x1c0/0x728
<4>[  518.977863]  path_lookupat+0xa8/0x208
<4>[  518.977875]  filename_lookup+0x8c/0x190
<4>[  518.977887]  kern_path+0x30/0x3c
<4>[  518.977901]  fuse_dev_do_write+0x79c/0x114c
<4>[  518.977914]  fuse_dev_write+0x60/0x84
<4>[  518.977928]  do_iter_readv_writev+0x11c/0x158
<4>[  518.977941]  do_iter_write+0x7c/0x1b8
<4>[  518.977953]  vfs_writev+0x84/0xe8
<4>[  518.977966]  do_writev+0x78/0x114
<4>[  518.977979]  __arm64_sys_writev+0x1c/0x24
<4>[  518.977992]  el0_svc_common+0x98/0x160
<4>[  518.978005]  el0_svc_handler+0x5c/0x64
<4>[  518.978015]  el0_svc+0x8/0xc

Fixes: fa199896a3 ("ANDROID: fuse: Add support for d_canonical_path")
Signed-off-by: Cliff Chen <cliff.chen@rock-chips.com>
Change-Id: I13487e5c956c4537c2554a44208d6664653ef4f1
2021-04-20 16:52:33 +08:00
Sandy Huang
002646ef28 drm/rockchip: cdn-dp: attach CONNECTOR_ID prop to identify multi DP
Change-Id: Id39c3b1c4ff6844c28460f86e8c21bbe6eb05935
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-04-20 15:46:04 +08:00
Sandy Huang
9d67606cc2 drm/rockchip: analogix_dp: attach CONNECTOR_ID prop to identify multi edp
Change-Id: I9ad434a1af4b5fe65dffdf54fc33c3585c41df6e
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-04-20 15:45:27 +08:00
Sandy Huang
96c68ee443 drm/bridge: analogix_dp: add support attach vendor private property
Introduce struct analogix_dp_property_ops in plat_data to attach vendor
connector property.

Change-Id: Ib95088954472300e3c493f9ff258ade3a5a9f592
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-04-20 15:45:27 +08:00
Jianqun Xu
a66ba52ea0 arm64: dts: rockchip: rk3568-android fix cma-default start from 256MB
Since the optee reserved start from 132M to about 16M, so fix the cma
default start from 256MB.

Change-Id: Ia6a0dd5922d2b308bc107e057fab967cdb7d0ab2
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-04-20 11:09:22 +08:00
Sandy Huang
3f33bcad2e drm/rockchip: dw-hdmi: attach CONNECTOR_ID prop to identify multi HDMI
Change-Id: I10efb880a050b5db54571f8041d5841ac368488d
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-04-19 21:24:47 +08:00
Sandy Huang
f9f57e8ab9 drm/rockchip: dsi: attach CONNECTOR_ID prop to identify multi DSI
Change-Id: I55ea379270047956a0a4e9a0f9545aaa89e68009
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-04-19 21:24:47 +08:00
Sandy Huang
52f94c72ea drm/rockchip: drv: create connector id for multi same connect
some platform have two same connector(HDMI/EDP/DP/DSI...), we add this
connector id to identify them, this info will be used by uboot, kernel and
other userapces.

Change-Id: If34bb99da1132703b8b19276ce63073dc57b130a
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-04-19 21:24:47 +08:00
Andy Yan
1b10d3af0a drm/rockchip: vop2: Change port_mux must make sure previous configuration is done
port_mux register is shared by all the three(four on rk3588)
video ports, and the config done vsync is controlled by
layer_sel_regdone_sel bits.

We must make sure the previous configuration is take
effect, when change port_mux for another vp.

Change-Id: Ic4bd58f52760080f2f264f37cc6f01a9cd58939f
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-04-19 20:40:38 +08:00
Andy Yan
27aecff097 drm/rockchip: vop2: wb cfg done also should read than write
wb cfg done bit may override vp config bits.

Change-Id: Ib315ab93fce5ba6d3dcdd635595a239a86e6e62f
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-04-19 20:40:24 +08:00
Andy Yan
b411afd0da drm/rockchip: vop2: counter vsync by writeback job
There maybe a case a new wb commit is commit when
the last wb has not completed, this may override
the fs_vsync_cnt.

So counter vsync for every wb job independently.

Change-Id: I8e8c527a49252dcc4b0b1ff591523de5a33ae5ba
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-04-19 20:40:02 +08:00
Allon Huang
5e6c2442e7 ARM: dts: rv1126: mipi csi host add cru rst
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I3cd48af1b26bba4e8ae23aa6a64b14420dc87de7
2021-04-19 20:38:36 +08:00
Allon Huang
01cb9a2eef media: platform: rockchip: cif: mipi csi host add cru rst
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I8ad52b91d9f01c29b6316999f6983bb04eb6433d
2021-04-19 20:37:32 +08:00
Allon Huang
2bbda8ef09 arm64: dts: rockchip: rk3568: mipi csi host add cru rst
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I0253d3b75b03ace77fdc16eb273fb193856c091f
2021-04-19 20:37:08 +08:00
Yu Qiaowei
5b995473e1 video/rockchip/rga: Fix the error of dst R2Y color space abnormality.
This commit must be updated when using im2d api.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I0cd8e53323f45c3410703f149587ea884cdbe624
2021-04-19 20:10:31 +08:00
Xing Zheng
96cb200321 ASoC: es7202: Fix the channels_max during the different macro ES7202_CHANNELS_MAX
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I4fa60f70aec0451b004b21022c6ee96db9e9419e
2021-04-19 20:09:50 +08:00
Xing Zheng
c7642a3dbc ASoC: es7202: Fix the muted capturing after reboot
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I375ed4ce368a6f94f302a9584a9bb02d444a89fa
2021-04-19 20:09:50 +08:00
Xing Zheng
2fc3a11f17 ASoC: es7202: Fix the missing the sound format of bit
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I49eb4a699572867e338c06f457ab0b0f7acdc6fa
2021-04-19 20:09:50 +08:00
Zorro Liu
b35ab171bb drm/rockchip: ebc_dev: pmic: tps65185: fix null point when tps probe
failed

[   10.939320] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000
[   10.940116] Mem abort info:
[   10.940373]   ESR = 0x86000006
[   10.940652]   Exception class = IABT (current EL), IL = 32 bits
[   10.941181]   SET = 0, FnV = 0
[   10.941458]   EA = 0, S1PTW = 0
[   10.941741] user pgtable: 4k pages, 39-bit VAs, pgdp = 00000000c7870e86
[   10.942328] [0000000000000000] pgd=0000000059e40003, pud=0000000059e40003, pmd=0000000000000000
[   10.943150] Internal error: Oops: 86000006 [#1] PREEMPT SMP
[   10.943656] Modules linked in:
[   10.943940] Process servicemanager (pid: 141, stack limit = 0x000000001d4803a1)
[   10.944585] CPU: 0 PID: 141 Comm: servicemanager Not tainted 4.19.172 #1156
[   10.945192] Hardware name: Rockchip RK3566 RK817 EINK LP4X Board (DT)
[   10.945754] pstate: 60400009 (nZCv daif +PAN -UAO)
[   10.946179] pc :           (null)
[   10.946496] lr : call_timer_fn+0x2c/0x1c0
[   10.946854] sp : ffffff8008003dd0
[   10.947155] x29: ffffff8008003dd0 x28: ffffff8009ca5000
[   10.947627] x27: ffffff80099a2000 x26: 0000000000000100
[   10.948099] x25: 0000000000000010 x24: ffffff8009cadb00
[   10.948571] x23: ffffff80099a1018 x22: 0000000000000100
[   10.949043] x21: 0000000000000000 x20: ffffffc05ca13320
[   10.949515] x19: ffffffc05ca13320 x18: 0000000000000000
[   10.949986] x17: 0000000000000000 x16: 0000000000000000
[   10.950458] x15: 0000000000000000 x14: 0000000000000000

Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I6bc332ac3f9904e95414f5769dc57dd742c8e7fc
2021-04-19 16:12:28 +08:00
Fenrir Lin
4c3e5e692a media: i2c: os04c10 modify MIPI_FREQ to 384M
Signed-off-by: Fenrir Lin <fenrir.lin@rock-chips.com>
Change-Id: Id8cd628c9034192ba4345b63700c9d420b545f8f
2021-04-19 14:44:33 +08:00
Weixin Zhou
af1b6e88fa regulator: fan53555: add fan53555 resume
Do suspend_enable in resume callback.

Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I6af64769a89376e9c09c70af1ac63861088be7c5
2021-04-19 14:36:04 +08:00
Ding Wei
cddfb35604 video: rockchip: mpp: printf session fix to %8p
Change-Id: Ide0b15ed64afe577bac48bbb60986dc6b11dbd2b
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-04-19 11:12:21 +08:00
Allon Huang
38eb6ffd7e media: platform: rockchip: cif: register cif itf dev when clear unready subdev
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Icc051ac055cbfea78305327ebe8554d2d0963dc4
2021-04-16 19:48:13 +08:00
Elaine Zhang
fe2055ef9f net: can: rockchip: fix up the CAN bus off
Fix up the rx\tx err cnt.
Support Auto Retransmission Mode.
Support rx frame clean.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ib5a226c975cb6cb4229f8a30995ce09740de749e
2021-04-16 17:59:15 +08:00
Cai YiWei
37230db7f7 media: rockchip: isp/ispp adjust probe order
isp hw device -> isp virtual device then
ispp hw device -> ispp virtual device

Change-Id: I7897f50c2323c2d57b0eb143a53423390d6d7d6c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-04-16 17:56:18 +08:00
Elaine Zhang
8fe15a6437 arm64: dts: rockchip: rk356x board: add init voltage for vdd_cpu
setting init voltage in uboot.

Change-Id: If1e23bb06790dcb3f9e4e9be4cc791cd394ca73a
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-04-16 16:47:27 +08:00
Zorro Liu
f28b44791a drm/rockchip: ebc_dev: release version v1.09
drop EPD_OVERLAY mode frames when overlay disabled

Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I74440212b09802b81b2dc37c189c791b0a21a176
2021-04-16 16:46:28 +08:00
Elaine Zhang
4992de490c arm64: dts: rockchip: rk3568: remove ARMCLK init frequency
Change-Id: I93888983b39acadfdb9ccbd94c3a61ff5a97f52f
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-04-16 14:56:11 +08:00
Fenrir Lin
b773c30f0d media: i2c: add camera driver os04c10
Signed-off-by: Fenrir Lin <fenrir.lin@rock-chips.com>
Change-Id: Ia23e6b5fb225ce48a200e4aa0dc5eba93f7c7e95
2021-04-16 14:43:27 +08:00
Andy Yan
87d02abf6e drm: debugfs: calculate image width by bpp
Not all RGB image is 4 byte per pixel, use bpp
to get the correct image width.

Change-Id: I8e40980a7f510afcfe9fd8f2a83eaa254f3b5b96
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-04-16 14:23:39 +08:00
Shawn Lin
2e01bfda9f mmc: dw_mmc-rockchip: Just set default sample value for legacy mode
.set_ios() is called from .resume() as well. For SDIO device which sets
keep-power-in-suspend, nothing should be changed after resuming, as well
as sample tuning value, since this value is tuned already. So we should
not overwrite it with the default value.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I18974f28d7a2253fd151817a5a3e4105c2e976b3
2021-04-16 09:52:21 +08:00
Zorro Liu
3b52c398d6 arm64: dts: rockchip: rk3566 eink: set sdio default sample phase to 90
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I69635ba3ec8456137bfc47de402b0bfc1c29a327
2021-04-15 18:54:25 +08:00
Tao Huang
a5e5db210c arm64: dts: rockchip: Fix the warnings caused by i2c_bus_reg
Fix the following warnings:
arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts:274.18-285.4:
ERROR (i2c_bus_reg): /i2c@fe5c0000/wacom@09: I2C bus unit address format error, expected "9"
arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts:551.18-562.4:
ERROR (i2c_bus_reg): /i2c@fe5b0000/wacom@09: I2C bus unit address format error, expected "9"
arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts:678.17-690.4:
ERROR (i2c_bus_reg): /i2c@fe5e0000/kxtj3@0e: I2C bus unit address format error, expected "e"
arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts:698.18-710.4:
ERROR (i2c_bus_reg): /i2c@fe5a0000/wacom@09: I2C bus unit address format error, expected "9"

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia116424ecbb3285d77274ef19b6b93ef5f0f1480
2021-04-15 18:54:25 +08:00
Zhenke Fan
ce99d23277 media: i2c: gc4c33 update init register array
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I39690784108651e2ea63cbcd71ac5215f60d9db7
2021-04-15 15:02:37 +08:00
Cai YiWei
a8838e1f75 media: rockchip: isp: add monitor to restart if abnormal
enable monitor:
add rockchip,restart-monitor-en to rkisp node on dts or
echo Y > /sys/module/video_rkisp/parameters/monitor
NOTE: shouldn't enable this when porting camera!!!

Change-Id: I35fa45488136e2e0ec16c4e6179a39f34cf5ebc9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-04-15 14:41:58 +08:00
Jon Lin
f90bf3cdf2 drivers: rkflash: Enable DLL tuning
1.Support after SFC ver 4
2.If the io rate is high than 100MHz, enable SFC delay line in
default
3.Get id byte as data pattern

Change-Id: Ia405771c0bc94eddaa45e1d85c7fa10a85c40531
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-04-15 09:53:41 +08:00
Jon Lin
b30f443cdf drivers: rkflash: Fix error in snor_resume
Change-Id: I18405c2c902e201e927049e9f876c9f5baf4ed62
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-04-15 09:53:41 +08:00
Cai YiWei
38b4421530 media: rockchip: cif: dma buf alloc limit to DMA32
Change-Id: I0974f59ba1cba4caf62d098c37ee2263fb481a5b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-04-15 09:44:05 +08:00