diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-03 13:41:08 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-03 13:41:08 +0300 |
commit | 0ec7f1ae60e9673a276ab367e66cc10292351b25 (patch) | |
tree | 1ea5032d24788dfb876cc6aa8e9e06b5cc2c4deb /Documentation | |
parent | d58071a8a76d779eedab38033ae4c821c30295a5 (diff) | |
parent | f0ae8685b2858fc1dabf5ea743642abb5f242375 (diff) | |
download | linux-0ec7f1ae60e9673a276ab367e66cc10292351b25.tar.xz |
Merge tag 'phy-fixes-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy into char-misc-next
Vinod writes:
phy: fixes for 5.16
Fixes for:
- kernel-doc warnings for various drivers
- error handling fix for HiSilicon driver
- name fix for zynqmp phy
- property name fix in stm32 phy
* tag 'phy-fixes-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy:
phy: HiSilicon: Fix copy and paste bug in error handling
dt-bindings: phy: zynqmp-psgtr: fix USB phy name
phy: ti: omap-usb2: Fix the kernel-doc style
phy: qualcomm: ipq806x-usb: Fix kernel-doc style
phy: ti: tusb1210: Fix the kernel-doc warn
phy: qualcomm: usb-hsic: Fix the kernel-doc warn
phy: qualcomm: qmp: Add missing struct documentation
phy: mvebu-cp110-utmi: Fix kernel-doc warns
phy: ti: report 2 non-kernel-doc comments
phy: stm32: fix st,slow-hs-slew-rate with st,decrease-hs-slew-rate
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml b/Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml index 04d5654efb38..79906519c652 100644 --- a/Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml +++ b/Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml @@ -29,7 +29,7 @@ properties: - PHY_TYPE_PCIE - PHY_TYPE_SATA - PHY_TYPE_SGMII - - PHY_TYPE_USB + - PHY_TYPE_USB3 - description: The PHY instance minimum: 0 maximum: 1 # for DP, SATA or USB |