Commit Graph

1256270 Commits

Author SHA1 Message Date
Zhen Chen
b72fff5ed8 MALI: rockchip: upgrade bifrost DDK to g21p0-01eac0, from g18p0-01eac0
"/sys/kernel/tracing/events/power/gpu_work_period/*" required by Android 14.0 is implemented.

NOTE:
For RK3588, the mali_csffw.bin used with this driver MUST be from DDK g21p0-01eac0 correspondingly.

Change-Id: Ifab61806a6a350ba53c5dc0296d20628c28d633a
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2023-11-16 14:18:32 +08:00
Zefa Chen
6a55166690 media: rockchip: vicap always notifier sditf to isp when work with GKI
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I4f466abaad2350eed7da039baec7440c82689afb
2023-11-14 10:30:31 +08:00
Zefa Chen
e9312febc7 phy: rockchip: mipi-rx: skip unready sensor and lens-focus device for GKI
This applies to situations where multiple cameras need to be supported in one DTS,
and camera devices need to be registered with GKI
Note: phy-rockchip-csi2-dphy.ko must be insmod last

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib7dae1144a5f1923db41a489147f2aa5b2f2b358
2023-11-10 11:40:30 +08:00
Zefa Chen
973b4ed0cc phy: rockchip: mipi csi2 dphy skip unready sensor and lens-focus device for GKI
This applies to situations where multiple cameras need to be supported in one DTS,
and camera devices need to be registered with GKI
Note: phy-rockchip-csi2-dphy.ko must be insmod last

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: If915530d4b982df9500851df89b776e18ed7dd38
2023-11-10 11:39:34 +08:00
Zefa Chen
3bfffd34a4 phy: rockchip: mipi-rx: fixes issue of parse endpoint
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I9a7f9c8a90079f3ea17e746d42cc04dca7b18b9f
2023-11-10 11:37:45 +08:00
Zefa Chen
9537649113 phy: rockchip: mipi csi2 dphy fixes issue of parse endpoint
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I8891e18935d4bcabd4a2af620119fcab50524a95
2023-11-10 11:35:42 +08:00
Zefa Chen
5e482a1da3 media: rockchip: vicap: mipi csi2 fixes issue of parse endpoint
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I51d706a30a525b367e4d662d448595349ca6954c
2023-11-10 11:34:08 +08:00
Tao Huang
91e80a06a1 Merge commit '64ab42efa552b21f5d9cd259f7f13c8b5125842d'
* commit '64ab42efa552b21f5d9cd259f7f13c8b5125842d':
  net: can: rockchip: use soft reset for bus off
  net: can: rockchip: fix rx stuck and timeout
  net: can: rockchip: support Listen-only mode
  net: can: rockchip: fix tx error in special application
  arm64: dts: rockchip: rk3588-vehicle-evb-v22: Switch to use standalone NCA9539 driver
  video: rockchip: mpp: fix rkvenc2 run crash issue
  arm64: dts: rockchip: rk3588: dmc add SYS_STATUS_DEEP_SUSPEND
  PM / devfreq: rockchip_dmc: add support SYS_STATUS_DEEP_SUSPEND
  media: rockchip: isp: support change work mode to online with quick stream
  arm64: dts: rockchip: rk3588-vehicle-s66\*maxim\*: Fix pins default pinctrls
  arm64: dts: rockchip: rk3588-vehicle\*maxim\*: Fix pins default pinctrls
  backlight: pwm_bl: fix the state check in power-off
  arm64: dts: rockchip: rk3528: Add low temperature config for opp table
  net: phy: rk630: Fixed for reboot && ping issue

