Commit Graph

1255664 Commits

Author SHA1 Message Date
William Wu
48ada284da arm64: dts: rockchip: disable hs park mode for usb dwc3 controller
Some high speed devices performance drop drastically on
Rockchip platforms when connected with DWC3-xHCI controller.
It's because that the DWC3 controller enable high speed
park mode by default, it aims to improve performance with
pipelining of multiple packet. However, for some devices
(such as UVC with bulk transfer VID:04b4, PID:02f9),
when an IN request is sent within 900ns of the ACK of the
previous packet, these devices NAKs more than 3 times, it
could decrease the performance.

These slow devices include:
1. idVendor=04b4, idProduct=02f9, Product: IRay UVC
2. idVendor=1921, idProduct=21863, Product: Sandisk
3. idVendor=3744, idProduct=8552, Manufacturer: Flex Drive

In order to improve compatibility with high speed devices,
this patch disable HS park mode for USB DWC3 controller on
all arm64 SoCs.

With this patch, we test RK3588 with one slow device
(IRay UVC VID:04b4, PID:02f9) and three fast devices
(U2 disk VID:058f, PID:6387; U2 disk VID:0781, PID:557c;
 U3 disk VID:174c, PID:55aa), all of these device have
no performance loss.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I9037143fa2553317ad7ae55abeafad3b106cafcb
2023-08-28 18:49:58 +08:00
Stanley Chang
659382f7b2 UPSTREAM: usb: dwc3: core: add support for disabling High-speed park mode
Setting the PARKMODE_DISABLE_HS bit in the DWC3_USB3_GUCTL1.
When this bit is set to '1' all HS bus instances in park mode are disabled

For some USB wifi devices, if enable this feature it will reduce the
performance. Therefore, add an option for disabling HS park mode by
device-tree.

In Synopsys's dwc3 data book:
In a few high speed devices when an IN request is sent within 900ns of the
ACK of the previous packet, these devices send a NAK. When connected to
these devices, if required, the software can disable the park mode if you
see performance drop in your system. When park mode is disabled,
pipelining of multiple packet is disabled and instead one packet at a time
is requested by the scheduler. This allows up to 12 NAKs in a micro-frame
and improves performance of these slow devices.

Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Signed-off-by: Stanley Chang <stanley_chang@realtek.com>
Link: https://lore.kernel.org/r/20230419020044.15475-1-stanley_chang@realtek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: William Wu <william.wu@rock-chips.com>
(cherry-pick from commit d21a797a3e)
Change-Id: I43ee416e54779a073a0ba4057edf4be8bd7886de
2023-08-28 15:23:30 +08:00
Tao Huang
2ac88d9452 Merge commit 'c75ca4c58355785b2f447af5d2268e2828a04936'
* commit 'c75ca4c58355785b2f447af5d2268e2828a04936':
  spi: rockchip: Add spi thread priority configuration
  arm64: dts: rockchip: rk3588-vehicle change the format of car_rk3308_sound to tdm8
  ARM: dts: rockchip: add rv1106g-evb2-v12-wakeup.dts
  media: rockchip: isp: add lock to save tb info
  media: rockchip: isp: remove __isp_config_hdrshd

Change-Id: Ibe92af7ebb1ebbe422935c651ab739a7949a7208
2023-08-28 15:15:50 +08:00
Tao Huang
163a323d97 Merge commit 'c2a9ac0f236c4a28eca11325a6c8653194a5c0fa'
* commit 'c2a9ac0f236c4a28eca11325a6c8653194a5c0fa':
  media: i2c: add sc1346 support

Ignore:
commit c2a9ac0f23 ("media: i2c: add sc1346 support")

