Commit Graph

1061359 Commits

Author SHA1 Message Date
Jianqun Xu
a8159b8a03 arm64: dts: rockchip: rk3588s: add rockchip,shootdown-entire for vop mmu
Add "rockchip,shootdown-entire" for vop mmu to decrease map time cost.

Depends on commit (30eb2be25b iommu/rockchip: Add shootdown_entire prop)

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I5940f31efb8998449aa2ebc423245edea1ca9823
2021-12-09 10:55:08 +08:00
Cai YiWei
8e47c07ff3 media: rockchip: isp: support stream crop for unite isp
Change-Id: If6a15c8bbe2314e7e20d0498fca23797a18d5acd
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-12-08 18:41:35 +08:00
Sandy Huang
625ff3fefb drm/rockchip: vop2: gamma add support 8k
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I913ce7ec5a2f6486515ce2356051088b2934c205
2021-12-08 18:37:14 +08:00
Sandy Huang
696cf91c28 drm/rockchip: vop2: bcsh add support 8k
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I2ff73d12b9d6100c5bbfb96229166800841356ac
2021-12-08 18:37:14 +08:00
Sandy Huang
4dad387418 drm/rockchip: vop2: cubic lut add support 8k
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I222a734ae68d134bc52526530e008874b8e07a5b
2021-12-08 18:37:14 +08:00
Sandy Huang
30f24f27ba drm/rockchip: vop2: update axi rid
after this commit, axi id is used as the following rules:
AXI0
    Cluster0:
	win0: 0x2,0x3
	win1: 0x4,0x5
    Cluster1:
	win0: 0x6,0x7
	win1: 0x8,0x9
    Esmart0: 0xa, 0xb
    Esmart1: 0xc, 0xd
    Lut: 0xe[for vp0/2, will be used at different time]

AXI1:
    Cluter2:
	win0: 0x2,0x3
	win1: 0x4,0x5
    Cluster3:
	win0: 0x6,0x7
	win1: 0x8,0x9
    Esmart2: 0xa,0xb
    Esmart3: 0xc, 0xd
    Lut: 0x1[for vp1]

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Iae865835e49ba8ca0197b0f015d7709cba23e8b3
2021-12-08 18:37:14 +08:00
Li Huang
1c9109c675 video: rockchip: rga3: Update version to 1.1.6
Organize the code, separate rga_job_assign to rga_policy.c

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: Ie84cd14db23fba35db2da7c77edecb5b5bcc621b
2021-12-08 18:16:33 +08:00
Li Huang
37f6035a12 video: rockchip: rga3: Modify the judgment of the return value of the func
for wait_event_interruptible_timeout

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I762f5dde14a3ce42e5642f07ef5249bf4492c038
2021-12-08 18:14:20 +08:00
Li Huang
73b3051bda video: rockchip: rga3: Fixup crash on rga_job_done
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I0598cf3394673a3475b1fe6bb8a3a2ada00d1217
2021-12-08 17:28:34 +08:00
Li Huang
c03ef5068c video: rockchip: rga3: Add timeout clean job func for async mode
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: Ice2632589b1f4325f277ecf73083b273cd554cae
2021-12-08 17:28:34 +08:00
Tao Huang
b546b08916 media: rockchip: ispp: Make rkispp_module_work_event() static
drivers/media/platform/rockchip/ispp/stream_v20.c:322:6: warning:
no previous prototype for 'rkispp_module_work_eventa' [-Wmissing-prototypes]

Fixes: 014edf4b88 ("media: rockchip: ispp: add the stream_v20")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I349eec3c3338541e3444f50a4c686f0dfc81c542
2021-12-08 16:18:44 +08:00
Lin Jinhan
fe7d34ae0c crypto: rockchip: core: fix memory leak in remove
addr_vir contains several pages, therefore must to
 use free_pages instead of free_page to free memory.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: Icb65f569674b31bb2a6c62f693a2968f24d709a6
2021-12-08 16:09:07 +08:00
Cai YiWei
9c58b30813 media: rockchip: isp: fix multi stream mpfbc reg config error
Change-Id: Ie5e6f1787da804b78b6a793621fc17aea0fe57ec
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-12-08 16:00:41 +08:00
Jon Lin
8263003c28 phy: rockchip: naneng-combphy: Add config for rk3588 pcie
This patch aims to configure pcie for better compatibility.
1.PLL LPF C1 85pf R1 1.25kohm
2.ck100m_pcie from PLL

