From: David S. Miller Date: Tue, 26 Mar 2013 16:54:13 +0000 (-0400) Subject: Merge branch 'stmmac' X-Git-Tag: MMI-PSA29.97-13-9~14469^2~327 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c0db64ce849efb260ba1ceb8d86198c62aceade1;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'stmmac' Giuseppe CAVALLARO says: ==================== These patches enhance the driver adding the PTP support and the initial code for RGMII/SGMII/TBI/RTBI modes. Also this patches review the driver removing some Koption for selecting between chain and ring modes. REally useful to validate the driver also at build time. Before adding PTP, the extended descriptor support has been added because it is mandatory to save HW timestamp in new dedicated descriptors. Also in this case no Koption added. Concerning the PTP, I have hacked/reviewed and tested many part of these patches also verifying the back compatibility on several HW and chips. Concerning the SGMII/RGMII we have already discussed about the support in the net.dev Mailing list with Byungho where these patchs were partially analysed. So I have only ported them against the latest net-next (and on top of PTP). I have added some missing things: e.g. some parts of the ethtool for ANE. As we clarified with Byungho, we will add further enhancements on top of these patches if needed. I have also built all against ARM/SH/X68 platforms and no issues on ST-Boxes. Thx goes to Rayagond that wrote and tested the PTP and to Byungho for SGMII. V2: This Version 2 has the fixes discussed in the ML, for example: o completely remove the Koption... all the decisions are made at probe time o review the PTP patches and better organize them just in two patches o added all the fixes provided by Richard on PTP and CLK driver. ==================== Signed-off-by: David S. Miller --- c0db64ce849efb260ba1ceb8d86198c62aceade1