shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity
1,065,184 Commits 55 Branches 2,486 Tags
fdf8b0fb96c8145c6842489fedf4aa40f95f8e25
Commit Graph

1065184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yu Qiaowei
fdf8b0fb96 video: rockchip: rga3: Remove iommu_api that does not support GKI 
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ie90b87aa84758644a4696e59a63c48d2fbb8e7b2
 2022-03-03 21:03:23 +08:00
Yu Qiaowei
431ced4368 video: rockchip: rga3: Fix hardware support format 
1. RGA3 support ARGB/ABGR8888 input.
2. RGA3 support YUV420 packed output.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I7680ed7b0218998f67e0d1ed40cc2ad3690b8572
 2022-03-03 21:03:23 +08:00
Yu Qiaowei
5c988d7aa1 video: rockchip: rga3: update rga_debugger 
1. Add 'debug' mode in debug node.
2. Fix compilation error when procfs is enabled.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I88bdcad127a726a6b2618d54c2c3958a663bc6d7
 2022-03-03 21:03:23 +08:00
Wang Panzhenzhuan
1fa592b341 media: i2c: imx415: fix lock check warning 
resolve the warning log below:
[    3.116535][    T1] ------------[ cut here ]------------
[    3.116555][    T1] WARNING: CPU: 4 PID: 1 at
drivers/media/v4l2-core/v4l2-ctrls.c:4435 __v4l2_ctrl_s_ctrl+0x70/0x88
[    3.116562][    T1] Modules linked in:
[    3.116575][    T1] CPU: 4 PID: 1 Comm: swapper/0 Not tainted 5.10.66
[    3.116583][    T1] Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board
(DT)
[    3.116591][    T1] pstate: 60c00009 (nZCv daif +PAN +UAO -TCO
BTYPE=--)
[    3.116598][    T1] pc : __v4l2_ctrl_s_ctrl+0x70/0x88
[    3.116606][    T1] lr : __v4l2_ctrl_s_ctrl+0x3c/0x88
[    3.116612][    T1] sp : ffffffc012d0ba10
[    3.116619][    T1] x29: ffffffc012d0ba10 x28: 0000000000000000
[    3.116631][    T1] x27: 00000000009e0901 x26: ffffffc01155bdb0
[    3.116642][    T1] x25: ffffffc01155c998 x24: ffffff8104b6e100
[    3.116653][    T1] x23: ffffff8104b6e278 x22: ffffff8104b6e400
[    3.116664][    T1] x21: ffffff81044e0000 x20: 0000000000000001
[    3.116675][    T1] x19: ffffff810506b600 x18: ffffffc012d05098
[    3.116686][    T1] x17: 0000000000000000 x16: ffffff8100338000
[    3.116697][    T1] x15: ffffffc012bae000 x14: ffffffc01220eeb0
[    3.116708][    T1] x13: 00000000ffffffff x12: ffffffc0125e0f30
[    3.116719][    T1] x11: 0000000100000002 x10: 00000000000000ff
[    3.116731][    T1] x9 : 0000000000000000 x8 : ffffffc1ed1b9000
[    3.116742][    T1] x7 : ffffffc010cb8ebc x6 : ffffff81003389f8
[    3.116752][    T1] x5 : 0000000000000000 x4 : 0000000000000001
[    3.116763][    T1] x3 : ffffff8104b6e320 x2 : 0000000000000000
[    3.116774][    T1] x1 : ffffff8104b6e468 x0 : 0000000000000000

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I1ec8de71d644cee4d81e16db7054da21677732bf
 2022-03-03 20:18:52 +08:00
Sandy Huang
20cf1fde7c drm/rockchip: vop2: fix cluster alpha error at splice mode 
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I29564be93e58b73227a9390a93f4d30ff1084456
 2022-03-03 20:11:10 +08:00
Ding Wei
8c0bf43f09 arm64: dts: rockchip: rk3588: Add node for avs plus decoder 
Change-Id: I3d2a4609fedb0ac27bc0b3b18de6908bbc01928d
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
 2022-03-03 20:01:06 +08:00
Yandong Lin
2e8bbf3c08 arm64: dts: rockchip: enable av1d iommu for rk3588-nvr 
The av1d node is register av1dec_bus not platform bus,
so it no need to set okay status.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Id5ab7c5bf8380221b663730596335e9bda1eb6b2
 2022-03-03 20:00:20 +08:00
Yandong Lin
cefea8c402 arm64: dts: rockchip: enable av1d iommu for rk3588 evb/tablet 
The av1d node is register av1dec_bus not platform bus,
so it no need to set okay status.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Signed-off-by: Simon Xue <xxm@rock-chips.com>
Change-Id: I9c88340d6542c497b3e4b24406db93bd60369fd8
 2022-03-03 19:58:48 +08:00
Yandong Lin
c125c678f6 video: rockchip: mpp: support av1 decode 
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Signed-off-by: Simon Xue <xxm@rock-chips.com>
Change-Id: I76b54488c9078688ebc9c4df902e6940c95f3594
 2022-03-03 19:57:17 +08:00
Herman Chen
e6f26e1367 video: rockchip: mpp: rkenc2: Add core parallel 
Enable two core parallel working support.

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: I102d2ff2882041594f089be44e7782c84e103f99
 2022-03-03 19:50:56 +08:00
Jon Lin
28d87a7fab mtd: spi-nor: gigadevice: Add support gd25lb512m gd25b512m 
Change-Id: Ibaa1807d5bb00627a3c3889f7290b3f8fe5f8f82
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
 2022-03-03 18:37:44 +08:00
Zhen Chen
7c3725c8f1 MALI: bifrost: remove a verbose log 
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: I06184a601d5817d87433cbcde19b39bccc12f774
 2022-03-03 18:19:25 +08:00
Finley Xiao
08403c1ceb arm64: dts: rockchip: rk3588s: Modify opp table for cpul 
Add pvtpll support for cpul.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I8f318e26d9a74f89389256266e78682b93e0c2ce
 2022-03-03 18:02:08 +08:00
Finley Xiao
038080da03 arm64: dts: rockchip: rk3588s: Modify npu opp table 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I2ee85bbfe3e48ac90a403094a290ef2cd17fc924
 2022-03-03 18:02:03 +08:00
Finley Xiao
44c8771eaa arm64: dts: rockchip: rk3588s: Modify gpu opp table 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Id3167f3c7b98ee3a004fc0ef6ab7e24a0680d9e6
 2022-03-03 18:01:57 +08:00
Finley Xiao
fcfda393ed arm64: dts: rockchip: rk3588s: Modify cpub opp table 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I5d6a2222c03d19f85ec83bdbe4399c0a2e7de9f5
 2022-03-03 18:01:50 +08:00
Finley Xiao
816f5aea02 soc: rockchip_system_monitor: Set intermediate rate before change read margin 
Improve stability when change read margin.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: If283af8895eead5ec8f86cf7f03eca28fc1d2a45
 2022-03-03 18:01:38 +08:00
Finley Xiao
1f40ab6977 driver: rknpu: Set intermediate rate before change read margin 
Improve stability when change read margin.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I36c9258c3a5b87d44416d19d38fc81f3101fb3a4
 2022-03-03 18:01:38 +08:00
Finley Xiao
eb26be047e MALI: bifrost: Set intermediate rate before change read margin 
Improve stability when change read margin.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I0ddb1d00c670cbc8e4c64f999382f1420a86c537
 2022-03-03 18:01:38 +08:00
Finley Xiao
c00e3a0e83 cpufreq: rockchip: Set intermediate rate before change read margin 
Improve stability when change read margin.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I25a4b00c37b05e8de404ffbd9904a5b65288b077
 2022-03-03 18:01:38 +08:00
Finley Xiao
45d2158ce7 soc: rockchip: opp_select: Add support to get pvtpll pvtm 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: If718c854bbf752026c259314ed5230026302f0d2
 2022-03-03 18:01:38 +08:00
Finley Xiao
f3a5053707 soc: rockchip: opp_select: Implement rockchip_set_read_margin() 
Add common APIs to set read margin and set intermediate rate.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I8fb1d16f4ca1a9ec0ba80019197a73e56391c14c
 2022-03-03 18:01:38 +08:00
Finley Xiao
f5f2d23805 soc: rockchip: opp_select: Implement rockchip_get_read_margin() 
In order to get target read margin and scmi clk earlier,
and it will also be used in later submissions.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I75bd79dc4963fa0dcc73d7c66a696e1cc0c177b7
 2022-03-03 18:01:38 +08:00
Yandong Lin
686e5857b5 arm64: dts: rockchip: add av1d node for rk3588 
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ica90c91b53524101ae9ae85819f4aea5e1fdfb42
 2022-03-03 16:35:24 +08:00
Yandong Lin
323057a650 arm64: configs: rockchip_defconfig: enable av1dec 
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ie2adbb18eb28a4d1c488fcb4a34b3015ae63cd81
 2022-03-03 16:34:46 +08:00
Damon Ding
a2c4bf9e96 drm/rockchip: vop2: add func rockchip_drm_crtc_standby() 
In order to modify the logic, check whether the standby
function is supported by (*crtc_standby). And add the
universal function rockchip_drm_crtc_standby().

Replace vop2_standby() by rockchip_drm_crtc_standby() in
dsi2 driver.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I974780c441fe0e9a8a81f933b3070a727321b589
 2022-03-03 16:23:43 +08:00
Ding Wei
418d20a4f1 arm64: dts: rockchip: rk3588: rkvdec2: Set master-handle-irq 
Change-Id: Ia5981c8b80b0b66ff05ee3033bbc704e9fd8333c
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
 2022-03-03 16:20:13 +08:00
Ding Wei
12f76c8580 video: rockchip: mpp: rkvdec2: Trigger reset when iommu pagefault 
1. When iommu pagefault, hardware will stop and wait to deal with it.
in order to respond quickly, such as NVR, reset the hardware directly.
2. The iommu handle should be for the current device, not the queue.
and, the mpp_task_dump_hw_reg function is used to dump hardware register
info, it no relation for task.
3. In the mode of link-mode and multi-core, it cannot accurately get task
via queue->running_task, thereforce, it is not suitable to dump task
register here.

Change-Id: Ifed2cbc484997a07ed65c38c16062abe9b9aff81
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
 2022-03-03 16:14:03 +08:00
Ding Wei
a8e9b2055a video: rockchip: mpp: sip reset for soft-ccu 
1. for rk3588, it may hung for when bus error, then, it should
   use sip reset.
2. before reset, it make sure that the clock is on.

Change-Id: I2dd1dc5c4cd273eb8678ceaa29b0e966828f50fd
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
 2022-03-03 16:13:55 +08:00
Ding Wei
be0296b414 iommu/rockchip: Add pagefault handle callback for device 
Change-Id: I6998390ea6e5bf41ab21364cad7471603f8d362f
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
 2022-03-03 16:06:12 +08:00
Damon Ding
7116c11f51 drm/rockchip: add config options of VOP and VOP2 driver 
rv1126 does not support VOP2, so add config options to
reduce memory usage.

./ksize.sh  drivers/gpu/drm/

before ksize: 487941 Bytes
after  kszie: 380303 Bytes
save   about: 107628 Bytes

In addition, improve the format of space and tab, and remove
extra "depends on DRM_ROCKCHIP".

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I2b29a543a7e52e4e4b72112980e2c6dc6c6cce92
 2022-03-03 15:46:30 +08:00
Simon Xue
b1cec75764 dma-buf: heaps: add rockchip heaps 
Change-Id: If7dad5ace1164ff09bc5bc5bbc4589b63b7ac2f6
Signed-off-by: Simon Xue <xxm@rock-chips.com>
 2022-03-03 15:13:36 +08:00
Steven Liu
6c93ab7f1d ARM: dts: rockchip: Add gpio aliases for RV1106 
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Ib32dde644f9079403c37e9e97289682913a5fd8e
 2022-03-03 14:19:14 +08:00
