Commit 54bdf8a3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull phy updates from Vinod Koul:
 "New support:
   - UFS PHY for Qualcomm SA8775p, SM7150
   - PCIe 2 lane phy support for sc8180x and PCIe PHY for SDX65
   - Mediatke hdmi phy support for mt8195
   - rockchip naneng combo phy support for RK358

  Updates:
   - Drop Thunder Bay eMMC PHY driver
   - RC support for PCIe phy for Qualcomm SDX55
   - SGMII support in WIZ driver for J721E
   - PCIe and multilink SGMII PHY support in cadence driver
   - Big pile of platform remove callback returning void conversions"

* tag 'phy-for-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy: (77 commits)
  phy: cadence: cdns-dphy-rx: Add common module reset support
  phy: ti: j721e-wiz: Add SGMII support in WIZ driver for J721E
  dt-bindings: phy: ti: phy-gmii-sel: Add support for J784S4 CPSW9G
  phy: ti: j721e-wiz: Fix unreachable code in wiz_mode_select()
  phy: cadence: Sierra: Add PCIe + SGMII PHY multilink configuration
  phy: mediatek: add support for phy-mtk-hdmi-mt8195
  phy: phy-mtk-hdmi: Add generic phy configure callback
  dt-bindings: phy: mediatek: hdmi-phy: Add mt8195 compatible
  phy: tegra: xusb: Add missing tegra_xusb_port_unregister for usb2_port and ulpi_port
  dt-bindings: phy: ti,phy-j721e-wiz: document clock-output-names
  dt-bindings: phy: ti,phy-j721e-wiz: drop assigned-clocks
  dt-bindings: phy: ti,phy-am654-serdes: drop assigned-clocks type
  dt-bindings: phy: cadence-torrent: drop assigned-clocks
  dt-bindings: phy: cadence-sierra: drop assigned-clocks
  phy: rockchip: remove unused hw_to_inno function
  phy: qualcomm: phy-qcom-qmp-ufs: add definitions for sa8775p
  dt-bindings: phy: qmp-ufs: describe the UFS PHY for sa8775p
  phy: qcom-qmp-pcie: drop sdm845_qhp_pcie_rx_tbl
  phy: qcom-qmp-pcie: sc8180x PCIe PHY has 2 lanes
  phy: qcom-qmp-ufs: Add SM7150 support
  ...
parents 7994beab a0106132

Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml

+5 −1
Original line number Diff line number Diff line
@@ -21,7 +21,11 @@ allOf: 


properties:

  compatible:

    items:

    oneOf:

      - const: rockchip,rk3568-pcie

      - items:

          - enum:

              - rockchip,rk3588-pcie

          - const: rockchip,rk3568-pcie



  reg:

Documentation/devicetree/bindings/phy/allwinner,sun50i-h6-usb3-phy.yaml

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# Copyright 2019 Ondrej Jirman <megous@megous.com>

%YAML 1.2

---

$id: "http://devicetree.org/schemas/phy/allwinner,sun50i-h6-usb3-phy.yaml#"

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

$id: http://devicetree.org/schemas/phy/allwinner,sun50i-h6-usb3-phy.yaml#

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



title: Allwinner H6 USB3 PHY

Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ properties: 
    maxItems: 1



  allwinner,direction:

    $ref: '/schemas/types.yaml#/definitions/string'

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

    description: |

      Direction of the D-PHY:

      - "rx" for receiving (e.g. when used with MIPI CSI-2);

Documentation/devicetree/bindings/phy/amlogic,axg-mipi-dphy.yaml

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# Copyright 2020 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/phy/amlogic,axg-mipi-dphy.yaml#"

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

$id: http://devicetree.org/schemas/phy/amlogic,axg-mipi-dphy.yaml#

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



title: Amlogic AXG MIPI D-PHY

Documentation/devicetree/bindings/phy/amlogic,g12a-mipi-dphy-analog.yaml

+2 −2
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/amlogic,g12a-mipi-dphy-analog.yaml#"

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

$id: http://devicetree.org/schemas/phy/amlogic,g12a-mipi-dphy-analog.yaml#

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



title: Amlogic G12A MIPI analog PHY