Commit 5471a812 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'phy-for-5.14_v2' of... 

Merge tag 'phy-for-5.14_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy into char-misc-next

Vinod writes:

phy-for-5.14 version 2

  - Updates:
        - Yaml conversion for renesas,rcar-gen3 pcie phy and
          rockchip-usb-phy bindings
        - Support for devm_phy_get() taking NULL phy name

  - New support:
        - PCIe phy for Qualcomm IPQ60xx
        - PCIe phy for Qualcomm SDX55
        - USB phy for RK3308
        - CAN transceivers phy for TI TCAN104x
        - Innosilicon-based CSI dphy for rockchip

* tag 'phy-for-5.14_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy: (36 commits)
  phy: Revert "phy: ralink: Kconfig: convert mt7621-pci-phy into 'bool'"
  phy: ti: dm816x: Fix the error handling path in 'dm816x_usb_phy_probe()
  phy: uniphier-pcie: Fix updating phy parameters
  phy/rockchip: add Innosilicon-based CSI dphy
  dt-bindings: phy: add yaml binding for rockchip-inno-csi-dphy
  phy: rockchip: remove redundant initialization of pointer cfg
  phy: phy-can-transceiver: Add support for generic CAN transceiver driver
  dt-bindings: phy: Add binding for TI TCAN104x CAN transceivers
  phy: core: Reword the comment specifying the units of max_link_rate to be Mbps
  phy: phy-mtk-hdmi: Remove redundant dev_err call in mtk_hdmi_phy_probe()
  phy: phy-mtk-mipi-dsi: Remove redundant dev_err call in mtk_mipi_tx_probe()
  phy: phy-mmp3-hsic: Remove redundant dev_err call in mmp3_hsic_phy_probe()
  phy: bcm-ns-usb3: Remove redundant dev_err call in bcm_ns_usb3_mdio_probe()
  MAINTAINERS: update marvell,armada-3700-utmi-phy.yaml reference
  phy: phy-twl4030-usb: use DEVICE_ATTR_RO macro
  dt-bindings: phy: convert rockchip-usb-phy.txt to YAML
  phy: phy-rockchip-inno-usb2: add support for RK3308 USB phy
  dt-bindings: phy: rockchip-inno-usb2: add compatible for rk3308 USB phy
  phy: stm32: manage optional vbus regulator on phy_power_on/off
  dt-bindings: phy: add vbus-supply optional property to phy-stm32-usbphyc
  ...
parents f274e296 15692a80

Documentation/devicetree/bindings/pci/qcom,pcie.txt

+24 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
			- "qcom,pcie-qcs404" for qcs404

			- "qcom,pcie-sdm845" for sdm845

			- "qcom,pcie-sm8250" for sm8250

			- "qcom,pcie-ipq6018" for ipq6018



- reg:

	Usage: required
@@ -123,6 +124,16 @@ 
			- "ahb"		AHB clock

			- "aux"		Auxiliary clock



- clock-names:

	Usage: required for ipq6018

	Value type: <stringlist>

	Definition: Should contain the following entries

			- "iface"	PCIe to SysNOC BIU clock

			- "axi_m"	AXI Master clock

			- "axi_s"	AXI Slave clock

			- "axi_bridge"	AXI bridge clock

			- "rchng"



- clock-names:

	Usage: required for qcs404

	Value type: <stringlist>
@@ -209,6 +220,19 @@ 
			- "ahb"			AHB Reset

			- "axi_m_sticky"	AXI Master Sticky reset



- reset-names:

	Usage: required for ipq6018

	Value type: <stringlist>

	Definition: Should contain the following entries

			- "pipe"		PIPE reset

			- "sleep"		Sleep reset

			- "sticky"		Core Sticky reset

			- "axi_m"		AXI Master reset

			- "axi_s"		AXI Slave reset

			- "ahb"			AHB Reset

			- "axi_m_sticky"	AXI Master Sticky reset

			- "axi_s_sticky"	AXI Slave Sticky reset



- reset-names:

	Usage: required for qcs404

	Value type: <stringlist>

Documentation/devicetree/bindings/phy/mediatek,mt7621-pci-phy.yaml

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ properties: 
  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  "#phy-cells":

    const: 1

    description: selects if the phy is dual-ported
@@ -23,6 +26,7 @@ properties: 
required:

  - compatible

  - reg

  - clocks

  - "#phy-cells"



additionalProperties: false
@@ -32,5 +36,6 @@ examples: 
    pcie0_phy: pcie-phy@1e149000 {

      compatible = "mediatek,mt7621-pci-phy";

      reg = <0x1e149000 0x0700>;

      clocks = <&sysc 0>;

      #phy-cells = <1>;

    };

Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ properties: 
    enum:

      - rockchip,px30-usb2phy

      - rockchip,rk3228-usb2phy

      - rockchip,rk3308-usb2phy

      - rockchip,rk3328-usb2phy

      - rockchip,rk3366-usb2phy

      - rockchip,rk3399-usb2phy

Documentation/devicetree/bindings/phy/phy-stm32-usbphyc.yaml

+11 −0
Original line number Diff line number Diff line
@@ -74,6 +74,13 @@ patternProperties: 
      "#phy-cells":

        enum: [ 0x0, 0x1 ]



      connector:

        type: object

        allOf:

          - $ref: ../connector/usb-connector.yaml

        properties:

          vbus-supply: true



    allOf:

      - if:

          properties:
@@ -130,6 +137,10 @@ examples: 
            reg = <0>;

            phy-supply = <&vdd_usb>;

            #phy-cells = <0>;

            connector {

                compatible = "usb-a-connector";

                vbus-supply = <&vbus_sw>;

            };

        };



        usbphyc_port1: usb-phy@1 {

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

+27 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ description: 
properties:

  compatible:

    enum:

      - qcom,ipq6018-qmp-pcie-phy

      - qcom,ipq8074-qmp-pcie-phy

      - qcom,ipq8074-qmp-usb3-phy

      - qcom,msm8996-qmp-pcie-phy
@@ -45,6 +46,7 @@ properties: 
      - qcom,sm8350-qmp-ufs-phy

      - qcom,sm8350-qmp-usb3-phy

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

      - qcom,sdx55-qmp-pcie-phy

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



  reg:
@@ -296,6 +298,30 @@ allOf: 
          items:

            - const: phy

            - const: common

  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,ipq6018-qmp-pcie-phy

    then:

      properties:

        clocks:

          items:

            - description: Phy aux clock.

            - description: Phy config clock.

        clock-names:

          items:

            - const: aux

            - const: cfg_ahb

        resets:

          items:

            - description: reset of phy block.

            - description: phy common block reset.

        reset-names:

          items:

            - const: phy

            - const: common

  - if:

      properties:

        compatible:
@@ -303,6 +329,7 @@ allOf: 
            enum:

              - 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