David Wu
e39283d8b4 ethernet: stmmac: dwmac-rk: Add gmac support for rv1106 
Add constants and callback functions for the dwmac on RV1106 soc.
As can be seen, the base structure is the same,.In addition, there is
an internal phy inside.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I5889a7dd8bdbbbf763a617c5d1aa525454006e39
 2022-03-03 14:11:44 +08:00
David Wu
51d12f9d67 ARM: dts: rockchip: Add gmac support for rv1106 
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I7a3b55fc034d99c2888a4caefb2b9d4610cfaa83
 2022-03-03 11:01:23 +08:00
Tao Huang
349ce40fd7 ARM: dts: rockchip: grf include peri/venc/npu/pmu/ddr/core/vi/vo grf for rv1106 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5a095b9b00f2e9d173d41260c3e5e87f76ad6cb9
 2022-03-03 11:00:38 +08:00
Tao Huang
fa74eb6780 Revert "ARM: dts: rockchip: add venc_grf node for rv1106" 
This reverts commit 48c78936e0.

The next patch, grf will include venc_grf.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iaaf2f1067adbaa21fcfc3d0cfd59cd10390a5daf
 2022-03-03 11:00:38 +08:00
Damon Ding
289fddc780 drm/rockchip: rgb: modify the function of rv1106_rgb_enable() 
Add the reg shift of vop_pipe_bypass. Lcd lower pins(0~7)
and hsync/vsync/den belong to VCCIO6 which controlled
by venc_grf. And lcd higher pins(8~17) belong to VCCIO5
which depend on vo_grf.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: If7eab4570cbba12f5ff38eafe826112a44ea90c9
 2022-03-03 10:38:12 +08:00
Guochun Huang
69cb143678 drm/rockchip: dsi2: make horizontal scanning setup time more accurate 
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: Ib92d92d52d60e56ed4db6a5520b8800d739a6bd8
 2022-03-03 08:19:19 +08:00
Chen Shunqing
cb60e73a74 arm64: dts: rockchip: rk3588s-tablet: remove condition for exiting uboot charge 
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: I081c803eb08e1fa16272f31272f98fa556d3c002
 2022-03-02 20:51:28 +08:00
Wyon Bi
5aef55300b arm64: dts: rockchip: rk3588s: Add pclk_vo1_grf clock 
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I7ab10a5091b1396858142162fbf537ac5431e98e
 2022-03-02 20:51:03 +08:00
Wyon Bi
961bd97597 clk: rockchip: link: Add pclk_vo1_grf clock 
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I3f0f46fd9580e935769335aa20f78c2ee74dbdaa
 2022-03-02 20:51:03 +08:00
David Wu
76570bf545 dt-bindings: net: rockchip-dwmac: add rv1106 compatible string 
Add compatible string for RV1106 gmac, and constrain it to
be compatible with Synopsys dwmac 4.20a.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I3a9ddfa9e217309901dec24e81f571c568f7d7b1
 2022-03-02 19:58:08 +08:00
David Wu
69ff4e8b15 ethernet: stmmac: Prepare for support more phys 
There are now two built-in phys ephy and sphy, so that use the
interface integrated_phy_power() as a public interface.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: If964436beeba1359a7ce7c764f85b50a6cf52bd7
 2022-03-02 19:58:08 +08:00
David Wu
f5f864ab51 driver: rk630: Add RK630 MAC PHY support 
Support RK630 ethernet PHY currently, this is a RMII PHY.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I444f9c5abd1dc5fe8067b79ddee93a801d7a28b9
 2022-03-02 19:55:02 +08:00
Sugar Zhang
39c1334ee8 ARM: configs: rockchip: Add rv1106-evb.config 
Enable MMC:

+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_MINORS=32
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_PLTFM=y
+CONFIG_MMC_DW_ROCKCHIP=y

Enable EXT4 FS for evb rootfs:

+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT2=y

Enable FAT FS for sdcard:

+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_VFAT_FS=y

Enable DEBUG FS

+CONFIG_DEBUG_FS