Change-Id: I5d3a5e11f2ec11d76980a4617cdc566f33c3120b
2023-08-28 15:06:57 +08:00
Lin Jinhan
6346396f72 media: i2c: add sc1346 support
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I21f6e1ac11850666fb56960af6ef9d13c5907ba4
2023-08-28 15:05:03 +08:00
Tao Huang
89b7aba8b7 Merge commit '9f27599976115c76a15c488938bde23527d49d5b'
* commit '9f27599976115c76a15c488938bde23527d49d5b': (22 commits)
  ARM: dts: rockchip: disable rv1103g battery ipc dvfs
  arm64: dts: rockchip: rk3588s-evb2-lp5: fix usb2.0-only
  video: rockchip: mpp: fix access null task issue
  ASoC: rockchip: pdm: Fix register access in probe
  ASoC: rockchip: i2s: Fix register access in probe
  PCI: rockchip: dw: fix compliance mode set
  mtd: spinand: Enable HWP_EN for skyhigh devices
  mtd: spinand: esmt: Support new device F50L2G41KA
  arm64: dts: rockchip: rk3528: Set default value with level2 for spi
  ARM: configs: add rk3308bs_aarch32_mipi_display.config for rk3308bs support mipi display
  ARM: rockchip: rv1106: sleep: support hpmcu fast wakeup
  ARM: rockchip: Locate kernel at 0x00208000 for RV1106 when CONFIG_RV1106_HPMCU_FAST_WAKEUP=y
  ARM: configs: rockchip: add rv1106-wakeup.config
  ARM: rockchip: support RV1106_HPMCU_FAST_WAKEUP config
  arm64: dts: rockchip: rk3308-evb: add rgb display board
  media: rockchip: vicap fixes crop sync error
  mtd: spinand: xtx: Support new device XT26Q04DWSIGA
  mtd: spinand: gigadevcie: Add 3rd flash id for GD5F1GQ5RExxG
  mtd: spinand: xtx: Support new device XT26Q02DWSIGA and XT26Q01DWSIGA
  mtd: spinand: dosilicon: Support new device DS35Q1GD-IB
  ...

Change-Id: I955f35e70228e9e91ca10d562293e6b6125f3584
2023-08-28 14:59:14 +08:00
Tao Huang
90f459cbf0 Merge commit 'd0e6f8a073819af4aae92ac6c323ade172587b6f' into develop-6.1
* commit 'd0e6f8a073819af4aae92ac6c323ade172587b6f':
  phy: rockchip: naneng-combphy: fix U3 RX long cable test failed for RK3528

Ignore:
commit d0e6f8a073 ("phy: rockchip: naneng-combphy: fix U3 RX long cable test failed for RK3528")

Change-Id: Iaef9ed93902fd7a02b792db9f5fcc1d319518c00
2023-08-28 14:58:00 +08:00
Jianwei Zheng
863c95ebe8 phy: rockchip: naneng-combphy: fix U3 RX long cable test failed for RK3528
1.Set slow slew rate control for PI
2.Set CDR phase path with 2x gain

Signed-off-by: Jianwei Zheng <jianwei.zheng@rock-chips.com>
Change-Id: I2d0811b0be7b1d4764ecd738d069b06e4da5eaa2
2023-08-25 19:42:00 +08:00
Tao Huang
fe72550de7 Merge commit 'b59d476403227ad73526d5886b9cd208b80cc33a'
* commit 'b59d476403227ad73526d5886b9cd208b80cc33a':
  ASoC: rockchip: i2s-tdm: Fix register access in probe

Ignore:
commit b59d476403 (ASoC: rockchip: i2s-tdm: Fix register access in probe)

Change-Id: I2fc616ffd1c7bf51a4298a6f3d247412b8f12146
2023-08-25 19:35:52 +08:00
Sugar Zhang
6752fef5c3 ASoC: rockchip: i2s-tdm: Fix register access in probe
MUST: after pm_runtime_enable step, any register R/W
should be wrapped with pm_runtime_get_sync/put.

Another approach is to enable the regcache true to
avoid access HW registers.

Alternatively, performing the registers R/W before
pm_runtime_enable is also a good option.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I69dd66230cba636d2ccb31ec01a21be1a482a0e3
2023-08-25 19:35:17 +08:00
Tao Huang
d7b9c64e08 Merge commit 'f8a6ea73884dd5aadd827127b35ab56015e1e704'
* commit 'f8a6ea73884dd5aadd827127b35ab56015e1e704':
  ASoC: rockchip: sai: Fix register access in probe
  arm64: dts: rockchip: rk3308: update property logo,kernel
  pwm: rockchip: add a little delay to make sure conlock works
  drm/bridge: synopsys: dw-hdmi-qp: filter hdmi 2.1 resolution when enable-gpio is not configured
  drm/bridge/synopsys: dw-hdmi-qp: fix color error in DVI mode
  ARM: dts: rockchip: support dual sc301iot for rv1106-evb-dual-cam.dtsi
  arm64: dts: rockchip: rk3588-vehicle-adsp-audio-s66: correct i2s3 iomux
  arm64/configs: add rk3308bs_mipi_display.config for support mipi display
  arm64: dts: rockchip: rk3399-evb: use multicodecs instead simple card
  media: rockchip: vicap: fixes create dummuy buffer fail with size 0
  drm/bridge/synopsys: dw-hdmi-qp: Add support for external bridge
  video: rockchip: vehicle: remove vehicle dev when exit