Change-Id: I24998055c32c70cc92b97550bd54fd755ce0430e
2023-11-06 17:37:03 +08:00
Elaine Zhang
64ab42efa5 net: can: rockchip: use soft reset for bus off
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I8950b7ee8fa677376600599922aa6c40d1af2d0a
2023-11-06 17:15:22 +08:00
Elaine Zhang
9038fae6bd net: can: rockchip: fix rx stuck and timeout
In some special applications, tx has read data from the fifo, rx to read
the fifo is 0 when there is no need to do timeout waiting.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I7f4bc88ace026088228396da96d628bebb9e4b94
2023-11-06 17:15:22 +08:00
Elaine Zhang
e903c65661 net: can: rockchip: support Listen-only mode
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I6b566f3f0834ff01e9cff1c1b7ef3934c2e5ec37
2023-11-06 17:15:22 +08:00
Elaine Zhang
4314dcc88f net: can: rockchip: fix tx error in special application
add wait tx req cmd.
fix warning: "BUG! echo_skb %d is occupied!"
disable space_rx_mode when tx req to fix extended frame probability
change standard frame.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I0b11d985224682700f43cb155f357b28622dc4be
2023-11-06 17:15:22 +08:00
Cody Xie
ecd2f7a8a0 arm64: dts: rockchip: rk3588-vehicle-evb-v22: Switch to use standalone NCA9539 driver
Change-Id: Iff456e2bf6644185a164fba601e914f19c86effa
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
2023-11-06 16:18:00 +08:00
Yandong Lin
d9794ef01e video: rockchip: mpp: fix rkvenc2 run crash issue
Calling an interface containing mutex lock after
schedule_preempt_disabled caused the problem.

Call trace:
 dump_backtrace+0xf4/0x118
 show_stack+0x18/0x24
 dump_stack_lvl+0x60/0x7c
 dump_stack+0x18/0x3c
 __schedule_bug+0x6c/0x8c
 __schedule+0x64c/0x9cc
 schedule+0x7c/0xe8
 schedule_preempt_disabled+0x24/0x40
 __mutex_lock+0x224/0xdac
 __mutex_lock_slowpath+0x14/0x24
 mutex_lock+0x40/0xec
 clk_get_rate+0x50/0x134
 rkvenc_run+0x4ec/0x728 [rk_vcodec]
 mpp_task_worker_default+0x2b4/0x494 [rk_vcodec]
 kthread_worker_fn+0x10c/0x244
 kthread+0x104/0x1d4
 ret_from_fork+0x10/0x20

Fixes: ca7fd65693 ("video: rockchip: mpp: rkvenc2: optimize iommu fault handle")
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I1bceea441495a1c6c94776a648601d670b7a29d2
2023-11-06 16:16:58 +08:00
YouMin Chen
59cc6c2107 arm64: dts: rockchip: rk3588: dmc add SYS_STATUS_DEEP_SUSPEND
Signed-off-by: YouMin Chen <cym@rock-chips.com>
Change-Id: Ia15fc5ce372aeaaef1a009da20e2759f599988bf
2023-11-06 16:09:59 +08:00
YouMin Chen
8abd0d3f68 PM / devfreq: rockchip_dmc: add support SYS_STATUS_DEEP_SUSPEND
Set the frequency of SYS_STATUS_DEEP_SUSPEND to devfreq->suspend_freq,
which is the device frequency set during deep suspend phase.

Signed-off-by: YouMin Chen <cym@rock-chips.com>
Change-Id: Ic33ded5cc6a17335404ef65dd071e856bdf7e598
2023-11-06 16:09:59 +08:00
Zefa Chen
dbcf24dd4c media: rockchip: isp: support change work mode to online with quick stream
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic44728b9e98cb8d15967f3ebdc94ca3d05f7d0e3
2023-11-06 14:25:38 +08:00
Cody Xie
87742febe2 arm64: dts: rockchip: rk3588-vehicle-s66\*maxim\*: Fix pins default pinctrls
Change-Id: Ide7bc019d2599888ee52bc1d257f5ba5a598631d
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
2023-11-06 14:23:09 +08:00
Cody Xie
ce8fb3bb30 arm64: dts: rockchip: rk3588-vehicle\*maxim\*: Fix pins default pinctrls
Set all default pins to expected input/output values to
prevent glitch during probe.

