Files
linux-rockchip/include/linux/phy
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
..