Generated by:

  make ARCH=arm rv1106_defconfig
  cp .config tmp.config
  make ARCH=arm menuconfig
  bala...
  ./scripts/diffconfig -m tmp.config .config >
  arch/arm/configs/rv1106-evb.config

Updated by:

  make ARCH=arm rv1106_defconfig
  cp .config tmp.config
  make ARCH=arm rv1106_defconfig rv1106-evb.config
  make ARCH=arm menuconfig
  bala...
  ./scripts/diffconfig -m tmp.config .config >
  arch/arm/configs/rv1106-evb.config

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I7e944241cfde670b4b8ab53f39bd7a119bf984e9
 2022-03-02 19:52:32 +08:00
Sugar Zhang
ae4442de65 ARM: configs: rv1106: Disable CONFIG_EXT4_FS 
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I70f93de603f44ed36e2c83e55b691b6195c86383
 2022-03-02 19:46:50 +08:00
Wang Panzhenzhuan
0467aec3b6 media: i2c: otp_eeprom: fix the warning when multi sensor use 
resolve the warning log below:
[    2.920218][    T1] ------------[ cut here ]------------
[    2.920681][    T1] proc_dir_entry '/proc/otp_eeprom' already
registered
[    2.921284][    T1] WARNING: CPU: 6 PID: 1 at fs/proc/generic.c:382
proc_register+0x12c/0x1b0
[    2.922024][    T1] Modules linked in:
[    2.922357][    T1] CPU: 6 PID: 1 Comm: swapper/0 Not tainted 5.10.66
[    2.922964][    T1] Hardware name: Rockchip RK3588S EVB1 LP4X V10
Board (DT)
[    2.923584][    T1] pstate: 60800009 (nZCv daif -PAN +UAO -TCO
BTYPE=--)
[    2.924171][    T1] pc : proc_register+0x12c/0x1b0
[    2.924590][    T1] lr : proc_register+0x124/0x1b0
[    2.925008][    T1] sp : ffffffc01242ba00
[    2.925359][    T1] x29: ffffffc01242ba00 x28: 0000000000000000
[    2.925890][    T1] x27: 0000000000000000 x26: 0000000000000000
[    2.926422][    T1] x25: ffffff81035b7748 x24: ffffff81036e82d8
[    2.926953][    T1] x23: 000000000000000a x22: ffffff81035b782c
[    2.927484][    T1] x21: ffffffc0121442e0 x20: ffffffc012144260
[    2.928015][    T1] x19: ffffff81035b7780 x18: ffffffc0124250a0
[    2.928545][    T1] x17: 0000000000000000 x16: 00000000000000d8
[    2.929076][    T1] x15: 0000000000000004 x14: 0000000000003fff
[    2.929607][    T1] x13: ffffffc011fac968 x12: 0000000000000003
[    2.930138][    T1] x11: 00000000ffffbfff x10: 00000000ffffffff
[    2.930669][    T1] x9 : a8dc5ce6d1a47200 x8 : a8dc5ce6d1a47200
[    2.931201][    T1] x7 : 392e32202020205b x6 : ffffffc01237edb8
[    2.931732][    T1] x5 : ffffffffffffffff x4 : 0000000000000000
[    2.932263][    T1] x3 : ffffffc011c3e801 x2 : 0000000000000000
[    2.932793][    T1] x1 : 0000000000000001 x0 : ffffffc0123a1e08

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: If5e7adcfce605fb1aeae542bb434f8058f84ef12
 2022-03-02 19:35:41 +08:00
Tao Huang
2b570aa157 arm64: rockchip_gki.config: Enable CONFIG_REGULATOR_RK860X 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5987a18143cf20e502c4356a9daa37c3a4753937
 2022-03-02 18:01:12 +08:00
Caesar Wang
5dfa7dd659 arm64: configs: update thermal configure for rockchip_linux_defconfig 
The default used thermal with IPA on rockchip_linux_defconfig.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I8c928ea6c139db3d34af783bc9aa9d7e8987afc9
 2022-03-02 17:58:53 +08:00