| Message ID | 20170728092818.23419-4-clabbe.montjoie@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, Jul 28, 2017 at 5:28 PM, Corentin Labbe <clabbe.montjoie@gmail.com> wrote: > The current way to find if the phy is internal is to compare DT phy-mode > and emac_variant/internal_phy. > But it will negate a possible future SoC where an external PHY use the > same phy mode than the internal one. > > This patch adds a new way to find if the PHY is internal, via its > compatible. > > Since the phy_mode of the internal PHY does need to be know, the > variant internal_phy member is converted to a boolean. > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > --- > drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 16 ++++++++++------ > 1 file changed, 10 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > index fffd6d5fc907..04f7ddd802b0 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > @@ -48,7 +48,7 @@ > */ > struct emac_variant { > u32 default_syscon_value; > - int internal_phy; > + bool internal_phy; Nit: please add a verb to the name, like "has_internal_phy", or even "soc_has_internal_phy". This makes it clear what this property represents. ChenYu
On Fri, Jul 28, 2017 at 05:49:55PM +0800, Chen-Yu Tsai wrote: > On Fri, Jul 28, 2017 at 5:28 PM, Corentin Labbe > <clabbe.montjoie@gmail.com> wrote: > > The current way to find if the phy is internal is to compare DT phy-mode > > and emac_variant/internal_phy. > > But it will negate a possible future SoC where an external PHY use the > > same phy mode than the internal one. > > > > This patch adds a new way to find if the PHY is internal, via its > > compatible. > > > > Since the phy_mode of the internal PHY does need to be know, the > > variant internal_phy member is converted to a boolean. > > > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > > --- > > drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 16 ++++++++++------ > > 1 file changed, 10 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > > index fffd6d5fc907..04f7ddd802b0 100644 > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > > @@ -48,7 +48,7 @@ > > */ > > struct emac_variant { > > u32 default_syscon_value; > > - int internal_phy; > > + bool internal_phy; > > Nit: please add a verb to the name, like "has_internal_phy", > or even "soc_has_internal_phy". This makes it clear what this > property represents. > > ChenYu I will use soc_has_internal_phy Thanks
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c index fffd6d5fc907..04f7ddd802b0 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -48,7 +48,7 @@ */ struct emac_variant { u32 default_syscon_value; - int internal_phy; + bool internal_phy; bool support_mii; bool support_rmii; bool support_rgmii; @@ -75,7 +75,7 @@ struct sunxi_priv_data { static const struct emac_variant emac_variant_h3 = { .default_syscon_value = 0x58000, - .internal_phy = PHY_INTERFACE_MODE_MII, + .internal_phy = true, .support_mii = true, .support_rmii = true, .support_rgmii = true @@ -83,20 +83,20 @@ static const struct emac_variant emac_variant_h3 = { static const struct emac_variant emac_variant_v3s = { .default_syscon_value = 0x38000, - .internal_phy = PHY_INTERFACE_MODE_MII, + .internal_phy = true, .support_mii = true }; static const struct emac_variant emac_variant_a83t = { .default_syscon_value = 0, - .internal_phy = 0, + .internal_phy = false, .support_mii = true, .support_rgmii = true }; static const struct emac_variant emac_variant_a64 = { .default_syscon_value = 0, - .internal_phy = 0, + .internal_phy = false, .support_mii = true, .support_rmii = true, .support_rgmii = true @@ -889,6 +889,10 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) struct sunxi_priv_data *gmac; struct device *dev = &pdev->dev; int ret; + static const struct of_device_id internal_phys[] = { + { .compatible = "allwinner,sun8i-h3-ephy" }, + { .compatible = "allwinner,sun8i-v3s-ephy" }, + }; ret = stmmac_get_platform_resources(pdev, &stmmac_res); if (ret) @@ -932,7 +936,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) } plat_dat->interface = of_get_phy_mode(dev->of_node); - if (plat_dat->interface == gmac->variant->internal_phy) { + if (of_match_node(internal_phys, plat_dat->phy_node)) { 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);
The current way to find if the phy is internal is to compare DT phy-mode and emac_variant/internal_phy. But it will negate a possible future SoC where an external PHY use the same phy mode than the internal one. This patch adds a new way to find if the PHY is internal, via its compatible. Since the phy_mode of the internal PHY does need to be know, the variant internal_phy member is converted to a boolean. Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> --- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)