summaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-11-09 12:50:56 -0500
committerDavid S. Miller <davem@davemloft.net>2016-11-09 12:50:56 -0500
commit721ad32144bd8c09dc70fe03b470b44e79fbbef5 (patch)
treee5c676d96668ad467bcabf9460080265382cb8c7 /net/ipv4/tcp.c
parentddc5e157294dd0f6e71eecd4894af481583de7c1 (diff)
parent7334b3e47aeed5a84ccd6bbc3431a5f69651e107 (diff)
downloadlinux-721ad32144bd8c09dc70fe03b470b44e79fbbef5.tar.bz2
Merge branch 'Meson-GXL-internal-phy'
Neil Armstrong says: ==================== ARM64: Add Internal PHY support for Meson GXL The Amlogic Meson GXL SoCs have an internal RMII PHY that is muxed with the external RGMII pins. In order to support switching between the two PHYs links, extended registers size for mdio-mux-mmioreg must be added. The DT related patches submitted as RFC in [3] will be sent in a separate patchset due to multiple patchsets and DTSI migrations. Changes since v2 RFC patchset at : [3] - Change phy Kconfig/Makefile alphabetic order - GXL dtsi cleanup Changes since original RFC patchset at : [2] - Remove meson8b experimental phy switching - Switch to mdio-mux-mmioreg with extennded size support - Add internal phy support for S905x and p231 - Add external PHY support for p230 [1] http://lkml.kernel.org/r/1477932286-27482-1-git-send-email-narmstrong@baylibre.com [2] http://lkml.kernel.org/r/1477060838-14164-1-git-send-email-narmstrong@baylibre.com [3] http://lkml.kernel.org/r/1477932987-27871-1-git-send-email-narmstrong@baylibre.com ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
0 files changed, 0 insertions, 0 deletions