Commit Graph

1061039 Commits

Author SHA1 Message Date
Damon Ding
3a84f255cd arm64: dts: rockchip: rk3588: add support for BT656
add dts file:
	rk3588s-evb3-lp4x-v10-rk630-bt656-to-cvbs.dts

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I82e7bf46ed0c6c0a3a35c9528a026d24bf2cfc43
2021-11-22 21:19:12 +08:00
Damon Ding
48801131ab arm64: dts: rockchip: rk3588: add support for BT1120
add dts file:
	rk3588s-evb3-lp4x-v10-sii9022-bt1120-to-hdmi.dts

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I985b763ccaecc6aa94010da92bbad962b1562a45
2021-11-22 21:17:23 +08:00
Damon Ding
1ed78e4f4e arm64: dts: rockchip: rk3588: add pinctrl of bt656 mode
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Ia659d2b486aa31fd36fc04c971620894e9db1d7e
2021-11-22 21:16:22 +08:00
Tao Huang
749c4a0479 arm64: rockchip_defconfig: Remove CONFIG_TYPEC
Remove CONFIG_TYPEC which is selected by CONFIG_PHY_ROCKCHIP_USBDP.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I50cc3b7dd9659372fc46d4cb1bfea18fea3cca0c
2021-11-22 20:17:56 +08:00
Alex Zhao
23daad7340 arm64: dts: rockchip: add WIFI/BT/Ethernet for rk3588 evb3
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: Iae3395967ba0a71724fa959c1f3a1085927a130e
2021-11-22 20:14:04 +08:00
Tao Huang
a8c903523a arm64: rockchip_gki.config: Enable CONFIG_ROCKCHIP_MULTI_RGA
-CONFIG_ROCKCHIP_RGA2=m

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4ba3733fbcc1af0166208eb686b62df029959daf
2021-11-22 19:58:14 +08:00
Tao Huang
b9f76e7405 arm64: rockchip_gki.config: Enable CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX_HDMI
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic862bc1839830e3b0f6c9b22c009e8534e5e53b2
2021-11-22 19:52:06 +08:00
Kever Yang
e5dba42181 arm64: dts: rockchip: rk3588-evb4: Enable power for clk buffer chip
rk3588 has two pcie3.0 phy which need two way reference clock, and the
PCIe slot only have one way clock input, so it need a clock buffer chip
to output two way clock to rk3588. Enable the power when it's boot on.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Change-Id: Ie65323ecd2a2e210d95405cce4db1a37c2113f51
2021-11-22 18:55:20 +08:00
Tao Huang
d7dc349edc arm64: rockchip_gki.config: Enable CONFIG_AP6XXX and CONFIG_WL_ROCKCHIP
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5ea4991a5376bffbaf53f930b501bbcb0358fc45
2021-11-22 18:29:29 +08:00
Tao Huang
57ba9810b3 arm64: rockchip_gki.config: Enable CONFIG_ROCKCHIP_DW_DP
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I50d9da5839b161e13528e0040a218d9c59bc8124
2021-11-22 18:16:18 +08:00
Tao Huang
8e6c4c23bc arm64: rockchip_gki.config: Enable CONFIG_ARM_SMMU_V3
There are two MMU600 instances in RK3588.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I63242fc5ed001c3c46956e8ce5695b7c33350e9b
2021-11-22 17:56:20 +08:00
Tao Huang
7ce7cb6b20 include/uapi/linux/rk_vcm_head.h: do not leak CONFIG_COMPAT to userspace
error: include/uapi/linux/rk_vcm_head.h: leak CONFIG_COMPAT to user-space

Fixes: 3c60ce2725 ("media: move rk_vcm_head.h from drivers/media/i2c/ to include/uapi/linux/")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I64a4ef35c25fd11997689575059ae0b7ee90369a
2021-11-22 17:43:53 +08:00
Shawn Lin
ebe7656936 mmc: sdhci-of-dwcmshc: Add more clk management for runtime PM
core clk should be alive for DLL to work properlly, but we can
set it to 24MHz to save power. And other bulk clks can be closed
too.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I402ae1e8ca8cd00f33e8bbdeaa89e41546f954ff
2021-11-22 17:34:34 +08:00
Liang Chen
0cc6d6bfb2 arm64: dts: rockchip: rk3588: delete RK3588_PD_NVM
RK3588_PD_NVM need keep always on for emmc.

Change-Id: Ia96894eb4bf640799893c3ae68ac68ed15ea989d
Signed-off-by: Liang Chen <cl@rock-chips.com>
2021-11-22 17:24:14 +08:00
Li Huang
8ca0b5936e video/rockchip: rga3: Init version 1.1.1
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: Ib19d2d141e6b0eefa9d67b062e564559f58fb0b4
2021-11-22 17:18:58 +08:00
Li Huang
cae208fa6f arm64: dts: rockchip: rk3588-nvr.dtsi: Enable rga node
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: Ieb2850dd5cab6a1bf23278c6cf434610434d49b3
2021-11-22 17:18:58 +08:00
Li Huang
85f8bf3ea3 arm64: dts: rockchip: rk3588-evb.dtsi: Enable rga node
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I33021a89e5f7206168600cae44210d361b348f4a
2021-11-22 17:18:58 +08:00
Li Huang
282ab28b4a arm64: dts: rockchip: rk3588: Add multicore rga node
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: If1b2198132bfd53aff65d483381ee7d63d5d727f
2021-11-22 17:18:58 +08:00
Li Huang
df9e86a527 arm64: rockchip_defconfig: Enable CONFIG_ROCKCHIP_MULTI_RGA
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I95fbef30eb87fc69379cfce7feb976bfc261ab8c
2021-11-22 17:18:58 +08:00
Li Huang
9a683ef131 arm64: rockchip_linux_defconfig: Enable CONFIG_ROCKCHIP_MULTI_RGA
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I59ee04e134f22131acd697c532c2a62ae53d27c2
2021-11-22 17:18:58 +08:00
Wyon Bi
c2cce53ab0 drm/rockchip: dw-dp: Add support for split mode
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I707d1a84d232562338b2676a7037dc0d6ec49be4
2021-11-22 17:07:39 +08:00
Wyon Bi
3cc26c4bbc drm/rockchip: drv: Add helper function drm_mode_convert_to_{split,origin}_mode()
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I1a40d0d296c5e82cc5d40378af002132d9949e04
2021-11-22 17:07:39 +08:00
Wang Jie
7cba838b19 arm64: dts: rockchip: rk3588s-tablet: configure sink pdos
Configure the supported voltage/current list in the
tablet as a sink to realize PD fast charging.

The maximum charging voltage and current depend on
the charger ic and rk3588s tablet. Taking into
account the stable operation of the tablet, the
software is limited to a maximum voltage of 12v
and a maximum current of 3A.

Change-Id: I5c707e58434ecbe477a650beb7211535ca7c83d4
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
2021-11-22 16:57:47 +08:00
Wang Jie
0da78695ed arm64: dts: rockchip: rk3588s-tablet: revert peripheral dr_mode for usbotg0
Change-Id: I4f9bc2114b13891178154c6cdedbb5c75181ebb3
Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
2021-11-22 16:57:16 +08:00
Ding Wei
dd1bea4b76 video: rockchip: mpp: move session->wait to task->wait
reason:
1. If the task in the session is assigned to two different cores, the
task in the back may complete first and trigger the wait signal of the
session.
2. In the wait thread, it is taken according to the pending list order,
and the previous task will be triggered, and it must not be found in
the list.
3. For the above reasons, put the wait signal into the task and monitor
the wait signal of the task according to the pending order, then the
order will not be wrong.
4. According to this method, done_list can also be unnecessary.

relative log:
session 000000003edbfbaa task 00000000207419c6, not found in done list!
session 000000003edbfbaa task 000000006a0597ed, not found in done list!
session 000000003edbfbaa task 00000000fe35cb90, not found in done list!
session 000000003edbfbaa task 000000001638cf87, not found in done list!
session 000000003edbfbaa task 00000000a2ba5976, not found in done list!

Change-Id: I2ab6c98162cc4b71ef34cbcda0bc30434fecdb5d
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-11-22 16:21:11 +08:00
Wyon Bi
eb9ef7a3a0 drm/rockchip: vop2: Fix K value for DP split mode
K should be 2 for all connector in dual channel mode.
YUV420 output is not supported at dual channel mode.

Change-Id: I03e5147304ad494a3617acc0ba9acafb374088eb
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-11-22 16:15:55 +08:00
Zefa Chen
c5bec83187 media: rockchip: rkcif fixed bug of enable dma capture
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I9fa84cb17a9288ca46c76527e0c9f3f4cb715d53
2021-11-22 16:08:57 +08:00
Lin Jinhan
6c157a9ba2 crypto: rockchip: move algs private data from rk_crypto_dev
Algos private data should store in tfm's ctx field to avoid
modify by other algos while calculating.

Change-Id: I1c77e408e3374c697849ec508323131bf5f488b2
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2021-11-22 16:05:26 +08:00
Lin Jinhan
a26979bf63 crypto: rockchip: optimize the coding style
Rename some struct name and variable name been more clearly.

Change-Id: Icf5e6f9d1a7e3f4abfbe05b3fb0034651a120039
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2021-11-22 16:05:26 +08:00
Lin Jinhan
2ab2181d46 crypto: rockchip: add rk3568 support
Change-Id: Ie83dc798cd584d74d9e9b068af17518596ac82dc
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2021-11-22 16:05:26 +08:00
Lin Jinhan
31bd563fc7 crypto: rockchip: mask lock_step error int flag
lock_step will accidentally triggered sometimes.

