Commit Graph

1276662 Commits

Author SHA1 Message Date
Vincent Whitchurch
a5a3ea5e45 UPSTREAM: mmc: core: Always reselect card type
We want to allow host caps to be changed dynamically via debugfs, so for
these to have an effect, ensure that the card type reselection is always
applied even if the card is old.

Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com>
Link: https://lore.kernel.org/r/20230929-mmc-caps-v2-1-11a4c2d94f15@axis.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit 6fff35f0335300af81c96326061f3cf3866ba6b8)

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Ie80514ade3b267901818f477d74d91cf7c13e103
2024-11-05 14:55:07 +08:00
Zefa Chen
f3ff83531a phy: rockchip: csi2_dphy/dcphy store resource
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ibd3a285c619c2163b5ca0a69839f4b3f94eedb1e
2024-11-05 14:28:15 +08:00
Zefa Chen
5513b66b7a include: rkcif-config: add commands to ensure frame integrity when using sensor flip
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I849171754c54239cbb15e47311a9eb09d68e727d
2024-11-05 14:25:36 +08:00
LongChang Ma
ea15657253 uapi: rk-camera-module: add camera change setting define
Change-Id: Ia309bfd46eb7757e7de535440765b7aa07d937cf
Signed-off-by: LongChang Ma <chad.ma@rock-chips.com>
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2024-11-05 14:24:56 +08:00
Zefa Chen
3eb4974d82 include: rk-camera-module.h add define of soft sync mode
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I2fc1c45f0f3f6c499e7f9df59633e196b761bd55
2024-11-05 14:24:47 +08:00
LongChang Ma
c193de330f uapi: rk-camera-module: add light control define and cmd
Change-Id: I2e4ded05e7eaee473a0286cdb283a46a8029f8c4
Signed-off-by: LongChang Ma <chad.ma@rock-chips.com>
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2024-11-05 14:24:31 +08:00
LongChang Ma
1db243e2cf uapi: rk-camera-module: add camera standby define
Change-Id: I38dd80f0b73fe25bc808f4f241d7f0b1c3bfa3da
Signed-off-by: LongChang Ma <chad.ma@rock-chips.com>
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2024-11-05 14:24:17 +08:00
Liang Chen
38539dadc2 arm64: dts: rockchip: rk3576 boards: set regulator supply for bus_a72
Change-Id: I8ac143786cbcbfb7b3119722e4cdc753290e0619
Signed-off-by: Liang Chen <cl@rock-chips.com>
2024-11-05 14:22:08 +08:00
Liang Chen
31cb1a05ab arm64: dts: rockchip: rk3576: add bus opp-table for A72
Raise the voltage of bus(vdd_loigc) when A72 is at high
frequency.

Change-Id: I4444eab3a4d97c28c42702624c65d57713b39577
Signed-off-by: Liang Chen <cl@rock-chips.com>
2024-11-05 14:21:03 +08:00
Cai YiWei
bcff29a30f media: rockchip: isp: sync with kernel-5.10
Merge from kernel-5.10
  media: rockchip: isp: fix isp33 unite error for fastboot
  media: rockchip: isp: fix unite mode for fast
  media: rockchip: isp: output stream burst 16 for isp33
  media: rockchip: isp: write burst adjust to 8 for isp33
  media: rockchip: isp: fix free bay3d buf fd to get again fail
  media: rockchip: isp: wait aiq params for isp33 fast
  media: rockchip: isp: fix multi switch to online no work for fast
  media: rockchip: isp: isp33 change input to 4 align
  media: rockchip: isp: fix isp33 multi online resume
  media: rockchip: isp: drop 2 frame if rockit switch resolution
  media: rockchip: isp: disable isp33 dma write gather
  media: rockchip: isp: fix isp33 multi sensor resume
  media: rockchip: isp: isp33 add api to get params
  media: rockchip: isp: fix isp33 unite switch online for fast
  media: rockchip: isp: w3a overflow check for isp33
  media: rockchip: isp: fix isp33 params sram config
  media: rockchip: isp: fix memory leak
  media: rockchip: isp: add sync for multi online mode
  media: rockchip: isp: limit bp crop and scl for isp33
  media: rockchip: isp: fix hold at register irq if mcu still running
  media: rockchip: isp: enable bay3d FST_FRAME if change bypass
  media: rockchip: isp: fix 4k unite effect
  media: rockchip: isp: add api for raw buf cnt and hdr wrap
  media: rockchip: isp: fix resume for multi online mode
  media: rockchip: isp: frame start irq to send dvbm event
  media: rockchip: isp: fix hist for isp33 unite mode
  media: rockchip: isp: fix buf update for multi online mode
  media: rockchip: isp: resume early for isp33
  media: rockchip: isp: fix rd_mode for vicap to send buf
  media: rockchip: isp: fix fast stop no to clean flag
  media: rockchip: isp: fix isp2enc wrap for isp33 fast
  media: rockchip: isp: support online hdr wrap for isp33
  media: rockchip: isp: support unite online for isp33
  media: rockchip: isp: support two sensor online for isp33
  media: rockchip: isp: support mirror for wrap mode
  media: rockchip: isp: more mode for vicap to isp
  media: rockchip: isp: add isp2enc frame count to rockit
  media: rockchip: isp: add rv1103b config
  media: rockchip: isp: add isp33
  media: rockchip: isp: fix rockit switch resolution
  media: rockchip: isp: fix params buffersize for tb case
  media: rockchip: isp: fix isp32 bp no output if suspend
  media: rockchip: isp: rockit buf add offset