Change-Id: I8094e3496eb3c966e53f0db1f1cdb8d13f95f73b
2023-08-25 19:32:41 +08:00
Tao Huang
be1cf9cf12 Merge commit '02ee7a133ecb4c371d9fbcf3461840cb42bcc43a'
* commit '02ee7a133ecb4c371d9fbcf3461840cb42bcc43a':
  PCIe: dw: rockchip: rework compliance test settings

Ignore:
commit 02ee7a133e ("PCIe: dw: rockchip: rework compliance test settings")

Change-Id: I97a9b17b71bc2cbf5d2772b64e46841b5553f4a7
2023-08-25 19:31:59 +08:00
Shawn Lin
8c31e54896 PCIe: dw: rockchip: rework compliance test settings
There are three types of compliance mode test requirement right
now, consolidate them together:
[1] SMA tool: rockchip,compliance-mode = <0 ANY_VALUE_FROM_0_TO_10>;
[2] Soldered board: rockchip,compliance-mode = <mode preset>;
    mode: 1->Gen1  2->Gen2  3->Gen3
    preset: 0->p0 1->p1 2->p2 .... etc.
[3] lookback: same as SMA tool case

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I180b4881d827e3c2f0fc22f0bab4ca165be44c19
2023-08-25 19:25:39 +08:00
Tao Huang
754d0cafb2 Merge commit '7d42e408908c426339f6a9371bf21920a8190d02'
* commit '7d42e408908c426339f6a9371bf21920a8190d02':
  drm/rockchip: direct_show: add cached buf cpu access begin & end
  media: rockchip: isp: add api get isp work mode for rockit
  media: i2c: rk628: fix 5V detect event report
  media: rockchip: isp: fix refer to sram info for multi sensor
  media: rockchip: isp: fix stream init pause state
  mtd: spinand: xtx: Fix XT26G11C ecc status ops
  net: can: rockchip: support rk3568 can v2

Change-Id: Id0eeeb7b3068ea34475576aefac03c5127aeb0bd
2023-08-25 19:23:45 +08:00
Tao Huang
1f9c423358 Merge commit '46449e5334ffd1b21f1f509e8f4d55240d076581'
* commit '46449e5334ffd1b21f1f509e8f4d55240d076581':
  drm/rockchip: dsi: set vop2 standby before command mode in rk3566/rk3568

Ignore:
commit 46449e5334 ("drm/rockchip: dsi: set vop2 standby before command mode in rk3566/rk3568")

Change-Id: I6af690cd979d61b1fe26fa5614fc4d3521b62cd1
2023-08-25 19:13:35 +08:00
Tao Huang
4ead044ae5 Merge commit 'ec69911288bd488078ce1256e1a580123c9cf1e7'
* commit 'ec69911288bd488078ce1256e1a580123c9cf1e7':
  phy: rockchip: csi2-dphy: fixes hw_dev num error for rk3562
  video: rockchip: mpp: fix share reset_group do not take effect
  arm64: dts: rockchip: update rk3399-sapphire-excavator-lp4-linux.dts
  ARM: dts: rockchip: fix timing configs of panel k350c4516t for rv1103/rv1106 evb
  drm/rockchip: rgb: add mcu_max_dclk_rate for mode_valid check

Change-Id: Ia7b948597178623c8727cfc57c807ce32393ef8b
2023-08-25 19:12:55 +08:00
Tao Huang
37c18c4af3 Merge commit 'ea3b81ee34fda60da9dc5632ae4310aff8b7a9aa'
* commit 'ea3b81ee34fda60da9dc5632ae4310aff8b7a9aa':
  drm/rockchip: drv: fix the dclk calculation of mcu interface

Ignore:
commit ea3b81ee34 ("drm/rockchip: drv: fix the dclk calculation of mcu interface")

