diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-03 22:31:34 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-03 22:31:34 +0300 |
| commit | 1b99e5e854d4de2d795c4dbed7cc59c65ae372fe (patch) | |
| tree | 767fca6126bc2b67592d73eb72e1a6a881b30190 /include/uapi/linux/in.h | |
| parent | d3bc29a4b3778251b7eeadc9eadb8ba2ce3e6c5f (diff) | |
| parent | 52b6c5c2180011ec6d3ecf31e3ab05df7796400c (diff) | |
| download | linux-1b99e5e854d4de2d795c4dbed7cc59c65ae372fe.tar.xz | |
Merge branch 'stmmac-OXNAS'
Neil Armstrong says:
====================
net: stmmac: Add OXNAS DWMAC Glue
This patchset add support for the Sysnopsys DWMAC Gigabit Ethernet
controller Glue layer of the Oxford Semiconductor OX820 SoC.
Changes since v2 at http://lkml.kernel.org/r/20161031105345.16711-1-narmstrong@baylibre.com :
- Disable/Unprepare clock if regmap read fails in oxnas_dwmac_init
Changes since v1 at https://patchwork.kernel.org/patch/9388231/ :
- Split dt-bindings in a separate patch
- Add IP version in the dt-bindings compatible
- Check return of clk_prepare_enable()
- use get_stmmac_bsp_priv() helper
- hardwire setup values in oxnas_dwmac_init()
Changes since RFC at https://patchwork.kernel.org/patch/9387257 :
- Drop init/exit callbacks
- Implement proper remove and PM callback
- Call init from probe
- Disable/Unprepare clock if stmmac probe fails
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/in.h')
0 files changed, 0 insertions, 0 deletions