Change-Id: I7d3720165e9fb045e88be34c2f58fe83c0f700bc
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-11-05 10:01:36 +08:00
Andy Yan
4d9d171391 Revert "phy: Add support for INNO MIPI D-PHY"
This reverts commit 35a788ded3.
This driver is unused since linux 5.10, drop it.

Change-Id: I5cafde24e924034ed9daed37f64c2bf370603732
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2024-11-04 20:26:14 +08:00
Sugar Zhang
3f8d95174b dmaengine: Add support for rockchip dma
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ib37e0188b26b9212b1f48aebb903709c0e20843d
2024-11-04 20:22:07 +08:00
Tao Huang
15d421f84d MALI: bifrost: Fix hibernation
Fix following panic after hibernation resume on rk3588:

[    8.170297][ T2089] Restarting tasks ... done.
[    8.183038][ T2089] PM: hibernation: hibernation exit
...
[   10.056856][  T391] rockchip-pm-domain fd8d8000.power-management:power-controller: failed to get ack on domain 'gpu', target_idle = 0, target_ack = 0, val=0x9ff1
[   10.056912][  T391] Kernel panic - not syncing: panic_on_set_idle set ...
[   10.058770][  T391] CPU: 7 PID: 391 Comm: mali-gpuq-kthre Tainted: G           O       6.1.99 #5
[   10.059554][  T391] Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
[   10.060169][  T391] Call trace:
[   10.060462][  T391]  dump_backtrace+0xf4/0x114
[   10.060887][  T391]  show_stack+0x18/0x24
[   10.061262][  T391]  dump_stack_lvl+0x6c/0x90
[   10.061678][  T391]  dump_stack+0x18/0x38
[   10.062053][  T391]  panic+0x14c/0x340
[   10.062402][  T391]  rockchip_pmu_set_idle_request+0x274/0x278
[   10.062931][  T391]  rockchip_pd_power+0x1a8/0x350
[   10.063371][  T391]  rockchip_pd_power_on+0x24/0x30
[   10.063811][  T391]  genpd_power_on+0x1d4/0x2ec
[   10.064229][  T391]  genpd_runtime_resume+0xb0/0x384
[   10.064689][  T391]  __rpm_callback+0x7c/0x3c8
[   10.065096][  T391]  rpm_resume+0x404/0x5cc
[   10.065477][  T391]  __pm_runtime_resume+0x4c/0x90
[   10.065916][  T391]  rk_pm_callback_power_on+0x16c/0x278
[   10.066407][  T391]  kbase_pm_clock_on+0x110/0x3a8
[   10.066852][  T391]  kbase_pm_do_poweron+0x20/0x68
[   10.067293][  T391]  kbase_pm_update_active+0x90/0x1c8
[   10.067762][  T391]  kbase_hwaccess_pm_gpu_active+0x10/0x1c
[   10.068264][  T391]  kbase_pm_context_active_handle_suspend_locked+0x8c/0x1a0
[   10.068906][  T391]  scheduler_pm_active_handle_suspend+0x6c/0x100
[   10.069473][  T391]  scheduler_wakeup+0x4c/0x1ac
[   10.069898][  T391]  kbase_csf_scheduler_queue_start+0x330/0x710
[   10.070451][  T391]  kbase_csf_process_queue_kick+0x58/0x1b0
[   10.070969][  T391]  kbase_csf_scheduler_kthread+0x9d4/0x13ec
[   10.071499][  T391]  kthread+0xec/0x1b8
[   10.071860][  T391]  ret_from_fork+0x10/0x20

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I416e38313c633c22e4c6675ddf68ce348b4f63e9
2024-11-04 20:17:47 +08:00
Yu Qiaowei
263734a862 video: rockchip: rga3: Add drv_shutdown callback
Need to reset hardware when driver exits.