Change-Id: Ibfd403e33675bb205c622a7ad7571bcfae665564
2023-08-25 19:09:46 +08:00
Damon Ding
3cb261be89 drm/rockchip: drv: fix the dclk calculation of mcu interface
dclk = htotal * vtotal * frame-rate * cycles-per-pixel * pix-total

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I6b78463dc8290f562cfe44040d6b6030d652213d
2023-08-25 19:05:35 +08:00
Elaine Zhang
1b972f8b2e clk: rockchip: px30: remove dclk_vop_frac
dclk_vop_frac is frac divider with high jitter,
Is unfriendly to vop.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: If6218886fe64182261cf37172c88fcaeea197b22
2023-08-23 16:54:03 +08:00
Finley Xiao
ece05619d3 soc: rockchip: rockchip_system_monitor: Don't init wide temp when tz is NULL
Change-Id: I9e5213f130582fcb7ee1beae7a5200e9d7ff4bf4
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-08-23 10:25:56 +08:00
Finley Xiao
b5b12a0017 soc: rockchip: rockchip_system_monitor: Fix NULL pointer when check rate and volt
Fixes: 389088186f ("soc: rockchip: rockchip_system_monitor: Use new APIs to check rate and volt")
Change-Id: I252146bb541c4de97a0a4c72546842353c712318
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-08-23 10:24:54 +08:00
Finley Xiao
31f5c89615 arm64: dts: rockchip: rk356x: Add trips for gpu thermal node
This patch fixes the below error.

thermal_sys: Failed to find 'trips' node
thermal_sys: Failed to find trip points for tsadc id=1
rockchip-thermal fe710000.tsadc: failed to register sensor 1: -22
rockchip-thermal fe710000.tsadc: failed to register sensor[1] : error = -22
rockchip-thermal: probe of fe710000.tsadc failed with error -22

Change-Id: I13c9be7b63ca33334388c90381de5b16a9d56b48
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-08-23 09:20:28 +08:00
Finley Xiao
e09ca734c7 soc: rockchip: opp_select: Add support to parse 'rockchip,pvtm-voltage-sel-hw'
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I9d8ad8057f5fff32d5cd859b9d6ee71486c61160
2023-08-23 09:20:28 +08:00
Finley Xiao
bd3aeda3e5 soc: rockchip: opp_select: Implement rockchip_set_opp_supported_hw()
This implements new APIs to get soc info and set opp hardware info.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I167a37f661ce6fc8b32afc7768985fe23e35318c
2023-08-23 09:20:28 +08:00
Finley Xiao
b39462754a soc: rockchip: opp_select: Fix uninit opp table error
Fixes: c64369f0e4 ("soc: rockchip: opp_select: Implements new opp APIs for kernel 6.1")
Change-Id: I290ff336a90d36ab2636e6d8e55888b52862308d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2023-08-23 09:20:27 +08:00
Steven Liu
ef6d8c8c3b arm64: dts: rockchip: rk3568: Add arm_pmu label
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Ia2c342e70042e98c3800c5748e8d1f4ad39fbfc3
2023-08-22 21:07:18 +08:00
Guochun Huang
781a1bf608 drm/rockchip: dsi: set vop2 standby before command mode in rk3566/rk3568
Change-Id: I49bd967dfb6c561a7c187cb075ff0192f6caf69a
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2023-08-22 20:54:48 +08:00
Tao Huang
7974b3e21b Merge commit '8405687e7c2caa1b86236d98de602974388942c1'
* commit '8405687e7c2caa1b86236d98de602974388942c1': (22 commits)
  rtc: rockchip: fix up the rtc compensation value
  arm64: dts: rockchip: rk3568-toybrick-sd0: change gmac1 txdelay
  mmc: dw_mmc: Add some safe delay for releasing power leak
  video: rockchip: mpp: fix irq on poweroff for rkvdec2_link
  video: rockchip: mpp: fix reset_group protected range
  arm64: configs: rockchip_defconfig: Enable RT5651 for rk3399 excavator evb
  media: rockchip: hdmirx: fix CTS HF2-86 test fail
  media: i2c: update sc230ai again map
  crypto: rockchip: utils: optimize alignment criteria
  crypto: rockchip: Fixed the timeout timer being triggered incorrectly
  phy/rockchip: samsung-hdptx: make deskew fifo works on shared pointer
  arm64: dts: rockchip: px30: delete dmc 528MHz and en 666MHz ODT
  soc: rockchip: tb_service: fixes the register haven't been handle
  drm/rockchip: drv: fix the config csc data issue
  soc: rockchip: cpuinfo: Add support for rk3528a
  drm/rockchip: dw_hdmi: Fix crash caused by hotplug in uboot
  drm/rockchip: vop2: report vividhdr feature by property
  soc: rockchip: pm_config: support mcu-sleep-config
  arm64: dts: rockchip: rk3308b-amp: support config amp os irqs
  dt-bindings: soc: rockchip: add define for rockchip amp
  ...

