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

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

Pull phy updates from Vinod Koul:
 "As usual a couple of new drivers, a bunch of new device support and
  few updates to existing drivers

  New Support:
   - Starfive dphy rx, JH7110 usb and pcie support
   - Rockchip rv1126 inno-dsi phy, rk3588 usb and pcie support
   - Qualcomm sa8775p PCIe support, M31 USB PHY driver
   - Samsung Exynos850 usb support

  Updates:
   - Mediatek dsi driver clock updates
   - Qualcomm sm8150 combo phy with reworking of qmp pcie driver
   - Xilinx zynqmp runtime PM support"

* tag 'phy-for-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy: (83 commits)
  phy: exynos5-usbdrd: Add Exynos850 support
  phy: exynos5-usbdrd: Add 26MHz ref clk support
  phy: exynos5-usbdrd: Make it possible to pass custom phy ops
  dt-bindings: phy: samsung,usb3-drd-phy: Add Exynos850 support
  phy: qcom-qmp-combo: fix clock probing
  phy: qcom-qmp-pcie: support SM8150 PCIe QMP PHYs
  phy: qcom-qmp-pcie: populate offsets configuration
  phy: qcom-qmp-pcie: simplify clock handling
  phy: qcom-qmp-pcie: keep offset tables sorted
  phy: qcom-qmp-pcie: drop ln_shrd from v5_20 config
  dt-bindings: phy: qcom,qmp-pcie: describe SM8150 PCIe PHYs
  dt-bindings: phy: migrate QMP PCIe PHY bindings to qcom,sc8280xp-qmp-pcie-phy.yaml
  phy: fsl-imx8mq-usb: add dev_err_probe if getting vbus failed
  phy: qcom: Introduce M31 USB PHY driver
  dt-bindings: phy: qcom,m31: Document qcom,m31 USB phy
  phy: rockchip: inno-dsidphy: Add rv1126 support
  dt-bindings: phy: rockchip-inno-dsidphy: Document rv1126
  dt-bindings: phy: mediatek,tphy: allow simple nodename pattern
  phy: amlogic: meson-g12a-usb2: fix Wvoid-pointer-to-enum-cast warning
  phy: marvell pxa-usb: fix Wvoid-pointer-to-enum-cast warning
  ...
parents 6e32dfcc 69152507

Documentation/devicetree/bindings/phy/mediatek,tphy.yaml

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ description: | 


properties:

  $nodename:

    pattern: "^t-phy@[0-9a-f]+$"

    pattern: "^t-phy(@[0-9a-f]+)?$"



  compatible:

    oneOf:

Documentation/devicetree/bindings/phy/qcom,ipq5332-usb-hsphy.yaml

0 → 100644
+59 −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-usb-hsphy.yaml#

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



title: M31 USB PHY



maintainers:

  - Sricharan Ramabadhran <quic_srichara@quicinc.com>

  - Varadarajan Narayanan <quic_varada@quicinc.com>