Update driver version to 1.3.6

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I4c6cb394a1339cf689d2d0d011d5df3fb24f0425
2024-11-04 16:13:50 +08:00
Yu Qiaowei
b430f82a6f video: rockchip: rga3: fix irq_handler crash when hardware reset
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Iee7f20510172fc89c6640503926584a982d2837c
2024-11-04 16:13:50 +08:00
Andy Yan
4ada27f283 drm/rockchip: Add log for iommu map/unmap
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Ieefd2e6e113da45cfdfe9578ab5580d16402c3d6
2024-11-04 11:33:19 +08:00
Andy Yan
d233408e36 drm/rockchip: Add rockchip_drm_dbg_thread_info() function
Support print thread info.

Change-Id: I56111c8bb438ad354553276881d74fc7a6186340
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2024-11-04 11:32:13 +08:00
Andy Yan
593488826a drm/rockchip: omit \n when call rockchip_drm_dbg()
trace(TP_printk) will add \n by it's self.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Idcc0bbd801053222fbf67085cc218596f7d6c84e
2024-11-04 11:29:51 +08:00
Andy Yan
5366dcae7d drm/rockchip: Add tracepoints
Enable:
  echo 1 > sys/kernel/tracing/tracing_on
  echo 1 > sys/kernel/tracing/events/rockchipdrm/enable
  echo 8192  > sys/kernel/tracing/buffer_size_kb
  cat /sys/kernel/tracing/trace

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Ib3936d6093cb6dcb3a19ee5f74867be1f4befa94
2024-11-04 11:22:27 +08:00
Shawn Lin
50fa63ad68 PCI: dw: rockchip: Disable RC's BAR into rk_pcie_host_config()
To fix the unnecessary RC's bar allocation warning:

[    2.226288] pci 0000:00:00.0: BAR 0: no space for [mem size 0x40000000]
[    2.226305] pci 0000:00:00.0: BAR 0: failed to assign [mem size 0x40000000]
[    2.226317] pci 0000:00:00.0: BAR 1: no space for [mem size 0x40000000]
[    2.226327] pci 0000:00:00.0: BAR 1: failed to assign [mem size 0x40000000]

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I617cfa3408115d7c73190c6b9816d48ae82a37c8
2024-11-01 18:07:00 +08:00
Lin Jianhua
6c008c1038 ARM: dts: rockchip: Add rk3506b-test2-v10
Change-Id: Id370a1fe3bb8a407b60c684463910960f253b90c
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
2024-11-01 16:06:30 +08:00
Jon Lin
7f790a5cf3 spi: rockchip-sfc: Add rockchip,rk3506-fspi compatible
Change-Id: I61f67209b25e1917e656c1c8faa6241df58478b2
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2024-11-01 15:20:18 +08:00
Jon Lin
89b9a1cfda ARM: dts: rockchip: rk3502: Change rockchip,fspi to rockchip,rk3506-fspi
Change-Id: I22453b6b6992176bdc12a7ceab5071d529f25a37
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2024-11-01 15:19:51 +08:00
Jon Lin
65f8dd5090 dt-bindings: spi: rockchip-sfc: Add rockchip,rk3506-fspi compatible
Change-Id: I43c4f32607f073d8a70d469e2eced2738978de52
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2024-11-01 14:32:36 +08:00
Zhihuan He
6ce3e83a23 clk: rockchip: rk3588: add PCLK_DDR_MON_CH for ddr monitor
Change-Id: I822ca44539a675cd35c9979fd14654463c80ba3d
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
2024-10-31 19:13:10 +08:00
Zhihuan He
827bf4adc0 clk: rockchip: rk3576: add PCLK_DDR_MON_CH for ddr monitor
Change-Id: I2239f6d96d144f7a314a7df2fd2fe60477464233
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
2024-10-31 19:13:10 +08:00
Zhihuan He
dfb8a71ba3 PM / devfreq: rockchip-dfi: add dfi pclk management
In the most of the time, the pclk of dfi is turned off. The pclk is only
enabled when the result is retrieved for power saving.

