Commit e63a1653 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull phy updates from Vinod Koul:
 "A fairly moderate sized request for the generic phy subsystem with
  some new device and driver support along with driver updates with
  Samsung and Qualcomm ones being major ones.

  New HW Support:

   - Qualcomm X1P42100 PCIe Gen4x4, QCS615 qmp usbc, PCIe UNIPHY 28LP
     driver, SM8750 QMP UFS PHY

   - Rockchip rk3576 hdptx, rk3562 naneng-combo support

   - Samsung MIPI D-/C-PHY driver, ExynosAutov920 ufs phy driver

  Updates:

   - Samsung USB3 Type-C lane orientation detection and configuration
     for Google gs101

   - Qualcomm support for dual lane PHY support for QCS8300 SoC"

* tag 'phy-for-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy: (47 commits)
  phy: rockchip-naneng-combo: Support rk3562
  dt-bindings: phy: rockchip: Add rk3562 naneng-combophy compatible
  phy: rockchip: Add Samsung MIPI D-/C-PHY driver
  dt-bindings: phy: Add Rockchip MIPI C-/D-PHY schema
  phy: qcom: uniphy-28lp: add COMMON_CLK dependency
  phy: rockchip: usbdp: Remove unnecessary bool conversion
  phy: rockchip: usbdp: Avoid call hpd_event_trigger in dp_phy_init
  phy: rockchip: usbdp: Only verify link rates/lanes/voltage when the corresponding set flags are set
  phy: qcom-qmp-pcie: add dual lane PHY support for QCS8300
  dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Document the QCS8300 QMP PCIe PHY Gen4 x2
  phy: qcom-qmp-ufs: Add PHY Configuration support for sm8750
  dt-bindings: phy: qcom,sc8280xp-qmp-ufs-phy: document the SM8750 QMP UFS PHY
  phy: qcom: Introduce PCIe UNIPHY 28LP driver
  dt-bindings: phy: qcom,uniphy-pcie: Document PCIe uniphy
  phy: qcom: qmp-usbc: Add qmp configuration for QCS615
  phy: freescale: imx8m-pcie: assert phy reset and perst in power off
  phy: freescale: imx8m-pcie: cleanup reset logic
  phy: core: Remove unused phy_pm_runtime_(allow|forbid)
  dt-bindings: phy: document Allwinner A523 USB-2.0 PHY
  phy: phy-rockchip-samsung-hdptx: Add support for RK3576
  ...
parents 4d31167e f13bff25

Documentation/devicetree/bindings/phy/allwinner,sun50i-a64-usb-phy.yaml

+3 −1
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ properties: 
          - allwinner,sun20i-d1-usb-phy

          - allwinner,sun50i-a64-usb-phy

      - items:

          - const: allwinner,sun50i-a100-usb-phy

          - enum:

              - allwinner,sun50i-a100-usb-phy

              - allwinner,sun55i-a523-usb-phy

          - const: allwinner,sun20i-d1-usb-phy



  reg:

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

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

  compatible:

    enum:

      - rockchip,rk3562-naneng-combphy

      - rockchip,rk3568-naneng-combphy

      - rockchip,rk3576-naneng-combphy

      - rockchip,rk3588-naneng-combphy

Documentation/devicetree/bindings/phy/qcom,ipq5332-uniphy-pcie-phy.yaml

0 → 100644
+76 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/phy/qcom,ipq5332-uniphy-pcie-phy.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Qualcomm UNIPHY PCIe 28LP PHY



maintainers:

  - Nitheesh Sekar <quic_nsekar@quicinc.com>

  - Varadarajan Narayanan <quic_varada@quicinc.com>



description:

  PCIe and USB combo PHY found in Qualcomm IPQ5332 SoC



