| Message ID | 20170702123159.6939-7-clabbe.montjoie@gmail.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sun, Jul 02, 2017 at 02:31:59PM +0200, Corentin Labbe wrote: > Since internal phy-mode is reserved for non-xMII protocol we cannot use > it with dwmac-sun8i > This reverts commit 1c2fa5f84683 ("net: stmmac: support future possible different internal phy mode") > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > --- Hello This patch was left not applied but all other patch from this serie was. Could you apply it, or perhaps you prefer I resend it with some "Fixes:" Regards Corentin Labbe
From: Corentin Labbe <clabbe.montjoie@gmail.com> Date: Thu, 6 Jul 2017 10:51:47 +0200 > On Sun, Jul 02, 2017 at 02:31:59PM +0200, Corentin Labbe wrote: >> Since internal phy-mode is reserved for non-xMII protocol we cannot use >> it with dwmac-sun8i >> This reverts commit 1c2fa5f84683 ("net: stmmac: support future possible different internal phy mode") >> >> Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> >> --- > > Hello > > This patch was left not applied but all other patch from this serie was. > Could you apply it, or perhaps you prefer I resend it with some "Fixes:" You never need to ask questions like this. If it's not active in my patchwork queue, you must resend. Thank you.
Hi Corentin, On Thu, Jul 6, 2017 at 5:45 PM, David Miller <davem@davemloft.net> wrote: > From: Corentin Labbe <clabbe.montjoie@gmail.com> > Date: Thu, 6 Jul 2017 10:51:47 +0200 > >> On Sun, Jul 02, 2017 at 02:31:59PM +0200, Corentin Labbe wrote: >>> Since internal phy-mode is reserved for non-xMII protocol we cannot use >>> it with dwmac-sun8i >>> This reverts commit 1c2fa5f84683 ("net: stmmac: support future possible different internal phy mode") >>> >>> Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> >>> --- >> >> Hello >> >> This patch was left not applied but all other patch from this serie was. >> Could you apply it, or perhaps you prefer I resend it with some "Fixes:" > > You never need to ask questions like this. > > If it's not active in my patchwork queue, you must resend. > > Thank you. Your series was not applied at all. See the status on patchwork: http://patchwork.ozlabs.org/patch/783179/ Maxime's patch to revert all device tree changes in net-next was applied first. Please rebase and resend this patch for netdev (not net-next). ChenYu
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c index 6c2d1da05588..fffd6d5fc907 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -638,7 +638,7 @@ static int sun8i_dwmac_set_syscon(struct stmmac_priv *priv) { struct sunxi_priv_data *gmac = priv->plat->bsp_priv; struct device_node *node = priv->device->of_node; - int ret, phy_interface; + int ret; u32 reg, val; regmap_read(gmac->regmap, SYSCON_EMAC_REG, &val); @@ -718,11 +718,7 @@ static int sun8i_dwmac_set_syscon(struct stmmac_priv *priv) if (gmac->variant->support_rmii) reg &= ~SYSCON_RMII_EN; - phy_interface = priv->plat->interface; - /* if PHY is internal, select the mode (xMII) used by the SoC */ - if (gmac->use_internal_phy) - phy_interface = gmac->variant->internal_phy; - switch (phy_interface) { + switch (priv->plat->interface) { case PHY_INTERFACE_MODE_MII: /* default */ break; @@ -936,7 +932,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) } plat_dat->interface = of_get_phy_mode(dev->of_node); - if (plat_dat->interface == PHY_INTERFACE_MODE_INTERNAL) { + if (plat_dat->interface == gmac->variant->internal_phy) { dev_info(&pdev->dev, "Will use internal PHY\n"); gmac->use_internal_phy = true; gmac->ephy_clk = of_clk_get(plat_dat->phy_node, 0);
Since internal phy-mode is reserved for non-xMII protocol we cannot use it with dwmac-sun8i This reverts commit 1c2fa5f84683 ("net: stmmac: support future possible different internal phy mode") Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> --- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)