Change-Id: I040a87e0b146694874b15dce3b23e4ddc5e86c1e
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
2024-10-31 19:12:58 +08:00
Zhihuan He
12c5f9d83b arm64: dts: rockchip: rk3588s: add pclk for dfi
Change-Id: Icf2bc60fcdf7aa044440812102f88cee9a8d0981
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
2024-10-31 19:12:34 +08:00
Zhihuan He
2a0b40b049 arm64: dts: rockchip: rk3576: add pclk for dfi
Change-Id: I604750114a6c891bbe6db9d9b1727127a67b4c1d
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
2024-10-31 19:12:27 +08:00
Zhihuan He
2435985bc8 dt-bindings: clock: rk3576: add PCLK_DDR_MON define
Change-Id: I6d6e61df45859ade8c33f2619dc20435dda9f6cf
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
2024-10-31 19:12:15 +08:00
Zhihuan He
0722b19d8f dt-bindings: clock: rk3588: add PCLK_DDR_MON define
Change-Id: I9b85696bae7ce349b85c384b8630c75ad8a779fd
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
2024-10-31 19:11:47 +08:00
Wu Liangqing
7d639ea892 arm64: dts: rockchip: add rk3576-tablet-v11
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: I5e6c76e97171e2a88680f7e3734137dac9bac30a
2024-10-30 18:27:00 +08:00
Shawn Lin
3f8577c27e ARM: dts: rockchip: rk3506-pinctrl: Set sdmmc Io to pullup state
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I03a1b50e67ee7710f36e995bfbe0414ab70c0149
2024-10-30 09:48:31 +08:00
Shengfei Xu
21ae02a8df arm64: dts: rockchip: rk3576-rk806/tablet: Add the shutdown sequence for rk806
Change-Id: I5f8a50a529dd94af660c5dd642d2a6401178a009
Signed-off-by: Shengfei Xu <xsf@rock-chips.com>
2024-10-29 18:01:23 +08:00
Shengfei Xu
b2dcf7ae10 mfd: rk806: config the power off sequence
Configure the power-off timing of each power supply of the PMIC
during normal shutdown through the "shutdown-sequence".
Configure the power-off timing of each power supply of PMIC
during low power forced shutdown through "vb-shutdown-sequence".
Press the RESET button in sleep mode, and the PMIC will power down
and then power on. The PMIC's power on sequence follows
the power on sequence.

Change-Id: Iebd0ea604fe5419dcead8fa75ade1402cabf7461
Signed-off-by: Shengfei Xu <xsf@rock-chips.com>
2024-10-29 18:00:33 +08:00
Shengfei Xu
a3f03c79ff mfd: rk806: Low power triggered system forced shutdown
Change-Id: I38b7592525d81aa09672362208d7f5bc53539b4e
Signed-off-by: Shengfei Xu <xsf@rock-chips.com>
2024-10-29 18:00:33 +08:00
Jon Lin
5da753e40a arm64: dts: rockchip: rk3576: Add PD_SDGMAC to fspi1/flexbus/dsmc
Change-Id: Ifcd32623540b58c166e619224127b0409f5f41cc
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2024-10-29 17:19:59 +08:00
Frank Wang
6448d1eec8 usb: typec: fusb302: set src current to default 80uA
The FUSB302B failed to detect sink devices from SRC_UNATTACHED state
with SRC 180 uA CC current setting, the TCPM and FUSB302 logs like
the below and FUSB302B has no further action.