properties:

  compatible:

    enum:

      - qcom,ipq5332-uniphy-pcie-phy



  reg:

    maxItems: 1



  clocks:

    items:

      - description: pcie pipe clock

      - description: pcie ahb clock



  resets:

    items:

      - description: phy reset

      - description: ahb reset

      - description: cfg reset



  "#phy-cells":

    const: 0



  "#clock-cells":

    const: 0



  num-lanes:

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

    enum: [1, 2]



required:

  - compatible

  - reg

  - clocks

  - resets

  - "#phy-cells"

  - "#clock-cells"

  - num-lanes



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/qcom,ipq5332-gcc.h>



    pcie0_phy: phy@4b0000 {

        compatible = "qcom,ipq5332-uniphy-pcie-phy";

        reg = <0x004b0000 0x800>;



        clocks = <&gcc GCC_PCIE3X1_0_PIPE_CLK>,

                 <&gcc GCC_PCIE3X1_PHY_AHB_CLK>;



        resets = <&gcc GCC_PCIE3X1_0_PHY_BCR>,

                 <&gcc GCC_PCIE3X1_PHY_AHB_CLK_ARES>,

                 <&gcc GCC_PCIE3X1_0_PHY_PHY_BCR>;



        #clock-cells = <0>;



        #phy-cells = <0>;



        num-lanes = <1>;

    };

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

+5 −6
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ properties: 
  compatible:

    enum:

      - qcom,qcs615-qmp-gen3x1-pcie-phy

      - qcom,qcs8300-qmp-gen4x2-pcie-phy

      - qcom,sa8775p-qmp-gen4x2-pcie-phy

      - qcom,sa8775p-qmp-gen4x4-pcie-phy

      - qcom,sar2130p-qmp-gen3x2-pcie-phy
@@ -45,6 +46,7 @@ properties: 
      - qcom,x1e80100-qmp-gen4x2-pcie-phy

      - qcom,x1e80100-qmp-gen4x4-pcie-phy

      - qcom,x1e80100-qmp-gen4x8-pcie-phy

      - qcom,x1p42100-qmp-gen4x4-pcie-phy



  reg:

    minItems: 1
@@ -124,6 +126,7 @@ allOf: 
            enum:

              - qcom,sc8280xp-qmp-gen3x4-pcie-phy

              - qcom,x1e80100-qmp-gen4x4-pcie-phy

              - qcom,x1p42100-qmp-gen4x4-pcie-phy

    then:

      properties:

        reg:
@@ -180,6 +183,7 @@ allOf: 
              - qcom,x1e80100-qmp-gen4x2-pcie-phy

              - qcom,x1e80100-qmp-gen4x4-pcie-phy

              - qcom,x1e80100-qmp-gen4x8-pcie-phy

              - qcom,x1p42100-qmp-gen4x4-pcie-phy

    then:

      properties:

        clocks:
@@ -192,6 +196,7 @@ allOf: 
        compatible:

          contains:

            enum:

              - qcom,qcs8300-qmp-gen4x2-pcie-phy

              - qcom,sa8775p-qmp-gen4x2-pcie-phy

              - qcom,sa8775p-qmp-gen4x4-pcie-phy

    then:
@@ -217,12 +222,6 @@ allOf: 
          minItems: 2

        reset-names:

          minItems: 2

    else:

      properties:

        resets:

          maxItems: 1

        reset-names:

          maxItems: 1



  - if:

      properties:

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

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ properties: 
          - qcom,sm8475-qmp-ufs-phy

          - qcom,sm8550-qmp-ufs-phy

          - qcom,sm8650-qmp-ufs-phy

          - qcom,sm8750-qmp-ufs-phy



  reg:

    maxItems: 1
@@ -111,6 +112,7 @@ allOf: 
              - qcom,sm8475-qmp-ufs-phy

              - qcom,sm8550-qmp-ufs-phy

              - qcom,sm8650-qmp-ufs-phy

              - qcom,sm8750-qmp-ufs-phy

    then:

      properties:

        clocks: