From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 Oct 2025 17:34:22 +0000 (-0700)
Subject: Merge tag 'phy-for-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy
X-Git-Tag: v6.18-rc1~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d1ba4d390141d602dbce8f5f0ac19a384d10a64;p=thirdparty%2Fkernel%2Fstable.git

Merge tag 'phy-for-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy

Pull phy updates from Vinod Koul:
 "The usual bunch of device support and update to drivers.

  New Support
   - Qualcomm SM8750 QMP PCIe PHY dual lane support, PMIV0104 eusb2
     repeater support, QCS8300 eDP PHY support
   - Renesas RZ/T2H and RZ/N2H support and updates to driver for that
   - TI TCAN1051 phy support
   - Rockchip rk3588 dphy support, RK3528 combphy support

  Updates:
   - cadence updates for calibration and polling for ready and enabling
     of lower resolutions, runtime pm support,
   - Rockchip: enable U3 otg port
   - Renesas USXGMII mode support
   - Qualcomm UFS PHY and PLL regulator load support"

* tag 'phy-for-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy: (64 commits)
  phy: rockchip: phy-rockchip-inno-csidphy: add support for rk3588 variant
  phy: rockchip: phy-rockchip-inno-csidphy: allow for different reset lines
  phy: rockchip: phy-rockchip-inno-csidphy: allow writes to grf register 0
  dt-bindings: phy: rockchip-inno-csi-dphy: add rk3588 variant
  dt-bindings: phy: rockchip-inno-csi-dphy: make power-domains non-required
  phy: cadence: cdns-dphy: Enable lower resolutions in dphy
  phy: renesas: r8a779f0-ether-serdes: add new step added to latest datasheet
  phy: renesas: r8a779f0-ether-serdes: add USXGMII mode
  phy: sophgo: Add USB 2.0 PHY driver for Sophgo CV18XX/SG200X
  dt-bindings: phy: Add Sophgo CV1800 USB phy
  phy: cadence: cdns-dphy: Update calibration wait time for startup state machine
  phy: cadence: cdns-dphy: Fix PLL lock and O_CMN_READY polling
  phy: renesas: rcar-gen3-usb2: Fix ID check logic with VBUS valid
  dt-bindings: phy: ti,tcan104x-can: Document TI TCAN1051
  phy: lynx-28g: check return value when calling lynx_28g_pll_get
  phy: qcom: m31-eusb2: Fix the error log while enabling clock
  phy: rockchip: usbdp: Remove redundant ternary operators
  phy: renesas: rcar-gen3-usb2: Remove redundant ternary operators
  phy: hisilicon: Remove redundant ternary operators
  phy: qcom-qmp-ufs: Add PHY and PLL regulator load
  ...
---

1d1ba4d390141d602dbce8f5f0ac19a384d10a64
diff --cc drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c
index 8fcbc312fd616,3629b926108ab..651a12b59bc8c
--- a/drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c
+++ b/drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c
@@@ -133,9 -141,12 +141,12 @@@ static int eusb2_repeater_init(struct p
  	if (!of_property_read_u8(np, "qcom,tune-usb2-disc-thres", &val))
  		regmap_write(regmap, base + EUSB2_TUNE_HSDISC, val);
  
 -	if (!of_property_read_u8(np, "qcom,tune-usb2-preem", &val))
 +	if (!of_property_read_u8(np, "qcom,tune-usb2-amplitude", &val))
  		regmap_write(regmap, base + EUSB2_TUNE_IUSB2, val);
  
+ 	if (!of_property_read_u8(np, "qcom,tune-res-fsdif", &val))
+ 		regmap_write(regmap, base + EUSB2_TUNE_RES_FSDIF, val);
+ 
  	/* Wait for status OK */
  	ret = regmap_read_poll_timeout(regmap, base + EUSB2_RPTR_STATUS, poll_val,
  				       poll_val & RPTR_OK, 10, 5);