Commit Graph

1080818 Commits

Author SHA1 Message Date
Tao Huang
ce595e7f0c ASoC: rockchip: utils: include rockchip_utils.h for missing prototype
sound/soc/rockchip/rockchip_utils.c:115:6: warning: no previous prototype for 'rockchip_utils_get_performance' [-Wmissing-prototypes]
sound/soc/rockchip/rockchip_utils.c:135:6: warning: no previous prototype for 'rockchip_utils_put_performance' [-Wmissing-prototypes]

Fixes: ff0c025724 ("ASoC: rockchip: Introduce rockchip utils common API")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ida15cf7c465fbabea0f0db9bfd21f4577e9e8dbd
2023-10-31 09:23:33 +08:00
Jiahang Zheng
b368ed36e3 arm64: dts: rockchip: Add rk3562-evb2-ddr4-v10-linux-amp.dts
Signed-off-by: Jiahang Zheng <jiahang.zheng@rock-chips.com>
Change-Id: I9770e87f0002cd170867f7d717732c9785b2e732
2023-10-30 19:30:49 +08:00
Sandy Huang
a662526fcb drm/fourcc: add and update rockchip modifier format define
1. update rockchip tiled modifier format define;
2. add rockchip rfbc modifier format define, rfbc is rockchip framebuffer
compression format, it's will supported by rockchip video decoder, RGA and VOP
modules, and the superblocks size is 64x4.

Fixes: f727d3ad8e ("drm/fourcc: Add definitions for Rockchip vendor and VPU tiled format")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ice06eda4819254ba670a7231836cabe46bc38137
2023-10-30 19:30:13 +08:00
Jon Lin
c050db5c79 mtd: spi-nor: gigadevice: Support gd25lb256
Change-Id: I6934e4bfd0ded64f05ea6dc738d73d6ea1131f42
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-10-30 19:26:36 +08:00
Zefa Chen
ebce693485 media: rockchip: vicap support to set quick stream
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Idbf038d79080b394c5bb614a0b04039964624ab5
2023-10-30 19:26:11 +08:00
Zefa Chen
368a33796a include: uapi: rkcif-config.h: add cmd RKCIF_CMD_SET_QUICK_STREAM
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib6bd9116605ea8feb9cc0826cc2c5c359aa91b08
2023-10-30 19:26:11 +08:00
Zefa Chen
6a556c2b9e media: rockchip: vicap: resume/suspend with rtt
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic45894930f97eb8b4e32fc202630f88a5f6e67be
2023-10-30 19:26:11 +08:00
Mingwei Yan
a253fe656c media: rockchip: vicap fix online stop switch mode to rdbk
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: Icf19cdfaeada77a781fb32e1e97fc8f6965af249
2023-10-30 19:26:11 +08:00
Zefa Chen
534dc2d08b media: rockchip: vicap support capture raw online with only one buffer
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I6e4be9633798c3c666dbc36221acbbf3d5df0c35
2023-10-30 19:26:11 +08:00
Zefa Chen
af37f2152d media: rockchip: vicap fixes suspend/resume
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I1d7e7d8f521fca3bda4f3599a7b34233e1a94bc2
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
2023-10-30 19:26:11 +08:00
Zefa Chen
f331648b74 phy: rockchip: mipi csidphy fixed register of write/read out of range
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I1ba4ce5ff225b41db988b9df1198345b760be330
2023-10-30 19:22:54 +08:00
Zhen Chen
71c9ade488 Mali: bifrost: log: Add task_comm of contexts in OOM notification log
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: Ib6cfebe6eeafc10e69a5a9e7b206c208dd8bf1de
2023-10-30 19:22:17 +08:00
Zhen Chen
8a98ecb28e Mali: bifrost: log: Add pid and task_comm of contexts in the info read from node "gpu_memory"
The output of "cat /sys/kernel/debug/mali0/gpu_memory" would look like:
<dev>                <pages>
mali0                  13312
  <kctx>                  <comm>               <pid>         <pages>
  kctx-0x0000000000000000 system_server        609              1653
  kctx-0x0000000000000000 droid.launcher3      1042             1636
  kctx-0x0000000000000000 ndroid.systemui      802              5859
  kctx-0x0000000000000000 ndroid.settings      915              1566
  kctx-0x0000000000000000 surfaceflinger       310              2590

Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: Ifc8e4a49cc00aff54feacc1fbcdacf3af255e0a1
2023-10-30 19:22:17 +08:00
Jianlong Wang
61578b7113 arm64: configs: px30_linux_defconfig: enable CONFIG_DRM_IGNORE_IOTCL_PERMIT
Allow the DRM ignore some permission issues.

Change-Id: Id0b5287001bdb3ee91a97cfd58ef93fe2c3fc829
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
2023-10-30 19:20:06 +08:00
Wang Panzhenzhuan
80ef6aeac0 phy: rockchip: mipi-dcphy: fix null point cause reboot issue
In camera preview state, press the power button to standby,
then press the power button immediately to wake up,
machine will reboot, so fix it.

Call trace:
 samsung_mipi_dcphy_power_on+0x68/0xc80 [phy_rockchip_samsung_dcphy]
 phy_power_on+0xa4/0x124
 dw_mipi_dsi2_pre_enable+0x350/0x364 [rockchipdrm]
 dw_mipi_dsi2_encoder_atomic_enable+0x308/0x3d0 [rockchipdrm]
 drm_atomic_helper_commit_modeset_enables+0x158/0x2ec
 rockchip_drm_atomic_helper_commit_tail_rpm+0x50/0x2f8 [rockchipdrm]
 commit_tail+0xbc/0x170
 drm_atomic_helper_commit+0x1f4/0x218
 drm_atomic_commit+0xbc/0xec
 drm_mode_atomic_ioctl+0x59c/0x70c
 drm_ioctl_kernel+0xf8/0x184
 drm_ioctl+0x2cc/0x528
 __arm64_sys_ioctl+0xa8/0xe4
 invoke_syscall+0x58/0x11c
 el0_svc_common+0xb4/0xf4
 do_el0_svc+0x2c/0xb0
 el0_svc+0x2c/0xa4
 el0t_64_sync_handler+0x68/0xb4
 el0t_64_sync+0x1a0/0x1a4
Code: 95d7b2de b9408a68 34000b48 f9403e76 (f9407ad4)
---[ end trace 0000000000000000 ]---

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Ie15e7cef29821683731d56ff5c4ceb924e340bb5
2023-10-30 19:19:39 +08:00
Steven Liu
42f4aa0733 BACKPORT: pinctrl: rockchip: fix reading pull type on rk3568
When reading pinconf-pins from debugfs it fails to get the configured pull
type on RK3568, "unsupported pinctrl type" error messages is also reported.

Fix this by adding support for RK3568 in rockchip_get_pull, including a
reverse of the pull-up value swap applied in rockchip_set_pull so that
pull-up is correctly reported in pinconf-pins.
Also update the workaround comment to reflect affected pins, GPIO0_D3-D6.

Fixes: c0dadc0e47 ("pinctrl: rockchip: add support for rk3568")
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Jianqun Xu <jay.xu@rock-chips.com>
Link: https://lore.kernel.org/r/20230110172955.1258840-1-jonas@kwiboo.se
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit f8ac5467e1)
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I8c6a115f1c6c62b734f76487a0ace63f4bc43743
2023-10-30 19:17:37 +08:00
Sugar Zhang
3433a51018 ASoC: rockchip: sai: Use DMC-DVFS-SCENE for HBR audio
This patch Use DMC-DVFS-SCENE policy for High Bitrate Audio.

Ref: commit 5f0eb1c57240 ("ASoC: rockchip: Introduce rockchip utils common API")

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I58a34020fabbddd7f47a5831b3a33c6f81118fe1
2023-10-30 19:09:51 +08:00
Sugar Zhang
a4f964d7fc ASoC: rockchip: i2s: Use DMC-DVFS-SCENE for HBR audio
This patch Use DMC-DVFS-SCENE policy for High Bitrate Audio.

Ref: commit 5f0eb1c57240 ("ASoC: rockchip: Introduce rockchip utils common API")

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I9492fa993b6095f53f253615304ec445ac9cb53f
2023-10-30 19:09:51 +08:00
Sugar Zhang
adb52b6600 ASoC: rockchip: i2s-tdm: Use DMC-DVFS-SCENE for HBR audio
This patch Use DMC-DVFS-SCENE policy for High Bitrate Audio.

Ref: commit 5f0eb1c57240 ("ASoC: rockchip: Introduce rockchip utils common API")

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I9b919a8b2ebc85400eafb4229cd9f70b2df2bd9b
2023-10-30 19:09:51 +08:00
Sugar Zhang
ff0c025724 ASoC: rockchip: Introduce rockchip utils common API
At the monment, we add utils_get/put_performance for
DMC-DVFS-SCENE policy.

Ref: commit cae65d78f0 ("ASoC: rockchip: i2s-tdm: Add support for FIFO-XRUN detection")

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I188e5cfff960aa3679db5c3a8ee847d9c7b685ee
2023-10-30 19:09:51 +08:00
Jon Lin
a1a5a0fa34 mtd: spinand: xtx: Support new device XT26G0xDWSIGA
XT26G01DWSIGA, XT26G02DWSIGA, XT26G04DWSIGA