[   72.229911] fusb302 IRQ: 0x21, a: 0x00, b: 0x00, status0: 0x23:
[   72.229993] fusb302 IRQ: COMP_CHNG, comp=true:
[   72.230212] fusb302 cc1=Open, cc2=Open:
[   72.230265] tcpm CC1: 2 -> 0, CC2: 0 -> 0 [state SRC_ATTACH_WAIT, polarity 0, disconnected]:
[   72.230306] tcpm state change SRC_ATTACH_WAIT -> SRC_UNATTACHED [rev3 NONE_AMS]:
[   72.230345] tcpm Start toggling:
[   72.237430] fusb302 start drp toggling:

The vendor said that FUSB302B was designed with 80uA for sink
detection which means it can only guarantee FUSB302B will works well
with that setting, so amend the SRC CC current at toggling to fix it.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: Iefeb7dd20c03c04832ac82d43cc4f8d9edccbcc6
2024-10-29 17:05:36 +08:00
Jon Lin
7f84caccd0 PCI: dw: rockchip: Define IO and Host initialization interfaces
Change-Id: I3491ee22e216d009aee2613de4b6f276c2154a72
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2024-10-29 17:04:37 +08:00
Jon Lin
c37dff4abe PCI: dw: rockchip: Unified PCIe initialization process
Change-Id: Ia564bc5e2063b05c0eeeb99527e5253f610308f6
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2024-10-29 17:04:37 +08:00
Jon Lin
652b60a98e PCI: dw: rockchip: Move PCIE_CLIENT_INTR_MASK to configuration process.
Change-Id: Id90ddc7c1280e8f01974380d5d2ebebbe12bec67
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2024-10-29 17:04:37 +08:00
Jon Lin
f4df5925fe PCI: dw: rockchip: Split phy resource initialization and phy initialization
Change-Id: I3d4b7f4137aa938d3621742b231aee9461f322b2
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2024-10-29 17:04:37 +08:00
Jason Zhu
e27115aa16 ASoC: codecs: rk_dsm: fix audio aliasing
Set the dsm registers default value so that they can not be changed
as zero with regmap interface.

Change-Id: I1788fe2cabcb65ba09964a79d2fe20c057924839
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2024-10-29 16:31:06 +08:00
Shunhua Lan
4bfb13e85d media: rockchip: hdmirx: fix audio fifo underflow or overflow when working for audio with high jitter
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: Ibf4dc35997e742119aaae28a9a4deb4bcdf65b7e
2024-10-29 16:30:44 +08:00
Shunhua Lan
fdea02a3ef media: rockchip: hdmirx: use the closest fs for audio instead of invalid
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I833d7f9834965189f23adda7f5219b5ec5711ea2
2024-10-29 16:30:35 +08:00
Shunhua Lan
fa24640896 media: i2c: rk628: fix audio fifo underflow or overflow when working for audio with high jitter
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I418d691381f6f8c389a190ac96a2587b0e2f22fd
2024-10-28 16:18:20 +08:00
Shunhua Lan
71bb2b36f6 media: i2c: rk628: repair cts n interrupt loss
Change-Id: I9603a1733555b535f0542ca6677e9cb27647a399
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
2024-10-28 16:17:24 +08:00
Shunhua Lan
b328bd0f78 ASoC: codecs: rk730: add coeff configurations for different audio fs and mclk
Change-Id: Ic9ee8eab87417b9946c97bf01789b6bcb9cd0ff0
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
2024-10-28 16:14:32 +08:00
Shunhua Lan
07dbb4735c ASoC: codecs: rk730: do soft reset in rk730_reset
The patch fix no sound when hot rebooting because of registers value mismatch

Change-Id: I6c9b040b3cd025c4e27c391e0f539505e747aaa7
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
2024-10-28 16:14:32 +08:00
Luo Wei
427cd6dd82 mfd: display-serdes: improve drivers about these case
1.set lcd low level before set high level
2.set label for lock&err gpio and irq
3.add monitor function for serdes important register

Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I6e0ee19de04dec87fd356a6f5cb046612bec3451
2024-10-28 14:18:32 +08:00