Change-Id: I29e882f47b8ab1e4d89e29cc1525187a434cba53
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
2023-11-06 14:23:09 +08:00
Damon Ding
18df0d10b7 backlight: pwm_bl: fix the state check in power-off
If the default-brightness-level is 0 and related pwm
has been enabled in uboot, the pwm_backlight may not
actually be turned off.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I92c0c363a13040e300dd8aa2d40edcad87fa50d0
2023-11-06 14:21:06 +08:00
Finley Xiao
99f2737534 arm64: dts: rockchip: rk3528: Add low temperature config for opp table
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I7f8813c2508bc1eb024f2e2b327dc298bbe5bcb6
2023-11-06 11:35:20 +08:00
David Wu
6a5f6ee5bf net: phy: rk630: Fixed for reboot && ping issue
Fixes: ee144563a5 ("net: phy: rk630: Enable aps && uaps to save power consumption")
Fixes: b67f47f242 ("net: phy: rk630phy: Add adc performance")

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I9519024f839e1648570ea98c77d2c22e58b9bc76
2023-11-06 11:34:25 +08:00
Tao Huang
2e205b21b6 Merge commit '1dfbd3db7bcb48ddcd94d0803618bb529c805770'
* commit '1dfbd3db7bcb48ddcd94d0803618bb529c805770':
  pwm: rockchip: add debugfs to dump regs
  drm/rockchip: vop2: fix NULL point when dump regs or active_regs
  arm64: dts: rockchip: rk3308-amp: support ap rpmsg
  ARM: configs: rockchip: enable CONFIG_PWRSEQ_SIMPLE for rv1106-tb-nofastae.config
  arm64: dts: rockchip: rk3588s: Add hclk for npu opp table

Change-Id: Iadea43e59b8fb03f247daa4476d05b57cddf79a0
2023-11-06 11:25:02 +08:00
Tao Huang
2f4c1463d8 Merge commit 'a4ed886f15adaf1dcdc47c89b6f65408eb48026e'
Merge using ours merge strategy.

* commit 'a4ed886f15adaf1dcdc47c89b6f65408eb48026e':
  drm/rockchip: lvds: using readable connector name when dual lvds enabled

Change-Id: Ie7cfb06bc1db68503ba9a75650e9cba3d01f9bf4
2023-11-06 11:24:26 +08:00
Chaoyi Chen
42b9e7680e drm/rockchip: lvds: using readable connector name when dual lvds enabled
When we enable Dual LVDS, there will be the following
output in the VOP summary node:

$ cat /sys/kernel/debug/dri/0/summary
...
Video Port1: ACTIVE
    Connector: LVDS-1
...

The connector information here is not clear enough. When Dual LVDS is enabled,
both LVDS-0 and LVDS-1 will be enabled (but we will only expose one connector
to user space for operation, which can shield the underlying differences).

In addition, if only LVDS1 is enabled instead of using Dual LVDS,
"LVDS-1" will also be printed here.

In order to express this information more accurately, we will change
the corresponding connector name to "LVDS-DUAL" when using Dual LVDS:

$ cat /sys/kernel/debug/dri/0/summary
...
Video Port1: ACTIVE
    Connector: LVDS-DUAL
...

Change-Id: I9621338c8bdec4b32772c3558d55b5b426d3ccc4
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
2023-11-06 11:19:34 +08:00
Tao Huang
ee2ea83260 Merge commit '510972e61e134b53564795e4f5319be7a2faae95'
* commit '510972e61e134b53564795e4f5319be7a2faae95':
  rpmsg: rockchip: Add Soft IRQ Mode Support
  arm64: dts: rockchip: rk356x-evb: update claa070wp03xg panel timing
  ARM: dts: rockchip: update the map of mmc_idmac for rv1106-tb*_mmc
  ARM: dts: rockchip: add clock refs for rv1106-tb*_mmc
  soc: rockchip: thunderboot_mmc: enable clk_emmc before accessing
  drm/rockchip: vop: check for valid sdr2hdr eoth
  drm/rockchip: vop2: make sure the bpp is not zero
  ARM: rv1106-evb.config: enable CONFIG VIDEO SC450AI/SC401AI/SC200AI
  ARM: dts: rockchip: rv1106-evb-cam: add sc450ai/sc401ai/sc200ai

Change-Id: I606b631e81fab4c5f92d3a53b4577bc4da0e93dc
2023-11-06 11:12:00 +08:00
Tao Huang
df9e22fec7 Merge commit 'ef1fb629c500d75ae3cd1bf7fbfe38ade30edd0b'
* commit 'ef1fb629c500d75ae3cd1bf7fbfe38ade30edd0b':
  media: i2c: add sc450ai support