Change-Id: I5dbe2f881c47a700ff777dea1fcaf4ebe092749c
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-10-30 11:41:35 +08:00
YouMin Chen
cbe4303f6c PM / devfreq: rockchip_dmc: support get dmcfreq stall time
Signed-off-by: YouMin Chen <cym@rock-chips.com>
Change-Id: I73117550a9ec237a54f22d8967962bf1ceb43947
2023-10-30 10:04:49 +08:00
Bin Yang
e797ca0abf ANDROID: usb: gadget: fix cannot create multiple android instances
Cannot use android_device to get multiple android instances.
The cdev will not be freed by the set_gadget_data(gadget, NULL),
so we can do not use the spinlock of gadget item to prevent
the condition.

Bug: 298603473
Fixes: dd139186ef ("ANDROID: usb: gadget: fix NULL pointer dereference in android_setup")
Signed-off-by: William Wu <william.wu@rock-chips.com>
Signed-off-by: Bin Yang <yangbin@rock-chips.com>
Change-Id: Ic0c72971051401d218e2eba75c40194933290e16
2023-10-30 09:44:40 +08:00
Xiao Ya peng
059a18f32f misc: rockchip: pcie-rkep: Support clear id for pcie_rkep_release
Signed-off-by: Xiao Ya peng <yp.xiao@rock-chips.com>
Change-Id: I23d02919d3838eafd4be76724d3ea9db3a2da965
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-10-26 20:14:42 +08:00
Jon Lin
60ba25a544 misc: rockchip: pcie-rkep: Support raising ep elbi int by ioctl
Change-Id: I7612cb5ca5cd892065dbdb398c4f57f73fb00aa0
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-10-26 20:14:42 +08:00
Jon Lin
60c4612d62 misc: rockchip: pcie-rkep: Support adding virtual id by ioctl
Change-Id: I020ca781ac684caa5fe1c066c1e4b2a65d4891a5
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-10-26 20:14:42 +08:00
Huibin Hong
62e3d6fad9 serial: 8250_dma: fix bug when tx dma is enable
When three threads run on three different cpu, and write
60 byte to the same uart at the same time, which causes
the data loss. After test, it is caused by DMA bursts 16 byte
when the fifo is more than 48 byte(fifo total 64 byte).
It is solved by clearing the uart dma request before start
dma tx.

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I4e2099337e25e41a34ceeb9ea774a04cc7c71f07
2023-10-26 15:44:59 +08:00
Luo Wei
af4866c003 arm64: dts: rockchip: rk3588-vehicle-evb: improve lcd init of serdes display
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I469146f063f9e0a2e91c177b3362750991ce5792
2023-10-26 11:14:23 +08:00
Luo Wei
3cd649f4fc mfd: display-serdes: add soft reset and delay control support
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I6dbafb9788295040834224812f5e013b2583d5c8
2023-10-26 11:14:00 +08:00
KaiHui Huang
f89300e921 ARM: configs: rockchip: update rv1106-wakeup.config
1. enabled sc200ai
2. disabled ethernet

Change-Id: I4dcecda2d590f1e87160be7934494d0fc5092bc9
Signed-off-by: KaiHui Huang <jkand.huang@rock-chips.com>
2023-10-25 15:37:53 +08:00
KaiHui Huang
faa1f2e639 ARM: dts: rockchip: update rv1106g-evb2-v12-wakeup
1. add sc200ai
2. set clk_gate.always_on=0
3. disabled wireless_wlan
4. disabled acodec

Change-Id: Icf9ad78152b667f0d2de5f29434d6ecc36e29323
Signed-off-by: KaiHui Huang <jkand.huang@rock-chips.com>
2023-10-25 15:37:30 +08:00
Cai YiWei
d27dad663d media: rockchip: isp: fix rv1106 resume no output
Change-Id: Ia18ce862426e351156263efded7af9e4d0e17ae6
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-10-24 19:26:46 +08:00
Shuangjie Lin
8c5ed12dfe driver: rknpu: Fixing deadlock issue with spin_lock in interrupt handling
Signed-off-by: Shuangjie Lin <shuangjie.lin@rock-chips.com>
Change-Id: I14a57c43aeb56110f58fe4d902f03604a9983d05
2023-10-24 19:26:01 +08:00
Sugar Zhang
7a85c8d028 ASoC: rockchip: multi-dais: Add support for hw_free
This patch add support for hw_free which is paired to
hw_params.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Iaddffe89212bd734dcd3fc8de38c7ff3b2abe652
2023-10-24 19:17:55 +08:00
Sugar Zhang
867ca7d3a1 ASoC: rockchip: multi-dais: Skip the zero-channel sub dais
Should skip the dais which mapped as zero channel.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I875f6dc6795b8cfed5abffcaf849fb52b729d5a3
2023-10-24 19:17:55 +08:00
Sugar Zhang
3a023c6d36 ASoC: rockchip: multicodec: Fix error path handle
This patch fix error path handle and also clean the
log message.

Change-Id: Id361bc2b0765371b80937ef1437f649c70e948ed
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2023-10-24 19:17:55 +08:00
William Wu
f54b2342b6 phy: rockchip: naneng-usb2: manage vup_gpio in suspend and resume
The vup_gpio is in output high by default when
system enter suspend, this may cause gpio leakage
current 0.7mA. So we need to set the vup_gpio to
output low when enter pm suspend, and set it to
output high on pm resume.

Note that if the usb gadget needs to support
remote wakeup on suspend, we should add the
property "wakeup-source" in the u2phy0 node
to avoid manage the vup_gpio in suspend and
resume.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Id7cbcc100d4e946d561b85eba1defe51f115745d
2023-10-24 19:13:45 +08:00
Finley Xiao
6966d650e6 dt-bindings: power: add binding for rk3562 power domains
Add binding documentation for the power domains
found on Rockchip RK3562 SoCs.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I755b753bb08aab5a9c2b1ee8784f762a8bdf368a
2023-10-24 19:11:34 +08:00
Finley Xiao
6971f2340a arm64: dts: rockchip: rk3562: Add pm_shaping for power domains
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ica858de158bdda637dc43fb759611fdfb7a54cfe
2023-10-24 19:11:12 +08:00
Finley Xiao
3f281f5f4b soc: rockchip: power-domain: Add support to save and restore shaping
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I4a35688658a91aa5aff16f9e2466993526966057
2023-10-24 18:59:07 +08:00
Zhang Yubing
624ca942fb drm/rockchip: vop2: enable vp0 dclk for deassert hdmi1/edp1 mux in rk3588
In RK3588 VOP, HDMI1/eDP1 MUX1 module's reset signal should be
released when PD_VOP turn on. If this reset signal is not be
released, the HDMI1 or eDP1 output interface can't work normally.

However, If the deassert signal want to transfer to HDMI1/eDP1
MUX1 and take effect, it need the video port0 dclk's source clk
work a few moment.

In some cases, the video port0 dclk's source clk is disabled(now
only the hdmi0/1 phy pll as the dclk source parent will appear)
after PD_VOP turn on, for example, vidoe port0 dclk source select
hdmi phy pll. To fix this issue, enable video port0 dclk for a
few monent when active a video port which attach to eDP1/HDMI1.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I45d69eb06d8336caf92debb70d17f12b06c1eccf
2023-10-23 17:56:20 +08:00
Jon Lin
d6b22873d8 misc: rockchip: pcie-rkep: Support ioctl PCIE_EP_DMA_XFER_BLOCK
1. Support ioctl PCIE_EP_DMA_XFER_BLOCK
2. Support dma_debug

Change-Id: I1d3e19bafcc9daf4d36e15cd089b2fd0ef45c3c2
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-10-23 17:31:49 +08:00
Jon Lin
cf533b4e57 PCI: rockchip: dw: Export DMA transmission interface
1.Export DMA transmission interface from dmatest to kernel
2.Export ioctl DMA transmission interface from kernel to userspace

Change-Id: Icd129e23747d5f3ec386c6de9371711a07ee7965
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-10-23 17:31:49 +08:00
Jon Lin
db3e6bd550 PCI: rockchip: dw: Support dma_debug for DMA debug
Change-Id: Ia7b0392675f62fcbd9ba4e2205c55cd78dc9fa65
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-10-23 17:31:49 +08:00
Damon Ding
dfe5e67967 arm64: dts: rockchip: rk3566 evb: add edp panel phy size config
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Iab72170b9666735e357c071932644665c0375644
2023-10-23 17:11:04 +08:00
Damon Ding
579acc89ba arm64: dts: rockchip: rk3288 evb: add edp panel phy size config
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Idf47b4f968acdb2b3a50bf299000402757dce0bc
2023-10-23 17:11:04 +08:00
Damon Ding
df6b640ae7 arm64: dts: rockchip: rk3399 evb: add edp panel phy size config
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I6efa84d28c133aacbf4071acd3bde73bd89f89c3
2023-10-23 17:11:04 +08:00
Damon Ding
6cb697030f arm64: dts: rockchip: rk3588 evb: fix edp panel phy size config
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I662c270c962e0ca2f45b083968639a724d5dc4fb
2023-10-23 17:11:04 +08:00
Sugar Zhang
5161642ed5 ASoC: rockchip: multi-dais: Fix error path handle
This patch handle for err path and throw readable log
message for better debug.

Change-Id: I02aaf3fbedb56dfa0ff72966fa7489f28b50e436
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2023-10-23 16:41:12 +08:00
Sandy Huang
3b2bfc0efa arm64: dts: rockchip: rk3562 evb: add mipi panel phy size config
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Id3f7c93f573da779f1c7bc7fa2127932242eb69e
2023-10-20 15:39:59 +08:00