Change-Id: Ibb2e8f1112b9787df755aa6aaf3bb28c0c01e8e2

Conflicts:
	drivers/irqchip/irq-gic.c
2023-08-22 20:27:34 +08:00
Tao Huang
cb05cc470c Merge commit '1ccd57c4b028ff3fdf84a9a50d0394bc9dffcd74'
* commit '1ccd57c4b028ff3fdf84a9a50d0394bc9dffcd74':
  arm64: dts: rockchip: rk3588-vehicle-s66-v10 support wifi/bt
  arm64: dts: rockchip: rk3588-vehicle-adsp-audio-s66 fix i2s-tdm
  media: rockchip: isp: fix 3dlut for multi sensor
  arm64: dts: rockchip: rk3528: Add trim configure for tsadc
  thermal: rockchip: Add trim temperature for rk3528
  video: rockchip: rga3: avoid premature wake_up causing request to be freed
  phy: rockchip: usbdp: amend to improve USB compatibility
  mtd: spi-nor: xmc: Support XM25QH256C
  arm64: dts: rockchip: rk3588-vehicle-display-v20: not assign clock for vop
  media: i2c: add os02k10 driver
  ARM: dts: rockchip: rv1106-evb: add mcu display v20 board
  arm64: dts: rockchip: add rk3528 demo6 dts
  video: rockchip: rga3: fix memory mapping will be skipped when handle is 0
  arm64: dts: rockchip: rk3568: Add opps for rk3568j/m

Conflicts:
	arch/arm64/boot/dts/rockchip/rk3568.dtsi
	drivers/media/i2c/Kconfig
	drivers/media/i2c/Makefile
	drivers/mtd/spi-nor/xmc.c

Ignore:
commit 0c5cc59876 ("arm64: dts: rockchip: rk3568: Add opps for rk3568j/m")
commit 724009a9d7 ("mtd: spi-nor: xmc: Support XM25QH256C")

Change-Id: I07a4b82a2dfae98c894cc28af98a4e2eeb1b8006
2023-08-22 20:13:40 +08:00
Jon Lin
8e9b7888a9 mtd: spi-nor: xmc: Support XM25QH256C
Change-Id: I0d1ee1b1615f9d29b472ef5bc8e2ed9aabd86602
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-08-22 20:05:01 +08:00
Liang Chen
b394f92e26 arm64: dts: rockchip: rk3568: Add opps for rk3568j/m
Change-Id: I2e394d1de0dc8d856177a7083b56dc3ac81c5816
Signed-off-by: Liang Chen <cl@rock-chips.com>
2023-08-22 15:27:18 +08:00
Tao Huang
247067d5e2 Merge commit 'fbd35aede4e2c60a1557bd824a4a194893d93695'
* commit 'fbd35aede4e2c60a1557bd824a4a194893d93695':
  cpufreq: rockchip: set supported hw version for opp
  driver: rknpu: Update rknpu driver, version: 0.9.1
  media: i2c: sc301iot: pm runtime put device until stream off for thunderboot
  drm/rockchip: dw-dp: support hdcp key without aes encrypt
  video: rockchip: mpp: fix session cleanup issue
  media: i2c: sc3338 support normal boot
  arm64: dts: rockchip: rk3588-vehicle-evb-v21: change pcie wifi power control
  arm64: dts: rockchip: rk3308bs-evb-mipi-display-v11: reduce drive strength of lcdc d18~23 from 6ma to 2ma
  ARM: dts: rockchip: rv1106g-evb2-v10: correct sc3338 gpio
  phy: rockchip-typec: use phy interface replace global functions
  drm/rockchip: cdn-dp: use phy interface replace global functions
  phy: rockchip-typec: Fix DP lane config

Conflicts:
	drivers/cpufreq/rockchip-cpufreq.c

Ignore:
commit fbd35aede4 ("cpufreq: rockchip: set supported hw version for opp")

Change-Id: Ib0a67c2e034e9863bd8a02a4ee032c3c10971078
2023-08-22 15:03:24 +08:00
Tao Huang
54406c0eb1 Merge commit '6397c9ae572a61003dde39d2563c487bf12a0dc9'
* commit '6397c9ae572a61003dde39d2563c487bf12a0dc9':
  drm/rockchip: cdn-dp: support dp training outside dp firmware
  drm/rockchip: cdn-dp: Avoid drm_dp_link helpers in dp training
  FROMLIST: drm/rockchip: add transfer function for cdn-dp