Change-Id: I39d21053083223db0fbf4727744e5d542e240549

Conflicts:
	drivers/media/i2c/Kconfig
2023-11-06 11:11:30 +08:00
Tao Huang
796ecb79e1 Merge commit 'ccc60a624971b61ccbe2780289b39fae1c2e88d2'
* commit 'ccc60a624971b61ccbe2780289b39fae1c2e88d2':
  media: rockchip: vicap support to do reset in online mode
  media: rockchip: isp support to do reset in online mode
  arm64: dts: rockchip: rk3588 boards: Fix bitclock-inversion
  arm64: dts: rockchip: rk356x boards: Fix bitclock-inversion
  arm64: dts: rockchip: rk3528 boards: Fix bitclock-inversion
  arm64: dts: rockchip: rk3399-tve1205g: Fix bitclock-inversion
  arm64: dts: rockchip: rk3326-evb: Fix bitclock-inversion
  video: rockchip: mpp: Add uapi header
  soc: rockchip: tb_service: add memory-no-free property support

Change-Id: I068ca307ee0ec53eb570ce4f7fd5604c6bb796d8
2023-11-06 11:06:11 +08:00
Damon Ding
1dfbd3db7b pwm: rockchip: add debugfs to dump regs
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I2cef534c3cb9c655258f6fc6e66e696b6293307e
2023-11-03 18:44:23 +08:00
Sandy Huang
fb2ea0c6bc drm/rockchip: vop2: fix NULL point when dump regs or active_regs
when vp0 is disabled, the vop2->vps[0].rockchip_crtc.crtc.state is NULL.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I93b3ea4f3ddc6076f2105ebcabf7317627b602a3
2023-11-03 09:09:30 +08:00
Hongming Zou
4334bb68c1 arm64: dts: rockchip: rk3308-amp: support ap rpmsg
Change-Id: I0f50eb6e8a4653f4298c499b29168f0031076c7a
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
2023-11-02 10:32:30 +08:00
Weiwen Chen
2deb8446dd ARM: configs: rockchip: enable CONFIG_PWRSEQ_SIMPLE for rv1106-tb-nofastae.config
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I67caa4711b664174f0192133d5b6280573b72fc1
2023-11-02 09:52:39 +08:00
Finley Xiao
fbce87553e arm64: dts: rockchip: rk3588s: Add hclk for npu opp table
Change-Id: I19d9c380f9bd1ca3bb0a7385f992df75b060f1c1
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-11-01 19:10:08 +08:00
Chaoyi Chen
a4ed886f15 drm/rockchip: lvds: using readable connector name when dual lvds enabled
When we enable Dual LVDS, there will be the following
output in the VOP summary node:

$ cat /sys/kernel/debug/dri/0/summary
...
Video Port1: ACTIVE
    Connector: LVDS-1
...

The connector information here is not clear enough. When Dual LVDS is enabled,
both LVDS-0 and LVDS-1 will be enabled (but we will only expose one connector
to user space for operation, which can shield the underlying differences).

In addition, if only LVDS1 is enabled instead of using Dual LVDS,
"LVDS-1" will also be printed here.

In order to express this information more accurately, we will change
the corresponding connector name to "LVDS-DUAL" when using Dual LVDS:

$ cat /sys/kernel/debug/dri/0/summary
...
Video Port1: ACTIVE
    Connector: LVDS-DUAL
...

Change-Id: I9621338c8bdec4b32772c3558d55b5b426d3ccc4
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
2023-11-01 19:02:38 +08:00
Hongming Zou
510972e61e rpmsg: rockchip: Add Soft IRQ Mode Support
1. Add a way to trigger soft interrupts for rpmsg communication
soft irq refers to reserved irq in shared peripheral interrupt (SPI).

2. Rename rockchip_rpmsg.c to rockchip_rpmsg_mbox.c.

Change-Id: I8007f4b77ba669073db9074e9c19623c37c27fb6
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
2023-11-01 18:12:01 +08:00
Chaoyi Chen
43dfdb1bc3 arm64: dts: rockchip: rk356x-evb: update claa070wp03xg panel timing
Change-Id: I1b2a7fa60bdd73c2a0016044c219540a396992e1
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
2023-11-01 17:10:35 +08:00
Weiwen Chen
2578958855 ARM: dts: rockchip: update the map of mmc_idmac for rv1106-tb*_mmc
The mmc_idmac run at the address [512KB ~ (2M - 8KB)] which is SPL's
Stack and Heap.
SPL'mmc_idmac use malloc and Kernel reserve this memory.

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I267759d6acd1137a19e0e5d534c481b8f579b1ee
2023-11-01 17:10:18 +08:00
Ziyuan Xu
d5ec07e871 ARM: dts: rockchip: add clock refs for rv1106-tb*_mmc
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I1d4a94a3ba522fcb4d9ff44be0d8324a813fd81d
2023-11-01 17:09:40 +08:00
Ziyuan Xu
b908341ad3 soc: rockchip: thunderboot_mmc: enable clk_emmc before accessing
Avoid the *clk_emmc* are disabled by *unused_off* when the ramdisk is
too large.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I38b6f33ab55fbb65781ee266237382c977848e68
2023-11-01 17:07:49 +08:00
Finley Xiao
71f1b94ae2 Mali: midgard: Fix mdevp opp info NULL
Fixes: 5577e94f30 ("Mali: midgard: Use new APIs for devfreq")

Change-Id: I55e2e037b5d1ef338abfc863d5d7d03534806cc0
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-11-01 11:27:20 +08:00
Zhen Chen
9e4bae6d2b Mali: midgard: use platform_get_irq_byname() to obtain IRQ numbers
referencing bifrost/

Change-Id: I880f79dcafcb8da6d5f44c033cf8f3290b136acb
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2023-11-01 11:26:42 +08:00
Andy Yan
14fe560ebd drm/rockchip: vop: check for valid sdr2hdr eoth
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I8de0881df1c49f3b7365dbd6b33a716cd746ad98
2023-11-01 11:22:00 +08:00
Andy Yan
3f00c490d3 drm/rockchip: vop2: make sure the bpp is not zero
The bpp should not be a zero value.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I1a1f9214087639f63c101d0d5c68ee470c852649
2023-11-01 11:22:00 +08:00
LiuDiMing Lin
4fec67500f ARM: rv1106-evb.config: enable CONFIG VIDEO SC450AI/SC401AI/SC200AI
Signed-off-by: LiuDiMing Lin <fenrir.lin@rock-chips.com>
Change-Id: I8541cd64556eca8f958a4becc43ac22c4253789a
2023-10-31 20:13:33 +08:00
LiuDiMing Lin
6aef36d7b6 ARM: dts: rockchip: rv1106-evb-cam: add sc450ai/sc401ai/sc200ai
Signed-off-by: LiuDiMing Lin <fenrir.lin@rock-chips.com>
Change-Id: I3349cb999e9a204e76ad883e25af85c1762c6866
2023-10-31 20:13:25 +08:00
LiuDiMing Lin
ef1fb629c5 media: i2c: add sc450ai support
Signed-off-by: LiuDiMing Lin <fenrir.lin@rock-chips.com>
Change-Id: Id8e49af4fe64557238a226da6abbb6b80d849a44
2023-10-31 20:13:13 +08:00
Zefa Chen
ccc60a6249 media: rockchip: vicap support to do reset in online mode
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ibea46658e5d9a41b4f5685838230321e9b71032e
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
2023-10-31 20:11:26 +08:00
Mingwei Yan
5c222a001f media: rockchip: isp support to do reset in online mode
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: I32a2aa91258130a69ec09e5743e27f8c85279322
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
2023-10-31 20:11:26 +08:00
Sugar Zhang
a86b62fb9b arm64: dts: rockchip: rk3588 boards: Fix bitclock-inversion
simple-audio-card,bitclock-inversion is a boolean property.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I2f69c4fd79b6f2b2cc06d69f720671227901482c
2023-10-31 20:11:04 +08:00
Sugar Zhang
1e839d738b arm64: dts: rockchip: rk356x boards: Fix bitclock-inversion
simple-audio-card,bitclock-inversion is a boolean property.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ic8f1028e97a29e0af257a860be9b2022511c7a9a
2023-10-31 20:10:46 +08:00