Commit 1d1ba4d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 58b65f6d bdb97897

Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ properties: 
    description:

      Adjust TX de-emphasis attenuation in dB at nominal

      3.5dB point as per USB specification

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 36

Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.yaml

+7 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ maintainers: 
properties:

  compatible:

    enum:

      - rockchip,rk3528-naneng-combphy

      - rockchip,rk3562-naneng-combphy

      - rockchip,rk3568-naneng-combphy

      - rockchip,rk3576-naneng-combphy
@@ -45,6 +46,9 @@ properties: 
  phy-supply:

    description: Single PHY regulator



  power-domains:

    maxItems: 1



  rockchip,enable-ssc:

    type: boolean

    description:
@@ -105,7 +109,9 @@ allOf: 
      properties:

        compatible:

          contains:

            const: rockchip,rk3588-naneng-combphy

            enum:

              - rockchip,rk3528-naneng-combphy

              - rockchip,rk3588-naneng-combphy

    then:

      properties:

        resets:

Documentation/devicetree/bindings/phy/qcom,edp-phy.yaml

+12 −7
Original line number Diff line number Diff line
@@ -16,13 +16,18 @@ description: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - qcom,sa8775p-edp-phy

          - qcom,sc7280-edp-phy

          - qcom,sc8180x-edp-phy

          - qcom,sc8280xp-dp-phy

          - qcom,sc8280xp-edp-phy

          - qcom,x1e80100-dp-phy

      - items:

          - enum:

              - qcom,qcs8300-edp-phy

          - const: qcom,sa8775p-edp-phy



  reg:

    items:

Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ properties: 
      - qcom,sm8550-qmp-gen4x2-pcie-phy

      - qcom,sm8650-qmp-gen3x2-pcie-phy

      - qcom,sm8650-qmp-gen4x2-pcie-phy

      - qcom,sm8750-qmp-gen3x2-pcie-phy

      - qcom,x1e80100-qmp-gen3x2-pcie-phy

      - qcom,x1e80100-qmp-gen4x2-pcie-phy

      - qcom,x1e80100-qmp-gen4x4-pcie-phy
@@ -164,6 +165,7 @@ allOf: 
              - qcom,sm8550-qmp-gen4x2-pcie-phy

              - qcom,sm8650-qmp-gen3x2-pcie-phy

              - qcom,sm8650-qmp-gen4x2-pcie-phy

              - qcom,sm8750-qmp-gen3x2-pcie-phy

    then:

      properties:

        clocks:

Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml

+3 −4
Original line number Diff line number Diff line
@@ -73,10 +73,8 @@ properties: 
    description:

      See include/dt-bindings/phy/phy-qcom-qmp.h



  orientation-switch:

    description:

      Flag the PHY as possible handler of USB Type-C orientation switching

    type: boolean

  mode-switch: true

  orientation-switch: true



  ports:

    $ref: /schemas/graph.yaml#/properties/ports
@@ -106,6 +104,7 @@ required: 
  - "#phy-cells"



allOf:

  - $ref: /schemas/usb/usb-switch.yaml#

  - if:

      properties:

        compatible: