diff options
| author | Dmitry Torokhov | 2018-06-13 01:38:35 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2018-06-13 01:38:35 +0200 |
| commit | 5aff29efbec020f0997e5cdbefce0ff383518986 (patch) | |
| tree | 8b7df95c23b3cd2cfa17873ff0fa999dd5ae35bd /Documentation/devicetree/bindings | |
| parent | Input: i8042 - increment wakeup_count for the respective port (diff) | |
| parent | Input: xen-kbdfront - allow better run-time configuration (diff) | |
| download | kernel-qcow2-linux-5aff29efbec020f0997e5cdbefce0ff383518986.tar.gz kernel-qcow2-linux-5aff29efbec020f0997e5cdbefce0ff383518986.tar.xz kernel-qcow2-linux-5aff29efbec020f0997e5cdbefce0ff383518986.zip | |
Merge branch 'ib/4.17-xen-kbdfront-runtime-config' into next
Bring in xen-kbdfront changes.
Diffstat (limited to 'Documentation/devicetree/bindings')
| -rw-r--r-- | Documentation/devicetree/bindings/net/dsa/b53.txt | 1 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/net/micrel-ksz90x1.txt | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/dsa/b53.txt b/Documentation/devicetree/bindings/net/dsa/b53.txt index 8acf51a4dfa8..47a6a7fe0b86 100644 --- a/Documentation/devicetree/bindings/net/dsa/b53.txt +++ b/Documentation/devicetree/bindings/net/dsa/b53.txt @@ -10,6 +10,7 @@ Required properties: "brcm,bcm53128" "brcm,bcm5365" "brcm,bcm5395" + "brcm,bcm5389" "brcm,bcm5397" "brcm,bcm5398" diff --git a/Documentation/devicetree/bindings/net/micrel-ksz90x1.txt b/Documentation/devicetree/bindings/net/micrel-ksz90x1.txt index 42a248301615..e22d8cfea687 100644 --- a/Documentation/devicetree/bindings/net/micrel-ksz90x1.txt +++ b/Documentation/devicetree/bindings/net/micrel-ksz90x1.txt @@ -57,6 +57,13 @@ KSZ9031: - txd2-skew-ps : Skew control of TX data 2 pad - txd3-skew-ps : Skew control of TX data 3 pad + - micrel,force-master: + Boolean, force phy to master mode. Only set this option if the phy + reference clock provided at CLK125_NDO pin is used as MAC reference + clock because the clock jitter in slave mode is to high (errata#2). + Attention: The link partner must be configurable as slave otherwise + no link will be established. + Examples: mdio { |