diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-12 23:35:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-12 23:35:21 -0700 |
| commit | 429a372e3ec020534bd314dca94e5281dc453d29 (patch) | |
| tree | 7ec5d6253bd404ff65b3f052def28007bfac7b9a /Documentation | |
| parent | 8f48ba71ede12231d5d63fdd34bd8ce7908a3377 (diff) | |
| parent | e6ea2d16fc615e82bbd9c022c6a4302f22f418bf (diff) | |
| download | linux-429a372e3ec020534bd314dca94e5281dc453d29.tar.bz2 | |
Merge branch 'stmmac-tegra186'
Thierry Reding says:
====================
net: stmmac: Fixes and Tegra186 support
This series of patches start with a few cleanups that I ran across while
adding Tegra186 support to the stmmac driver. It then adds code for FIFO
size parsing from feature registers and finally enables support for the
incarnation of the Synopsys DWC QOS IP found on NVIDIA Tegra186 SoCs.
This is based on next-20170310.
Changes in v2:
- address review comments by Mikko and Joao
- add two additional cleanup patches
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/net/stmmac.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt index d3bfc2b30fb5..11b27dfd1627 100644 --- a/Documentation/devicetree/bindings/net/stmmac.txt +++ b/Documentation/devicetree/bindings/net/stmmac.txt @@ -28,9 +28,9 @@ Optional properties: clocks may be specified in derived bindings. - clock-names: One name for each entry in the clocks property, the first one should be "stmmaceth" and the second one should be "pclk". -- clk_ptp_ref: this is the PTP reference clock; in case of the PTP is - available this clock is used for programming the Timestamp Addend Register. - If not passed then the system clock will be used and this is fine on some +- ptp_ref: this is the PTP reference clock; in case of the PTP is available + this clock is used for programming the Timestamp Addend Register. If not + passed then the system clock will be used and this is fine on some platforms. - tx-fifo-depth: See ethernet.txt file in the same directory - rx-fifo-depth: See ethernet.txt file in the same directory |