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

Merge tag 'phy-for-5.13' of... 

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

Vinod writes:

phy-for-5.13

  - Updates:
	- Yaml conversion for mvebu-utmi binding, bcm-ns-usb2 and
	  bcm-ns-usb3 bindings
	- Mediatek dsi and hdmi phy updates
	- TI j721e-wiz updates for AM64
	- Cadence-torrent phy updates for SGMII/QSGMII

  - New support:
	- usb3-dp phy for Qualcomm SM8250
	- UTMI phy for Armada CP110
	- USB phy for Qualcomm SC7280
	- Binding and driver for Sparx5 ethernet serdes

* tag 'phy-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy: (75 commits)
  phy: fix resource_size.cocci warnings
  phy: Sparx5 Eth SerDes: Use direct register operations
  phy: hisilicon: Use the correct HiSilicon copyright
  phy: marvell: phy-mvebu-cp11i-utmi needs USB_COMMON
  phy: qcom-qmp: add support for sm8250-usb3-dp phy
  phy: qcom-qmp: rename common registers
  phy: qcom-qmp: move DP functions to callbacks
  dt-bindings: phy: qcom,qmp-usb3-dp: Add support for SM8250
  dt-bindings: phy: qcom,qmp-usb3-dp-phy: move usb3 compatibles back to qcom,qmp-phy.yaml
  phy: ti: j721e-wiz: Configure 'p_standard_mode' only for DP/QSGMII
  dt-bindings: phy: fix dt_binding_check warning in mediatek, ufs-phy.yaml
  phy: zynqmp: Handle the clock enable/disable properly
  dt-bindings: phy: bcm-ns-usb3-phy: convert to yaml
  dt-bindings: phy: bcm-ns-usb2-phy: convert to yaml
  phy: microchip: PHY_SPARX5_SERDES should depend on ARCH_SPARX5
  phy: cadence-torrent: Add delay for PIPE clock to be stable
  phy: cadence-torrent: Explicitly request exclusive reset control
  phy: cadence-torrent: Do not configure SERDES if it's already configured
  phy: cadence-torrent: Group reset APIs and clock APIs
  phy: ti: j721e-wiz: Do not configure wiz if its already configured
  ...
parents 39b53e23 cbc336c0

Documentation/devicetree/bindings/phy/bcm-ns-usb2-phy.txt

deleted100644 → 0
+0 −21
Original line number Original line Diff line number Diff line 
Driver for Broadcom Northstar USB 2.0 PHY



Required properties:

- compatible: brcm,ns-usb2-phy

- reg: iomem address range of DMU (Device Management Unit)

- reg-names: "dmu", the only needed & supported reg right now

- clocks: USB PHY reference clock

- clock-names: "phy-ref-clk", the only needed & supported clock right now



To initialize USB 2.0 PHY driver needs to setup PLL correctly. To do this it

requires passing phandle to the USB PHY reference clock.



Example:

	usb2-phy {

		compatible = "brcm,ns-usb2-phy";

		reg = <0x1800c000 0x1000>;

		reg-names = "dmu";

		#phy-cells = <0>;

		clocks = <&genpll BCM_NSP_GENPLL_USB_PHY_REF_CLK>;

		clock-names = "phy-ref-clk";

	};

Documentation/devicetree/bindings/phy/bcm-ns-usb2-phy.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/phy/bcm-ns-usb2-phy.yaml#

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



title: Broadcom Northstar USB 2.0 PHY



description: >

  To initialize USB 2.0 PHY driver needs to setup PLL correctly.

  To do this it requires passing phandle to the USB PHY reference clock.



maintainers:

  - Rafał Miłecki <rafal@milecki.pl>



properties:

  compatible:

    const: brcm,ns-usb2-phy



  reg:

    items:

      - description: iomem address range of DMU (Device Management Unit)



  reg-names:

    items:

      - const: dmu



  clocks:

    items:

      - description: USB PHY reference clock



  clock-names:

    items:

      - const: phy-ref-clk



  "#phy-cells":

    const: 0



required:

  - compatible

  - reg

  - reg-names

  - clocks

  - clock-names

  - "#phy-cells"



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/bcm-nsp.h>

    phy@1800c000 {

        compatible = "brcm,ns-usb2-phy";

        reg = <0x1800c000 0x1000>;

        reg-names = "dmu";

        clocks = <&genpll BCM_NSP_GENPLL_USB_PHY_REF_CLK>;

        clock-names = "phy-ref-clk";

        #phy-cells = <0>;

    };

Documentation/devicetree/bindings/phy/bcm-ns-usb3-phy.txt

deleted100644 → 0
+0 −34
Original line number Original line Diff line number Diff line 
Driver for Broadcom Northstar USB 3.0 PHY



Required properties:



- compatible: one of: "brcm,ns-ax-usb3-phy", "brcm,ns-bx-usb3-phy".

- reg: address of MDIO bus device

- usb3-dmp-syscon: phandle to syscon with DMP (Device Management Plugin)

		   registers

- #phy-cells: must be 0



Initialization of USB 3.0 PHY depends on Northstar version. There are currently

three known series: Ax, Bx and Cx.

Known A0: BCM4707 rev 0

Known B0: BCM4707 rev 4, BCM53573 rev 2

Known B1: BCM4707 rev 6

Known C0: BCM47094 rev 0



Example:

	mdio: mdio@0 {

		reg = <0x0>;

		#size-cells = <1>;

		#address-cells = <0>;



		usb3-phy@10 {

			compatible = "brcm,ns-ax-usb3-phy";

			reg = <0x10>;

			usb3-dmp-syscon = <&usb3_dmp>;

			#phy-cells = <0>;

		};

	};



	usb3_dmp: syscon@18105000 {

		reg = <0x18105000 0x1000>;

	};

Documentation/devicetree/bindings/phy/bcm-ns-usb3-phy.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/phy/bcm-ns-usb3-phy.yaml#

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



title: Broadcom Northstar USB 3.0 PHY



description: |

  Initialization of USB 3.0 PHY depends on Northstar version. There are currently

  three known series: Ax, Bx and Cx.

  Known A0: BCM4707 rev 0

  Known B0: BCM4707 rev 4, BCM53573 rev 2

  Known B1: BCM4707 rev 6

  Known C0: BCM47094 rev 0



maintainers:

  - Rafał Miłecki <rafal@milecki.pl>



properties:

  compatible:

    enum:

      - brcm,ns-ax-usb3-phy

      - brcm,ns-bx-usb3-phy



  reg:

    description: address of MDIO bus device

    maxItems: 1



  usb3-dmp-syscon:

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

    description:

      Phandle to the DMP (Device Management Plugin) syscon



  "#phy-cells":

    const: 0



required:

  - compatible

  - reg

  - usb3-dmp-syscon

  - "#phy-cells"



additionalProperties: false



examples:

  - |

    mdio {

        #address-cells = <1>;

        #size-cells = <0>;



        usb3-phy@10 {

            compatible = "brcm,ns-ax-usb3-phy";

            reg = <0x10>;

            usb3-dmp-syscon = <&usb3_dmp>;

            #phy-cells = <0>;

        };

    };



    usb3_dmp: syscon@18105000 {

        reg = <0x18105000 0x1000>;

    };

Documentation/devicetree/bindings/phy/brcm,brcmstb-usb-phy.yaml

+3 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,9 @@ properties: 
      - const: usb_mdio

      - const: usb_mdio

      - const: bdc_ec

      - const: bdc_ec





  power-domains:

    maxItems: 1



  clocks:

  clocks:

    minItems: 1

    minItems: 1

    maxItems: 2

    maxItems: 2