Change-Id: I401c662d515cf17e6c89dfb2dfa4b33b6866b8a5
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2021-11-22 16:05:26 +08:00
Lin Jinhan
e2fb7bc2c3 crypto: rockchip: v2 fix bug calculations stuck when buffer not align
Data will divide into multi parts to calculating while buffer not
aligned, and crypto BC_CTL/HASH_CTL only be initialized at first
time. Crypto module will be stuck at second calculations if
BC_CTL/HASH_CTL is cleared after every calculations.

Change-Id: I753c4cefbcefcbf38f36f9a6798f406979b4d17d
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2021-11-22 16:05:26 +08:00
shengfei Xu
acd264533a regulator: rk806: fix up the regulator_is_enabled return error
Use rk806_regulator_is_enabled_regmap() to replace regulator_is_enabled_regmap().

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: Ia6aae397ffcbfd7dbd7f45d3defa8544be32e6ad
2021-11-22 15:52:06 +08:00
shengfei Xu
842c51cac6 regulator: rk806: fix the dcdc/ldo usager counter unbalance
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: Iea2fe117f9958cbd2a693ea44f477d4d97a555a6
2021-11-22 15:52:06 +08:00
Zefa Chen
9372704d34 arm64: dts: rockchip: rk3588: modify mipi dcphy address for rx/tx
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Id4f5a818bcdd0342701c6ff281b8c90fbf31e52f
2021-11-22 15:05:51 +08:00
Zefa Chen
251993053c phy: rockchip: csi2-dphy: add reg to wait 200us for rx pin ready
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I1e6e6db908a8747b1ff7f7b2db4339a84540a067
2021-11-22 15:01:00 +08:00
Zefa Chen
b828aa9bda phy: rockchip: csi2-dphy: separate tx/rx register region
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I84bce018d735a9c7dcabba1e992c9f7e030337d1
2021-11-22 14:59:04 +08:00
Zefa Chen
07c209eca1 media: i2c: ov50c40 4096x3072@15fps close skew output
when date rate < 1.5Gbps/lane, needn't deskew

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic4ffcf5ee4240378d38508952c178032ceba77e3
2021-11-22 14:55:42 +08:00
Zefa Chen
6d76556cff media: i2c: imx464 fixed some issue
1.add delay after power on
2.limit resolution to 2560x1520

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: If61f487f8633b4273a839c33562a28409c7d2497
2021-11-22 14:55:11 +08:00
Cai YiWei
8d1a2204df media: rockchip: isp: add isp30 debug to procfs
Change-Id: I286f8911a8d1976031cb5e7bff75ffaebaaf4acb
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-22 14:15:26 +08:00
Simon Xue
2496c014e1 arm64: dts: rockchip: rk3588s: add php_grf for PCIe
Change-Id: I52e9f49b85f3881d654e727c2299c6dc31fd9530
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-11-22 11:33:17 +08:00
Simon Xue
f52f348039 arm64: dts: rockchip: rk3588: add php_grf for PCIe
Change-Id: Id3dee374794c41be59db088016702e420b1223be
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-11-22 11:33:17 +08:00
Cai YiWei
9b603198a7 media: rockchip: isp: bigmode by max width and size for isp30
bigmode depend on width > 2688 or size > 2688x1536.
cac mesh buf0 apply to no bigmode, buf1 apply to bigmode.

Change-Id: Iba8120e2076e8677ba176080adf587ab9575ab30
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-22 10:53:58 +08:00
Cai YiWei
789b662b47 media: rockchip: isp: fix rawhist weight config error for multi deivce
rawhist weight reg will be automatically incremented by each write.

Change-Id: I531d8a03dda804039237d3400d77127b070c11e9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-22 10:53:23 +08:00
Cai YiWei
8c8d544883 media: rockchip: isp: fix ynr/cnr/baynr reg config
reg write and readback is shoadow, no effective immediately,
so change to get reg ddr value.

Change-Id: I2a13551617f944870dd71bcec666ee8067757cdf
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-22 10:51:12 +08:00
Cai YiWei
8230e776cd media: rockchip: isp: fix first params config two times for readback mode
Change-Id: Ia6209e60fc75a039ca06d1aa0d5d64e4c9515b9e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-11-22 10:51:12 +08:00
Elaine Zhang
dde2f927c2 clk: rockchip: rk3588: support npll/aupll/v0pll power down by auto
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ida2f113f6989eb9db9d97522514299d4660bbb69
2021-11-22 10:41:33 +08:00
Wyon Bi
4074c7cc38 arm64: dts: rockchip: Add RK3588 EVB2 LP4 V10 eDP Board
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ie3896cf8981a2246f188a6f4411d9acc49f290cb
2021-11-22 09:20:51 +08:00
Algea Cao
9dce04812e drm/rockchip: vop2: Only do clk_round_rate check when dclk <= max_dclk in vop2_crtc_mode_valid
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Iec81ed9e4ca9bb253ee65b4a92d788b7f88077b3
2021-11-21 16:55:45 +08:00
Guochun Huang
5a24f1e34c arm64: dts: rockchip: rk3588-evb2: fix backlight pwm pinctrl
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I6a98544290d14e371b60e00e2588b29d554eb604
2021-11-21 16:12:31 +08:00