Conflicts:
	drivers/gpu/drm/rockchip/cdn-dp-core.c
	drivers/gpu/drm/rockchip/cdn-dp-core.h

Ignore:
0aefe26fd9 ("FROMLIST: drm/rockchip: add transfer function for cdn-dp")
99b9c4c771 ("drm/rockchip: cdn-dp: Avoid drm_dp_link helpers in dp training")
6397c9ae57 ("drm/rockchip: cdn-dp: support dp training outside dp firmware")

Change-Id: I1c17714963639b3ea88418ddd8ad43e88327d0ec
2023-08-22 14:42:34 +08:00
Zhang Yubing
ce735d9a2c drm/rockchip: cdn-dp: support dp training outside dp firmware
DP firmware uses fixed phy config values to do training, but some
boards need to adjust these values to fit for their unique hardware
design. So get phy config values from dts and use software link training
instead of relying on firmware, if software training fail, keep firmware
training as a fallback if sw training fails.

Change-Id: I075bff6aa153a5e18b6a5ddec2645131f1411913
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Lin Huang <hl@rock-chips.com>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
2023-08-22 10:33:07 +08:00
Chris Zhong
aa310d2a5e FROMLIST: drm/rockchip: add transfer function for cdn-dp
We may support training outside firmware, so we need support
dpcd read/write to get the message or do some setting with
display.

