diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-27 13:20:40 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-27 13:20:40 +0300 |
| commit | e8014d83f60479d3981baeaa3a21c993ff832f3f (patch) | |
| tree | 90af78aea1a518c4c04d123e1473e8c4c729c221 /Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml | |
| parent | 41aef04524d3dc8c2a5d9652cccc1f567356b5fd (diff) | |
| parent | 6a8b55ed4056ea5559ebe4f6a4b247f627870d4c (diff) | |
| download | linux-e8014d83f60479d3981baeaa3a21c993ff832f3f.tar.xz | |
Merge 5.7-rc3 into staging-next
We need the staging fixes in here too, and this resolves a merge issue
with the vt6656 driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml')
| -rw-r--r-- | Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml index 144ae29e7141..f8bd28ff31c1 100644 --- a/Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml +++ b/Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml @@ -97,7 +97,7 @@ then: - $ref: /schemas/types.yaml#/definitions/uint32 - minimum: 0 maximum: 63 - default: 0 + default: 32 qcom,charge-ctrl-value: description: @@ -130,7 +130,7 @@ then: - $ref: /schemas/types.yaml#/definitions/uint32 - minimum: 0 maximum: 3 - default: 2 + default: 0 qcom,preemphasis-width: description: @@ -152,7 +152,7 @@ then: - $ref: /schemas/types.yaml#/definitions/uint32 - minimum: 0 maximum: 3 - default: 0 + default: 1 required: - compatible |