description:

  USB M31 PHY (https://www.m31tech.com) found in Qualcomm

  IPQ5018, IPQ5332 SoCs.



properties:

  compatible:

    items:

      - const: qcom,ipq5332-usb-hsphy



  "#phy-cells":

    const: 0



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  clock-names:

    items:

      - const: cfg_ahb



  resets:

    maxItems: 1



  vdd-supply:

    description:

      Phandle to 5V regulator supply to PHY digital circuit.



additionalProperties: false



examples:

  - |

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

    usb-phy@7b000 {

        compatible = "qcom,ipq5332-usb-hsphy";

        reg = <0x0007b000 0x12c>;



        clocks = <&gcc GCC_USB0_PHY_CFG_AHB_CLK>;

        clock-names = "cfg_ahb";



        #phy-cells = <0>;



        resets = <&gcc GCC_QUSB2_0_PHY_BCR>;



        vdd-supply = <&regulator_fixed_5p0>;

    };

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

+35 −243
Original line number Diff line number Diff line
@@ -13,77 +13,33 @@ description: 
  QMP PHY controller supports physical layer functionality for a number of

  controllers on Qualcomm chipsets, such as, PCIe, UFS, and USB.



  Note that these bindings are for SoCs up to SC8180X. For newer SoCs, see

  qcom,sc8280xp-qmp-pcie-phy.yaml.



properties:

  compatible:

    enum:

      - qcom,ipq6018-qmp-pcie-phy

      - qcom,ipq8074-qmp-gen3-pcie-phy

      - qcom,ipq8074-qmp-pcie-phy

      - qcom,msm8998-qmp-pcie-phy

      - qcom,sc8180x-qmp-pcie-phy

      - qcom,sdm845-qhp-pcie-phy

      - qcom,sdm845-qmp-pcie-phy

      - qcom,sdx55-qmp-pcie-phy

      - qcom,sm8250-qmp-gen3x1-pcie-phy

      - qcom,sm8250-qmp-gen3x2-pcie-phy

      - qcom,sm8250-qmp-modem-pcie-phy

      - qcom,sm8450-qmp-gen3x1-pcie-phy

      - qcom,sm8450-qmp-gen4x2-pcie-phy



  reg:

    items:

      - description: serdes



  "#address-cells":

    enum: [ 1, 2 ]



  "#size-cells":

    enum: [ 1, 2 ]



  ranges: true



  clocks:

    minItems: 2

    maxItems: 4

    maxItems: 3



  clock-names:

    minItems: 2

    maxItems: 4

    items:

      - const: aux

      - const: cfg_ahb

      - const: pipe



  resets:

    minItems: 1

    maxItems: 2



  reset-names:

    minItems: 1

    maxItems: 2



  vdda-phy-supply: true



  vdda-pll-supply: true



  vddp-ref-clk-supply: true



patternProperties:

  "^phy@[0-9a-f]+$":

    type: object

    description: single PHY-provider child node

    properties:

      reg:

        minItems: 3

        maxItems: 6



      clocks:

    items:

          - description: PIPE clock



      clock-names:

        deprecated: true

        items:

          - const: pipe0

      - const: phy

      - const: common



  "#clock-cells":

    const: 0
@@ -94,206 +50,42 @@ patternProperties: 
  "#phy-cells":

    const: 0



    required:

      - reg

      - clocks

      - "#clock-cells"

      - clock-output-names

      - "#phy-cells"



    additionalProperties: false



required:

  - compatible

  - reg

  - "#address-cells"

  - "#size-cells"

  - ranges

  - clocks

  - clock-names

  - resets

  - reset-names

  - "#clock-cells"

  - clock-output-names

  - "#phy-cells"



additionalProperties: false



allOf:

  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,msm8998-qmp-pcie-phy

    then:

      properties:

        clocks:

          maxItems: 3

        clock-names:

          items:

            - const: aux

            - const: cfg_ahb

            - const: ref

        resets:

          maxItems: 2

        reset-names:

          items:

            - const: phy

            - const: common

      required:

        - vdda-phy-supply

        - vdda-pll-supply



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,ipq6018-qmp-pcie-phy

              - qcom,ipq8074-qmp-gen3-pcie-phy

              - qcom,ipq8074-qmp-pcie-phy

    then:

      properties:

        clocks:

          maxItems: 2

        clock-names:

          items:

            - const: aux

            - const: cfg_ahb

        resets:

          maxItems: 2

        reset-names:

          items:

            - const: phy

            - const: common



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sc8180x-qmp-pcie-phy

              - qcom,sdm845-qhp-pcie-phy

              - qcom,sdm845-qmp-pcie-phy

              - qcom,sdx55-qmp-pcie-phy

              - qcom,sm8250-qmp-gen3x1-pcie-phy

              - qcom,sm8250-qmp-gen3x2-pcie-phy

              - qcom,sm8250-qmp-modem-pcie-phy

              - qcom,sm8450-qmp-gen3x1-pcie-phy

              - qcom,sm8450-qmp-gen4x2-pcie-phy

    then:

      properties:

        clocks:

          maxItems: 4

        clock-names:

          items:

            - const: aux

            - const: cfg_ahb

            - const: ref

            - const: refgen

        resets:

          maxItems: 1

        reset-names:

          items:

            - const: phy

      required:

        - vdda-phy-supply

        - vdda-pll-supply



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sc8180x-qmp-pcie-phy

              - qcom,sm8250-qmp-gen3x2-pcie-phy

              - qcom,sm8250-qmp-modem-pcie-phy

              - qcom,sm8450-qmp-gen4x2-pcie-phy

    then:

      patternProperties:

        "^phy@[0-9a-f]+$":

          properties:

            reg:

              items:

                - description: TX lane 1

                - description: RX lane 1

                - description: PCS

                - description: TX lane 2

                - description: RX lane 2

                - description: PCS_MISC



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sdm845-qmp-pcie-phy

              - qcom,sdx55-qmp-pcie-phy

              - qcom,sm8250-qmp-gen3x1-pcie-phy

              - qcom,sm8450-qmp-gen3x1-pcie-phy

    then:

      patternProperties:

        "^phy@[0-9a-f]+$":

          properties:

            reg:

              items:

                - description: TX

                - description: RX

                - description: PCS

                - description: PCS_MISC



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,ipq6018-qmp-pcie-phy

              - qcom,ipq8074-qmp-pcie-phy

              - qcom,msm8998-qmp-pcie-phy

              - qcom,sdm845-qhp-pcie-phy

    then:

      patternProperties:

        "^phy@[0-9a-f]+$":

          properties:

            reg:

              items:

                - description: TX

                - description: RX

                - description: PCS



examples:

  - |

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

    phy-wrapper@1c0e000 {

        compatible = "qcom,sm8250-qmp-gen3x2-pcie-phy";

        reg = <0x01c0e000 0x1c0>;

        #address-cells = <1>;

        #size-cells = <1>;

        ranges = <0x0 0x01c0e000 0x1000>;



        clocks = <&gcc GCC_PCIE_PHY_AUX_CLK>,

                 <&gcc GCC_PCIE_1_CFG_AHB_CLK>,

                 <&gcc GCC_PCIE_WIGIG_CLKREF_EN>,

                 <&gcc GCC_PCIE1_PHY_REFGEN_CLK>;

        clock-names = "aux", "cfg_ahb", "ref", "refgen";



        resets = <&gcc GCC_PCIE_1_PHY_BCR>;

        reset-names = "phy";

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

    #include <dt-bindings/reset/qcom,gcc-ipq6018.h>



        vdda-phy-supply = <&vreg_l10c_0p88>;

        vdda-pll-supply = <&vreg_l6b_1p2>;

    phy@84000 {

        compatible = "qcom,ipq6018-qmp-pcie-phy";

        reg = <0x0 0x00084000 0x0 0x1000>;



        phy@200 {

            reg = <0x200 0x170>,

                  <0x400 0x200>,

                  <0xa00 0x1f0>,

                  <0x600 0x170>,

                  <0x800 0x200>,

                  <0xe00 0xf4>;



            clocks = <&gcc GCC_PCIE_1_PIPE_CLK>;

        clocks = <&gcc GCC_PCIE0_AUX_CLK>,

                 <&gcc GCC_PCIE0_AHB_CLK>,

                 <&gcc GCC_PCIE0_PIPE_CLK>;

        clock-names = "aux",

                      "cfg_ahb",

                      "pipe";



        clock-output-names = "gcc_pcie0_pipe_clk_src";

        #clock-cells = <0>;

            clock-output-names = "pcie_1_pipe_clk";



        #phy-cells = <0>;

        };



        resets = <&gcc GCC_PCIE0_PHY_BCR>,

                 <&gcc GCC_PCIE0PHY_PHY_BCR>;

        reset-names = "phy",

                      "common";

    };

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

deleted100644 → 0
+0 −228
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,msm8996-qmp-ufs-phy.yaml#

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



title: Qualcomm QMP PHY controller (UFS, MSM8996)



maintainers:

  - Vinod Koul <vkoul@kernel.org>



description:

  QMP PHY controller supports physical layer functionality for a number of

  controllers on Qualcomm chipsets, such as, PCIe, UFS, and USB.



  Note that these bindings are for SoCs up to SC8180X. For newer SoCs, see

  qcom,sc8280xp-qmp-ufs-phy.yaml.



properties:

  compatible:

    enum:

      - qcom,msm8996-qmp-ufs-phy

      - qcom,msm8998-qmp-ufs-phy

      - qcom,sc8180x-qmp-ufs-phy

      - qcom,sdm845-qmp-ufs-phy

      - qcom,sm6115-qmp-ufs-phy

      - qcom,sm6350-qmp-ufs-phy

      - qcom,sm8150-qmp-ufs-phy

      - qcom,sm8250-qmp-ufs-phy

      - qcom,sm8350-qmp-ufs-phy

      - qcom,sm8450-qmp-ufs-phy



  reg:

    items:

      - description: serdes



  "#address-cells":

    enum: [ 1, 2 ]



  "#size-cells":

    enum: [ 1, 2 ]



  ranges: true



  clocks:

    minItems: 1

    maxItems: 3



  clock-names:

    minItems: 1

    maxItems: 3



  power-domains:

    maxItems: 1



  resets:

    maxItems: 1



  reset-names:

    items:

      - const: ufsphy



  vdda-phy-supply: true



  vdda-pll-supply: true



  vddp-ref-clk-supply: true



patternProperties:

  "^phy@[0-9a-f]+$":

    type: object

    description: single PHY-provider child node

    properties:

      reg:

        minItems: 3

        maxItems: 6



      "#clock-cells":

        const: 1



      "#phy-cells":

        const: 0



    required:

      - reg

      - "#phy-cells"



    additionalProperties: false



required:

  - compatible

  - reg

  - "#address-cells"

  - "#size-cells"

  - ranges

  - clocks

  - clock-names

  - resets

  - reset-names

  - vdda-phy-supply

  - vdda-pll-supply



additionalProperties: false



allOf:

  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,msm8996-qmp-ufs-phy

    then:

      properties:

        clocks:

          maxItems: 1

        clock-names:

          items:

            - const: ref



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,msm8998-qmp-ufs-phy

              - qcom,sc8180x-qmp-ufs-phy

              - qcom,sdm845-qmp-ufs-phy

              - qcom,sm6115-qmp-ufs-phy

              - qcom,sm6350-qmp-ufs-phy

              - qcom,sm8150-qmp-ufs-phy

              - qcom,sm8250-qmp-ufs-phy

    then:

      properties:

        clocks:

          maxItems: 2

        clock-names:

          items:

            - const: ref

            - const: ref_aux



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sm8450-qmp-ufs-phy

    then:

      properties:

        clocks:

          maxItems: 3

        clock-names:

          items:

            - const: ref

            - const: ref_aux

            - const: qref



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,msm8998-qmp-ufs-phy

              - qcom,sc8180x-qmp-ufs-phy

              - qcom,sdm845-qmp-ufs-phy

              - qcom,sm6350-qmp-ufs-phy

              - qcom,sm8150-qmp-ufs-phy

              - qcom,sm8250-qmp-ufs-phy

              - qcom,sm8350-qmp-ufs-phy

              - qcom,sm8450-qmp-ufs-phy

    then:

      patternProperties:

        "^phy@[0-9a-f]+$":

          properties:

            reg:

              items:

                - description: TX lane 1

                - description: RX lane 1

                - description: PCS

                - description: TX lane 2

                - description: RX lane 2



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,msm8996-qmp-ufs-phy

              - qcom,sm6115-qmp-ufs-phy

    then:

      patternProperties:

        "^phy@[0-9a-f]+$":

          properties:

            reg:

              items:

                - description: TX

                - description: RX

                - description: PCS



examples:

  - |

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

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



    phy-wrapper@1d87000 {

        compatible = "qcom,sm8250-qmp-ufs-phy";

        reg = <0x01d87000 0x1c0>;

        #address-cells = <1>;

        #size-cells = <1>;

        ranges = <0x0 0x01d87000 0x1000>;



        clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;

        clock-names = "ref", "ref_aux";



        resets = <&ufs_mem_hc 0>;

        reset-names = "ufsphy";



        vdda-phy-supply = <&vreg_l6b>;

        vdda-pll-supply = <&vreg_l3b>;



        phy@400 {

            reg = <0x400 0x108>,

                  <0x600 0x1e0>,

                  <0xc00 0x1dc>,

                  <0x800 0x108>,

                  <0xa00 0x1e0>;

            #phy-cells = <0>;

        };

    };

Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml

+0 −80
Original line number Diff line number Diff line
@@ -23,25 +23,16 @@ properties: 
      - qcom,ipq8074-qmp-usb3-phy

      - qcom,msm8996-qmp-usb3-phy

      - qcom,msm8998-qmp-usb3-phy

      - qcom,sc7180-qmp-usb3-phy

      - qcom,sc8180x-qmp-usb3-phy

      - qcom,sdm845-qmp-usb3-phy

      - qcom,sdm845-qmp-usb3-uni-phy

      - qcom,sdx55-qmp-usb3-uni-phy

      - qcom,sdx65-qmp-usb3-uni-phy

      - qcom,sm8150-qmp-usb3-phy

      - qcom,sm8150-qmp-usb3-uni-phy

      - qcom,sm8250-qmp-usb3-phy

      - qcom,sm8250-qmp-usb3-uni-phy

      - qcom,sm8350-qmp-usb3-phy

      - qcom,sm8350-qmp-usb3-uni-phy

      - qcom,sm8450-qmp-usb3-phy



  reg:

    minItems: 1

    items:

      - description: serdes

      - description: DP_COM



  "#address-cells":

    enum: [ 1, 2 ]
@@ -126,28 +117,6 @@ required: 
additionalProperties: false



allOf:

  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sc7180-qmp-usb3-phy

    then:

      properties:

        clocks:

          maxItems: 4

        clock-names:

          items:

            - const: aux

            - const: cfg_ahb

            - const: ref

            - const: com_aux

        resets:

          maxItems: 1

        reset-names:

          items:

            - const: phy



  - if:

      properties:

        compatible:
@@ -202,7 +171,6 @@ allOf: 
        compatible:

          contains:

            enum:

              - qcom,sm8150-qmp-usb3-phy

              - qcom,sm8150-qmp-usb3-uni-phy

              - qcom,sm8250-qmp-usb3-uni-phy

              - qcom,sm8350-qmp-usb3-uni-phy
@@ -223,51 +191,6 @@ allOf: 
            - const: phy

            - const: common



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sm8250-qmp-usb3-phy

              - qcom,sm8350-qmp-usb3-phy

    then:

      properties:

        clocks:

          maxItems: 3

        clock-names:

          items:

            - const: aux

            - const: ref_clk_src

            - const: com_aux

        resets:

          maxItems: 2

        reset-names:

          items:

            - const: phy

            - const: common



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sdm845-qmp-usb3-phy

              - qcom,sm8150-qmp-usb3-phy

              - qcom,sm8350-qmp-usb3-phy

              - qcom,sm8450-qmp-usb3-phy

    then:

      patternProperties:

        "^phy@[0-9a-f]+$":

          properties:

            reg:

              items:

                - description: TX lane 1

                - description: RX lane 1

                - description: PCS

                - description: TX lane 2

                - description: RX lane 2

                - description: PCS_MISC



  - if:

      properties:

        compatible:
@@ -293,12 +216,9 @@ allOf: 
            enum:

              - qcom,ipq6018-qmp-usb3-phy

              - qcom,ipq8074-qmp-usb3-phy

              - qcom,sc7180-qmp-usb3-phy

              - qcom,sc8180x-qmp-usb3-phy

              - qcom,sdx55-qmp-usb3-uni-phy

              - qcom,sdx65-qmp-usb3-uni-phy

              - qcom,sm8150-qmp-usb3-uni-phy

              - qcom,sm8250-qmp-usb3-phy

    then:

      patternProperties:

        "^phy@[0-9a-f]+$":