Change-Id: I5115cf6ce7341c0891f13639f2c59db86ae9014b
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-12-08 15:31:37 +08:00
Alex Zhao
b48a277602 arm64: dts: rockchip: add WIFI/BT for rk3588s evb1
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: Ifa836565dc7c7c1ef5a29e043d3289ca4a624e8b
2021-12-08 15:02:32 +08:00
Algea Cao
b53d1f9467 drm/rockchip: dw_hdmi: Support 8K HDMI output
Support hdmi frl mode and dsc function.
Support max 8K-60Hz RGB 10bit output.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ibc2d48e2b25bc94e4be7ffa9703c400436bdee36
2021-12-08 11:26:13 +08:00
Algea Cao
857aaf9db3 phy: rockchip-samsung-hdptx-hdmi: Support 8K HDMI output
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ie4f85eda98e76466295e53613cc93646501c3bca
2021-12-08 11:24:47 +08:00
Algea Cao
02dbed2fbb drm/rockchip: drv: Don't parse DSC information when the VSDB does not contain the DSC block
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I685fea28613e2538657074ac2ee8c8d4b2667cd3
2021-12-08 11:22:47 +08:00
Algea Cao
a771ef8592 drm/rockchip: dw_hdmi: Attach rk3588 hdmi properties
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I9520b410f1dafa6a765a2341e244568ea78700ba
2021-12-08 11:22:47 +08:00
Jiajian Wu
3d1d563366 arm64: dts: rockchip: rk3588-evb: use "rockchip,hdmi" instead of "simple-audio-card"
Used to support jack detection events

Signed-off-by: Jiajian Wu <jair.wu@rock-chips.com>
Change-Id: Iaed309dc32686901185667a9c3c8cc3589fe1543
2021-12-08 11:20:31 +08:00
Cai YiWei
5b5c996628 Revert "media: rockchip: isp: raw data dma read/write default to burst16*4"
This reverts commit dd7a2a2505.

Signed-off-by: Cai YiWei <cyw@rock-chips.com>
Change-Id: I84c189c21d538e94ba403ed84db0ee6fcf971567
2021-12-08 11:14:08 +08:00
Xing Zheng
32f68af611 ASoC: rk3308_codec: Decoupling and dependence on the JACK of rk3308 codec
Don't need to direct callback via rk3308 jack detect, since
the sound component supports to set jack.

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: Ibdf86d06f69bd0a8885de753f632236b43b5800c
2021-12-08 10:49:30 +08:00
XiaoTan Luo
1273641575 ASoC: rockchip: multicodecs: add gpio/adc jack for detecting headphone && headset mic
Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: Ide67943515ecafd348fa224132699caa5bd170ea
2021-12-08 09:58:25 +08:00
Yifeng Zhao
bed242ece6 mmc: sdhci-of-dwcmshc: fix some config for rk3588
1. Disable interface clock at initial state.
2. Set the default tx dll tap value to 0xA for hs400.
3. Configure the parameters of enhanced strobe before enable HS400ES.
4. Set the default cmd dll tap value to 0x8.

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I82f09c4d5f5f3b79f71b61fbe62eec6e8d6a7230
2021-12-07 20:09:54 +08:00
Yifeng Zhao
e1f0e15a08 ATA: ahci_platform: enable FBS for RK3588
Because the CAP parameters of AHCI are incorrect, FBS cannot
be started automatically and needs to be configured manually.
This configuration can improve the read-write performance
when connecting multiple SATA hard disks through the PM chip.

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I66ff92dce1711e3d189801c8caa3219217a50dda
2021-12-07 20:09:54 +08:00
Yifeng Zhao
123a258793 arm64: dts: rockchip: rk3588: Add compatible for sata
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: Icbd198976183743210eb34df448a49a38d17e5d5
2021-12-07 20:09:54 +08:00
Yifeng Zhao
dfdc21c0e6 phy: rockchip: naneng-combphy: Add php clock for rk3588
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I30998193795213dbd15e12ac56f4f81b461921e2
2021-12-07 20:09:54 +08:00
Yifeng Zhao
395d9a6018 arm64: dts: rockchip: rk3588: Fix sata clock
The sata need pipe clock for the interface and asic clock
for the phy.

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I6069bd653a3f22da8ade0cab002c5346c9880cef
2021-12-07 20:09:54 +08:00
Lian Xu
3ea0b451fb media: rockchip: ispp: add rk3588 config
Change-Id: I1ce9df227071757334d7fa7cc76aaa4f14ec05b8
Signed-off-by: Lian Xu <xu.lian@rock-chips.com>
2021-12-07 19:26:45 +08:00
Lian Xu
014edf4b88 media: rockchip: ispp: add the stream_v20
Change-Id: I0952cf0d226e07f7e760e74b2a248d89bf016472
Signed-off-by: Lian Xu <xu.lian@rock-chips.com>
2021-12-07 19:26:34 +08:00
Shunqing Chen
c30d37984d Documentation: devicetree: power: add CellWise cw2017 fuel gauge
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: Ifed0e2f0c3eed3f930b67bfbb444b1e537db7902
2021-12-07 19:25:40 +08:00
Shunqing Chen
9e369e5c4b arm64: rockchip_defconfig: Enable CONFIG_BATTERY_CW2017
RK3588 EVB3 needs CW2017 battery.

Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I8219fa25190c8086869d21cb0aef088d989da92c
2021-12-07 19:23:03 +08:00
Shunqing Chen
adb7eee24c power: supply: add CellWise cw2017 fuel gauge driver
This patch adds a driver for the CellWise cw2017 fuel gauge.

Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I29ae790727e0b2b326c46b452b7691f0231c6bfa
2021-12-07 19:22:47 +08:00
XiaoTan Luo
2d9e0f68ab arm64: rockchip_linux_defconfig: Enable multicodes
Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: I134cc221685b0b40babb349b66a3b98db8761b04
2021-12-07 19:13:54 +08:00
Elaine Zhang
20d7fc3f96 arm64: dts: rockchip: rk3588: add more clk for pd_fec and pd_isp1
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I62e3ec94015b90c372f234d426cace1c2a5898f0
2021-12-07 19:11:27 +08:00
Xing Zheng
91c28f12e7 ASoC: es8326: add support es8326 codec driver
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I5e7f02b18f377c270ce6f3e1fc3a527624663a00
2021-12-07 19:07:56 +08:00
shengfei Xu
be6bf0108d arm64: dts: rockchip: rk806-dual: enable vdd_log_s0, disable vcc_3v3_s3 in suspend
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I7caa293f45672404288b5cef525fdf1bca241535
2021-12-07 19:03:48 +08:00
shengfei Xu
decf7c2116 spi: rockchip: Suspend and resume the bus during NOIRQ_SYSTEM_SLEEP_PM ops
the wakeup interrupt handler which is guaranteed not to run while
@resume noirq() is being executed. the patch can help to avoid the
wakeup source try to access spi when the spi is in suspend mode.

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I3e6bc6e05dddeedea4c82de45a9e06b40e870876
2021-12-07 19:03:39 +08:00
Yandong Lin
5a9e481dce video: rockchip: mpp: use dma-buf-cache func
The attachment and sg_table will be store in dma-buf-cache.
  So use dma-buf-cache api instead of dma-buf api to reduce
  the actual operation of attach/map.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I8b46c8f6a6f69ebe9854858e198d1c312a808a2f
2021-12-07 18:07:41 +08:00
Sandy Huang
180d0b6980 drm/rockchip: vop2: add support cubic lut
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I0cf87a6d6c30ddc705c17dce677e5b7747084908
2021-12-07 15:59:58 +08:00
Sandy Huang
2d67ec5094 drm/rockchip: vop2: add support rk3588 gamma
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I6be46a12d73890c61578f1dae7a88b9cb4271dfb
2021-12-07 15:58:47 +08:00
Sandy Huang
aabb8a69f7 arm64: dts: rockchip: rk3588s: add VOP gamma register define
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I7487b09b8d6528b2515630a1ae38f091562010cf
2021-12-07 15:58:22 +08:00
Li Huang
b02d936f9d video: rockchip: rga3: rga3 support dst use offset by overlap offset
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I8cfcf587addf59cea5ed1be01a4936a57cc998e8
2021-12-07 15:34:03 +08:00
shengfei Xu
a0a30e57b5 regulator: rk806: fix the register offset error
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I9d7d18b37f2748669aec8ecec7d8f42effbe0ba6
2021-12-07 15:07:43 +08:00
Herman Chen
f7f59f1f3c arm64: dts: rockchip: rk3588s: Add vcodec mmu shootdown-entire
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: I08a99bd4761677eea239fb0925c8d3a0bf32bd3b
2021-12-07 15:03:22 +08:00
Herman Chen
30eb2be25b iommu/rockchip: Add shootdown_entire prop
Replace IOMMU_TLB_SHOT_ENTIRE by shootdown_entire defined in
iommu DT node for clean IOMMU framework code and more convenient
for masters. The master should call iommu_flush_iotlb_all to
zap cache manually.

Signed-off-by: Simon Xue <xxm@rock-chips.com>
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: I5feab72fa12782d0715ad84a98cbd96a88bcd598
2021-12-07 15:02:35 +08:00
Simon Xue
540ad49319 Revert "drm/rockchip: gem: add IOMMU_TLB_SHOT_ENTIRE when call iommu_map_sg"
This reverts commit 91db0733d7.

Signed-off-by: Simon Xue <xxm@rock-chips.com>
Change-Id: I7842de3f5a7e4a64e570ceb93e82fdee38f78498
2021-12-07 15:02:27 +08:00
Sandy Huang
2e72e95308 drm/rockchip: dsi2: add support software TE mode
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I5fd600c9a91dd59cbfaf89765b63b7aa261f3976
2021-12-07 14:21:00 +08:00
Sandy Huang
cc5f5c07a0 drm/rockchip: vop2: add support mipi dsi cmd mode panel
for vp2/vp3, we can use hardware or software TE to sync with panel ram,
but for vp1->dsc1->dsc1 path, we only can use software TE to sync with panel
ram.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I0f54723c5c1c45916e669ce21819a127dc5b415d
2021-12-07 14:21:00 +08:00
Sandy Huang
be1e4b616a drm/rockchip: drv: add support soft TE mode to sync with panel ram
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I3d0cc0f6f941da61336f47062a8682210234b803
2021-12-07 14:21:00 +08:00