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.
By using phy-mode = "internal" we permit to have an external PHY with
the same mode than the internal one.
Reported-by: André Przywara <[email protected]>
Signed-off-by: Corentin Labbe <[email protected]>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
index fffd6d5fc907..6c2d1da05588 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;
+ int ret, phy_interface;
u32 reg, val;
regmap_read(gmac->regmap, SYSCON_EMAC_REG, &val);
@@ -718,7 +718,11 @@ static int sun8i_dwmac_set_syscon(struct stmmac_priv *priv)
if (gmac->variant->support_rmii)
reg &= ~SYSCON_RMII_EN;
- switch (priv->plat->interface) {
+ 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) {
case PHY_INTERFACE_MODE_MII:
/* default */
break;
@@ -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 (plat_dat->interface == PHY_INTERFACE_MODE_INTERNAL) {
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);
--
2.13.0
Since the PHY used is internal, simply set phy-mode as internal.
Signed-off-by: Corentin Labbe <[email protected]>
---
arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
index 6880268e8b87..27e7ef4e42f2 100644
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
@@ -100,7 +100,7 @@
&emac {
phy-handle = <&int_mii_phy>;
- phy-mode = "mii";
+ phy-mode = "internal";
allwinner,leds-active-low;
status = "okay";
};
--
2.13.0
Since the PHY used is internal, simply set phy-mode as internal.
Signed-off-by: Corentin Labbe <[email protected]>
---
arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
index 6713d0f2b3f4..7c154b845baa 100644
--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
@@ -106,7 +106,7 @@
&emac {
phy-handle = <&int_mii_phy>;
- phy-mode = "mii";
+ phy-mode = "internal";
allwinner,leds-active-low;
status = "okay";
};
--
2.13.0
Since the PHY used is internal, simply set phy-mode as internal.
Signed-off-by: Corentin Labbe <[email protected]>
---
arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
index 78f6c24952dd..5c5ba806e2f1 100644
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
@@ -49,7 +49,7 @@
&emac {
phy-handle = <&int_mii_phy>;
- phy-mode = "mii";
+ phy-mode = "internal";
allwinner,leds-active-low;
status = "okay";
};
--
2.13.0
Since the PHY used is internal, simply set phy-mode as internal.
Signed-off-by: Corentin Labbe <[email protected]>
---
arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
index 17cdeae19c6f..a2a2b11dfeed 100644
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
@@ -120,7 +120,7 @@
&emac {
phy-handle = <&int_mii_phy>;
- phy-mode = "mii";
+ phy-mode = "internal";
allwinner,leds-active-low;
status = "okay";
};
--
2.13.0
Since the PHY used is internal, simply set phy-mode as internal.
Signed-off-by: Corentin Labbe <[email protected]>
---
arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
index f5f0f15a2088..94edeb889e55 100644
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
@@ -120,7 +120,7 @@
&emac {
phy-handle = <&int_mii_phy>;
- phy-mode = "mii";
+ phy-mode = "internal";
allwinner,leds-active-low;
status = "okay";
};
--
2.13.0
From: Corentin Labbe <[email protected]>
Date: Tue, 27 Jun 2017 11:28:01 +0200
> 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.
>
> By using phy-mode = "internal" we permit to have an external PHY with
> the same mode than the internal one.
>
> Reported-by: Andr? Przywara <[email protected]>
> Signed-off-by: Corentin Labbe <[email protected]>
Series applied.
Please provide a proper "[PATCH 0/n] " header posting next time.
在 2017-06-30 00:23，David Miller 写道：
> From: Corentin Labbe <[email protected]>
> Date: Tue, 27 Jun 2017 11:28:01 +0200
>
>> 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.
>>
>> By using phy-mode = "internal" we permit to have an external PHY with
>> the same mode than the internal one.
>>
>> Reported-by: André Przywara <[email protected]>
>> Signed-off-by: Corentin Labbe <[email protected]>
>
> Series applied.
I think there's still some problems around for this patchset...
The definition of "internal" is internal *proprietary* PHY, but the
internal PHY of Allwinner SoCs seem to be MII...
See [1].
[1]
http://lists.infradead.org/pipermail/linux-arm-kernel/2017-June/516159.html
>
> Please provide a proper "[PATCH 0/n] " header posting next time.
On Thu, Jun 29, 2017 at 12:23:49PM -0400, David Miller wrote:
> From: Corentin Labbe <[email protected]>
> Date: Tue, 27 Jun 2017 11:28:01 +0200
>
> > 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.
> >
> > By using phy-mode = "internal" we permit to have an external PHY with
> > the same mode than the internal one.
> >
> > Reported-by: Andr? Przywara <[email protected]>
> > Signed-off-by: Corentin Labbe <[email protected]>
>
> Series applied.
>
> Please provide a proper "[PATCH 0/n] " header posting next time.
Sorry could you wait for applying, there are a parallel thread (http://www.spinics.net/lists/devicetree/msg183520.html) and it seems finaly that internal could not be the good way to do it.
Regards
Sorry again, I should have sent a comment for waiting.
From: Corentin Labbe <[email protected]>
Date: Thu, 29 Jun 2017 19:02:38 +0200
> On Thu, Jun 29, 2017 at 12:23:49PM -0400, David Miller wrote:
>> From: Corentin Labbe <[email protected]>
>> Date: Tue, 27 Jun 2017 11:28:01 +0200
>>
>> > 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.
>> >
>> > By using phy-mode = "internal" we permit to have an external PHY with
>> > the same mode than the internal one.
>> >
>> > Reported-by: Andr? Przywara <[email protected]>
>> > Signed-off-by: Corentin Labbe <[email protected]>
>>
>> Series applied.
>>
>> Please provide a proper "[PATCH 0/n] " header posting next time.
>
> Sorry could you wait for applying, there are a parallel thread (http://www.spinics.net/lists/devicetree/msg183520.html) and it seems finaly that internal could not be the good way to do it.
>
> Regards
> Sorry again, I should have sent a comment for waiting.
Please send me a revert patch, when I say I've applied it I already pushed
it out to my GIT tree.