diff options
author | Takashi Iwai <tiwai@suse.de> | 2020-09-02 13:31:45 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2020-09-02 13:32:06 +0200 |
commit | 6bde8ef51c917a657476310728d6cb3de6bac9e4 (patch) | |
tree | ba8a63abee1fa74d849dc9fc59e0854bc99a8524 /Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml | |
parent | 949a1ebe8cea7b342085cb6a4946b498306b9493 (diff) | |
parent | 07da90b0e5fc299c0ce4d34d1916d7a79b86848b (diff) |
Merge branch 'topic/tasklet-convert' into for-linus
Pull tasklet API conversions.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml')
-rw-r--r-- | Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml index f80f8896d527..185cdea9cf81 100644 --- a/Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml +++ b/Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml @@ -18,6 +18,7 @@ properties: compatible: enum: - qcom,ipq8074-qmp-pcie-phy + - qcom,ipq8074-qmp-usb3-phy - qcom,msm8996-qmp-pcie-phy - qcom,msm8996-qmp-ufs-phy - qcom,msm8996-qmp-usb3-phy @@ -36,7 +37,7 @@ properties: - description: Address and length of PHY's common serdes block. "#clock-cells": - enum: [ 1, 2 ] + enum: [ 1, 2 ] "#address-cells": enum: [ 1, 2 ] @@ -64,16 +65,15 @@ properties: vdda-phy-supply: description: - Phandle to a regulator supply to PHY core block. + Phandle to a regulator supply to PHY core block. vdda-pll-supply: description: - Phandle to 1.8V regulator supply to PHY refclk pll block. + Phandle to 1.8V regulator supply to PHY refclk pll block. vddp-ref-clk-supply: description: - Phandle to a regulator supply to any specific refclk - pll block. + Phandle to a regulator supply to any specific refclk pll block. #Required nodes: patternProperties: @@ -161,6 +161,7 @@ allOf: compatible: contains: enum: + - qcom,ipq8074-qmp-usb3-phy - qcom,msm8996-qmp-usb3-phy - qcom,msm8998-qmp-pcie-phy - qcom,msm8998-qmp-usb3-phy @@ -182,8 +183,8 @@ allOf: - description: phy common block reset. reset-names: items: - - const: phy - - const: common + - const: phy + - const: common - if: properties: compatible: |