Change-Id: If89911e6205546df1a5ae8997ea214d5d2a60af6
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Lin Huang <hl@rock-chips.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Enric Balletbo <enric.balletbo@collabora.com>
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
(am from https://patchwork.kernel.org/patch/10420461/)
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
2023-08-22 10:21:54 +08:00
Tao Huang
a9a553deaa Merge commit 'f3eda81058155e669b44cde653b431fb65da1c8a'
* commit 'f3eda81058155e669b44cde653b431fb65da1c8a':
  phy/rockchip: inno-dsidphy: remove duplicate code from inno_dsidphy_mipi_mode_enable()
  media: rockchip: isp: fix drc and hdrmge err for multi sensor
  video: rockchip: mpp: disable usr poll timeout
  media: rockchip: isp: version to v2.2.2
  arm64: dts: rockchip: rk3562: Optimize clk jitter for DAIs
  ASoC: rockchip: sai: Handle clk enable in prepare stage
  ASoC: rockchip: sai: Use generic pm_runtime_force_* for system PM
  drm/rockchip: vop2: add more plane check
  media: i2c: gc1084: add frame synchronization support
  phy: rockchip: csi2-dphy: fixes fwnode parse error of cphy

Conflicts:
	drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
	drivers/phy/rockchip/phy-rockchip-csi2-dphy.c

Ignore:
commit 74bb5a299c ("phy: rockchip: csi2-dphy: fixes fwnode parse error of cphy")
commit 06906b5a73 ("drm/rockchip: vop2: add more plane check")

Change-Id: I211567c8c1eff42ede255e7efd5b3883bc3e668b
2023-08-22 09:40:28 +08:00
Tao Huang
14d459382d drm/panel: maxim-max96772: Fix compilation errors on kernel 6.1
drivers/gpu/drm/panel/panel-maxim-max96772.c:22:10: fatal error: drm/drm_dp_helper.h: No such file or directory
drivers/gpu/drm/panel/panel-maxim-max96772.c:536:19: error: initialization of 'void (*)(struct i2c_client *)' from incompatible pointer type 'int (*)(struct i2c_client *)'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I53cd11e89b92a96e5724db344c86709c2ca414ff
2023-08-21 20:11:23 +08:00
Tao Huang
0fa451f5bc Merge commit '955d8bfa4bbfbaf1f770c9cd86eaf828f82fb470'
* commit '955d8bfa4bbfbaf1f770c9cd86eaf828f82fb470':
  arm64: rockchip_defconfig: Enable CONFIG_DRM_PANEL_MAXIM_MAX96772
  net: wireless: rockchip_wlan: porting infineon driver.
  input: sensor: accel/gyro sensor: support iam20680.
  arm64: dts: rockchip: vehicle-s66: support iam20680.
  media: rockchip: isp: fix repeated reporting statistics if stats video on/off
  mfd: max96755f: lock status and link reg need access directly.
  drm/bridge: maxim-max96755: support dual link mode.
  drm/panel: Add panel driver for Maxim MAX96772 based LCDs
  media: i2c: it6616: modify set ctrl when video stable
  media: i2c: lt6911uxe: modify rk3588_dcphy params

Conflicts:
	drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/Makefile
	drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/dhd_custom_msm.c
	drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/dhd_linux.h
	drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/dhd_linux_platdev.c
	drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/dhd_pcie_linux.c
	drivers/net/wireless/rockchip_wlan/infineon/bcmdhd/wl_cfgvendor.c

Ignore:
commit a748a1bd1c ("net: wireless: rockchip_wlan: porting infineon driver.")

Change-Id: Id9ebcbe2e66b64ed3f64f59bcfed5be42860bc6e
2023-08-21 19:42:41 +08:00
Tao Huang
f08f382946 Merge commit 'a9ed7b93e657b49420dc7c02c3ce9ce810e9b7d3'
* commit 'a9ed7b93e657b49420dc7c02c3ce9ce810e9b7d3':
  media: rockchip: vicap compatible with rk3588s2
  media: rockchip: vicap support combine two mipi to one dev
  phy: rockchip: csi2-dphy: logic node of mipi phy can control all hw of mipi phy

Conflicts:
	drivers/phy/rockchip/phy-rockchip-csi2-dphy.c

Ignore:
commit 08330d500d ("phy: rockchip: csi2-dphy: logic node of mipi phy can control all hw of mipi phy")

Change-Id: Ief48fe16863dc477a183289f9a4c49881d2d2942
2023-08-21 19:31:15 +08:00
Zefa Chen
8642adb339 phy: rockchip: csi2-dphy: logic node of mipi phy can control all hw of mipi phy
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I30cc62cc1d28c4219e9e5c5ccd77fa9f589e63af
2023-08-21 19:27:14 +08:00
Tao Huang
ef9c699e6b Merge commit 'c929ccacbb38fb047ca64ffee41ca4ab43f324eb'
* commit 'c929ccacbb38fb047ca64ffee41ca4ab43f324eb':
  include: rk-camera-module: support get/set capture info
  include: rkcif-config: support set multi csi info
  ARM: dts: rockchip: rv1106 separate the node of csi2 and hw
  ARM: dts: rockchip: rv1126 separate the node of csi2 and hw
  arm64: dts: rockchip: rk1808 separate the node of csi2 and hw
  arm64: dts: rockchip: rk3562 separate hw node of mipi csi2 and mipi dphy
  arm64: dts: rockchip: rk3568 separate the node of csi2 and hw
  arm64: dts: rockchip: rk3588 separate the node of csi2 logic and hw
  arm64: dts: rockchip: rk3588 mipi dphy config modify

Conflicts:
	arch/arm64/boot/dts/rockchip/rk3568.dtsi

Ignore:
commit 841fa2175d ("arm64: dts: rockchip: rk3568 separate the node of csi2 and hw")

Change-Id: If60dc34bbe2d753ff36a3325cb5a648b1f80169d
2023-08-21 19:21:29 +08:00
Zefa Chen
464312fc6c arm64: dts: rockchip: rk3568 separate the node of csi2 and hw
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia3694d29ee53a1ccd46e2e375eed94ce45dcf1fc
2023-08-21 19:14:15 +08:00
Tao Huang
7884ac62b0 Merge commit '9adfbb364a4b3148fcda177fcb780d7a393bfcc5'
* commit '9adfbb364a4b3148fcda177fcb780d7a393bfcc5': (37 commits)
  arm64: dts: rockchip: rk3588s: Add nvmem-cells for rkcif
  arm64: dts: rockchip: rk3588s: Add package serial number for otp
  mms: rk_sdmmc_ops: support resume and suspend
  mms: rk_sdmmc_ops: disabled command queue while execute
  soc: rockchip: sdmmc_vendor_storage: Using multiple blocks of read/write data
  mms: rk_sdmmc_ops: support multi-blocks ops
  phy: rockchip: mipi-dcphy: fix HSTX_CLK_SEL config
  video: rockchip: vehicle: support config rotate & mirror simultaneously
  phy: rockchip: inno-usb2: enable bvalid detect irq upon resume
  arm64: dts: rockchip: rk3588-vehicle: fix lt7911 compatible name error
  drm/rockchip: vop2: only legacy gamma set need extra config done
  drm/rockchip: vop2: update pre_dither_down config
  media: rockchip: vicap support tool video capture raw with rdbk by isp
  usb: typec: tcpm: fix dp altmode negotiation failure
  arm64: dts: rockchip: fix frame rate of mcu panel to 60Hz for rk3308/rk3562 evb
  ARM: dts: rockchip: fix frame rate of mcu panel to 60Hz for rv1103/rv1106 evb
  PCIe: dw: rockchip: Setting rk_pcie_hot_rst_wq before interrupt unmask
  arm64: dts: rockchip: rk3588-vehicle: init s66 project dts files
  ASoC: rockchip: rk817-codec: Solve pop problems cause by re-configure APLL
  media: i2c: optimize gc2053 sync issue
  ...

Conflicts:
	drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
	drivers/media/i2c/Kconfig

Ignore:
commit e2852b6423 ("drm/rockchip: vop2: Fix plane parameter check error at interlace mode")
commit 16b27eed7c ("drm/rockchip: vop2: recover win state when exit psr")
commit 903953ddeb ("drm/rockchip: vop2: update pre_dither_down config")
commit 4056d4ef2c ("drm/rockchip: vop2: only legacy gamma set need extra config done")

Change-Id: Ibc71f27f3e08d5ed047a2643911ba1b021528cfb
2023-08-21 17:16:40 +08:00
Tao Huang
91b91613dc Merge commit '328145662f6d6154fbf4329a0d53f9c152673648'
* commit '328145662f6d6154fbf4329a0d53f9c152673648':
  mtd: spinand: skyhigh: The vendor requires the devices to be patched
  mtd: spinand: foresee: Support new device F35UQA001G-WWT
  mtd: spinand: foresee: Support new device F35UQA002G-WWT
  mtd: spinand: fmsh: Support new device FM25S01BI3
  mtd: spinand: fmsh: Modify incorrect information despite not used
  drm/bridge: analogix_dp: add support split area prop
  drm/rockchip: dsi2: add support split area prop
  drm/rockchip: analogix_dp: support split mode with other display interface
  drm/bridge: analogix_dp: support dual connector with other display interface
  drm/rockchip: dsi2: support split mode with other display interface
  drm/rockchip: drv: Add crtc_clock convert in drm_mode_convert_to_{split,origin}_mode()
  drm/bridge: analogix_dp: mv mode_set to bridge .atomic_pre_enable
  drm/rockchip: dsi2: mv mode set to encoder .atomic_enable

Change-Id: Ie34682a12a9877c582fc95803edcf527ccdae98e

Conflicts:
	drivers/mtd/nand/spi/core.c

Ignore:
commit 328145662f ("mtd: spinand: skyhigh: The vendor requires the devices to be patched")

Change-Id: I5baf8f1296e43b3491994529cb8b4ac1f08b3cf4
2023-08-21 16:47:24 +08:00
Jon Lin
b1fecc211e mtd: spinand: skyhigh: The vendor requires the devices to be patched
1.Double OIP=0 after page 13H
2.The nand flash does not support 84H and 34H command

Change-Id: Ie805f42a36e1a864115988087bdc43592cc94ded
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-08-21 16:42:03 +08:00
Weixin Zhou
c75ca4c583 spi: rockchip: Add spi thread priority configuration
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: Ie66572bb129b7221f4c908869a402db3d229e464
2023-08-16 15:23:39 +08:00
Jun Zeng
0bc5a00c65 arm64: dts: rockchip: rk3588-vehicle change the format of car_rk3308_sound to tdm8
Change-Id: I8ac6e5ffdfe8f00b204265acb0b82d40017621e0
Signed-off-by: Jun Zeng <jun.zeng@rock-chips.com>
2023-08-16 14:18:34 +08:00
LiuDiMing Lin
26bfb0dec0 ARM: dts: rockchip: add rv1106g-evb2-v12-wakeup.dts
Change-Id: Iba82df1d5696ba0c232e5d966c1d43ea129e5f19
Signed-off-by: LiuDiMing Lin <fenrir.lin@rock-chips.com>
2023-08-16 14:17:49 +08:00
Cai YiWei
4ce5cb8b0f media: rockchip: isp: add lock to save tb info
multi sensor share same tb info buf, and this buf will
overwrittern when first sensor stream on but second fast_work
schedule slowly. So to save tb info for all dev at first read.

Change-Id: I335b9e3bd317202a348be17965be112a1259bb3e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-08-15 20:38:54 +08:00
Cai YiWei
3ba7441b0d media: rockchip: isp: remove __isp_config_hdrshd
config store in reg buf, no need to record

Change-Id: I7b789ca514925175daca89528e711d6b61340026
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2023-08-15 20:38:54 +08:00