* [PATCH net-next] net: phy: marvell: Add support for 88e1545 PHY
@ 2017-02-01 23:35 Andrew Lunn
2017-02-02 2:22 ` Florian Fainelli
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Andrew Lunn @ 2017-02-01 23:35 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Andrew Lunn
The 88e1545 PHYs are discrete Marvell PHYs, found in a quad package on
the zii-devel-b board. Add support for it to the Marvell PHY driver.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
NOTE: To apply cleanly, the "Work around missing PHY product ID in mv88e6390"
patches need to be applied first.
drivers/net/phy/marvell.c | 21 +++++++++++++++++++++
include/linux/marvell_phy.h | 1 +
2 files changed, 22 insertions(+)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 1a0ac48cbc50..f9d0fa315a47 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -2123,6 +2123,26 @@ static struct phy_driver marvell_drivers[] = {
.get_stats = marvell_get_stats,
},
{
+ .phy_id = MARVELL_PHY_ID_88E1545,
+ .phy_id_mask = MARVELL_PHY_ID_MASK,
+ .name = "Marvell 88E1545",
+ .probe = m88e1510_probe,
+ .remove = &marvell_remove,
+ .features = PHY_GBIT_FEATURES,
+ .flags = PHY_HAS_INTERRUPT,
+ .config_init = &marvell_config_init,
+ .config_aneg = &m88e1510_config_aneg,
+ .read_status = &marvell_read_status,
+ .ack_interrupt = &marvell_ack_interrupt,
+ .config_intr = &marvell_config_intr,
+ .did_interrupt = &m88e1121_did_interrupt,
+ .resume = &genphy_resume,
+ .suspend = &genphy_suspend,
+ .get_sset_count = marvell_get_sset_count,
+ .get_strings = marvell_get_strings,
+ .get_stats = marvell_get_stats,
+ },
+ {
.phy_id = MARVELL_PHY_ID_88E3016,
.phy_id_mask = MARVELL_PHY_ID_MASK,
.name = "Marvell 88E3016",
@@ -2178,6 +2198,7 @@ static struct mdio_device_id __maybe_unused marvell_tbl[] = {
{ MARVELL_PHY_ID_88E1116R, MARVELL_PHY_ID_MASK },
{ MARVELL_PHY_ID_88E1510, MARVELL_PHY_ID_MASK },
{ MARVELL_PHY_ID_88E1540, MARVELL_PHY_ID_MASK },
+ { MARVELL_PHY_ID_88E1545, MARVELL_PHY_ID_MASK },
{ MARVELL_PHY_ID_88E3016, MARVELL_PHY_ID_MASK },
{ MARVELL_PHY_ID_88E6390, MARVELL_PHY_ID_MASK },
{ }
diff --git a/include/linux/marvell_phy.h b/include/linux/marvell_phy.h
index 3d616d7f65bf..4055cf8cc978 100644
--- a/include/linux/marvell_phy.h
+++ b/include/linux/marvell_phy.h
@@ -17,6 +17,7 @@
#define MARVELL_PHY_ID_88E1116R 0x01410e40
#define MARVELL_PHY_ID_88E1510 0x01410dd0
#define MARVELL_PHY_ID_88E1540 0x01410eb0
+#define MARVELL_PHY_ID_88E1545 0x01410ea0
#define MARVELL_PHY_ID_88E3016 0x01410e60
/* The MV88e6390 Ethernet switch contains embedded PHYs. These PHYs do
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] net: phy: marvell: Add support for 88e1545 PHY
2017-02-01 23:35 [PATCH net-next] net: phy: marvell: Add support for 88e1545 PHY Andrew Lunn
@ 2017-02-02 2:22 ` Florian Fainelli
2017-02-02 9:55 ` Sergei Shtylyov
2017-02-03 3:05 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2017-02-02 2:22 UTC (permalink / raw)
To: Andrew Lunn, David Miller; +Cc: netdev
On 02/01/2017 03:35 PM, Andrew Lunn wrote:
> The 88e1545 PHYs are discrete Marvell PHYs, found in a quad package on
> the zii-devel-b board. Add support for it to the Marvell PHY driver.
>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
--
Florian
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] net: phy: marvell: Add support for 88e1545 PHY
2017-02-01 23:35 [PATCH net-next] net: phy: marvell: Add support for 88e1545 PHY Andrew Lunn
2017-02-02 2:22 ` Florian Fainelli
@ 2017-02-02 9:55 ` Sergei Shtylyov
2017-02-02 13:17 ` Andrew Lunn
2017-02-03 3:05 ` David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Sergei Shtylyov @ 2017-02-02 9:55 UTC (permalink / raw)
To: Andrew Lunn, David Miller; +Cc: netdev
Hello!
On 2/2/2017 2:35 AM, Andrew Lunn wrote:
> The 88e1545 PHYs are discrete Marvell PHYs, found in a quad package on
> the zii-devel-b board. Add support for it to the Marvell PHY driver.
>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
>
> NOTE: To apply cleanly, the "Work around missing PHY product ID in mv88e6390"
> patches need to be applied first.
>
> drivers/net/phy/marvell.c | 21 +++++++++++++++++++++
> include/linux/marvell_phy.h | 1 +
> 2 files changed, 22 insertions(+)
>
> diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
> index 1a0ac48cbc50..f9d0fa315a47 100644
> --- a/drivers/net/phy/marvell.c
> +++ b/drivers/net/phy/marvell.c
> @@ -2123,6 +2123,26 @@ static struct phy_driver marvell_drivers[] = {
> .get_stats = marvell_get_stats,
> },
> {
> + .phy_id = MARVELL_PHY_ID_88E1545,
> + .phy_id_mask = MARVELL_PHY_ID_MASK,
> + .name = "Marvell 88E1545",
> + .probe = m88e1510_probe,
> + .remove = &marvell_remove,
> + .features = PHY_GBIT_FEATURES,
> + .flags = PHY_HAS_INTERRUPT,
> + .config_init = &marvell_config_init,
> + .config_aneg = &m88e1510_config_aneg,
> + .read_status = &marvell_read_status,
> + .ack_interrupt = &marvell_ack_interrupt,
> + .config_intr = &marvell_config_intr,
> + .did_interrupt = &m88e1121_did_interrupt,
> + .resume = &genphy_resume,
> + .suspend = &genphy_suspend,
> + .get_sset_count = marvell_get_sset_count,
> + .get_strings = marvell_get_strings,
> + .get_stats = marvell_get_stats,
Using & on some method inits and not using it on others doesn't look very
consistent...
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] net: phy: marvell: Add support for 88e1545 PHY
2017-02-02 9:55 ` Sergei Shtylyov
@ 2017-02-02 13:17 ` Andrew Lunn
2017-02-02 18:19 ` Sergei Shtylyov
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Lunn @ 2017-02-02 13:17 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: David Miller, netdev
On Thu, Feb 02, 2017 at 12:55:16PM +0300, Sergei Shtylyov wrote:
> Hello!
>
> On 2/2/2017 2:35 AM, Andrew Lunn wrote:
>
> >The 88e1545 PHYs are discrete Marvell PHYs, found in a quad package on
> >the zii-devel-b board. Add support for it to the Marvell PHY driver.
> >
> >Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> >---
> >
> >NOTE: To apply cleanly, the "Work around missing PHY product ID in mv88e6390"
> >patches need to be applied first.
> >
> >drivers/net/phy/marvell.c | 21 +++++++++++++++++++++
> > include/linux/marvell_phy.h | 1 +
> > 2 files changed, 22 insertions(+)
> >
> >diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
> >index 1a0ac48cbc50..f9d0fa315a47 100644
> >--- a/drivers/net/phy/marvell.c
> >+++ b/drivers/net/phy/marvell.c
> >@@ -2123,6 +2123,26 @@ static struct phy_driver marvell_drivers[] = {
> > .get_stats = marvell_get_stats,
> > },
> > {
> >+ .phy_id = MARVELL_PHY_ID_88E1545,
> >+ .phy_id_mask = MARVELL_PHY_ID_MASK,
> >+ .name = "Marvell 88E1545",
> >+ .probe = m88e1510_probe,
> >+ .remove = &marvell_remove,
> >+ .features = PHY_GBIT_FEATURES,
> >+ .flags = PHY_HAS_INTERRUPT,
> >+ .config_init = &marvell_config_init,
> >+ .config_aneg = &m88e1510_config_aneg,
> >+ .read_status = &marvell_read_status,
> >+ .ack_interrupt = &marvell_ack_interrupt,
> >+ .config_intr = &marvell_config_intr,
> >+ .did_interrupt = &m88e1121_did_interrupt,
> >+ .resume = &genphy_resume,
> >+ .suspend = &genphy_suspend,
> >+ .get_sset_count = marvell_get_sset_count,
> >+ .get_strings = marvell_get_strings,
> >+ .get_stats = marvell_get_stats,
>
> Using & on some method inits and not using it on others doesn't
> look very consistent...
Hi Sergei
Very true. I think it has been historically like that, and adding new
PHYs is mostly a cut/paste operation. With this list getting longer
all the time, i'm thinking we should start using some macros.
Are you O.K. with the patch as it is, and a follow-up series to follow
soon?
Thanks
Andrew
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] net: phy: marvell: Add support for 88e1545 PHY
2017-02-02 13:17 ` Andrew Lunn
@ 2017-02-02 18:19 ` Sergei Shtylyov
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Shtylyov @ 2017-02-02 18:19 UTC (permalink / raw)
To: Andrew Lunn; +Cc: David Miller, netdev
On 02/02/2017 04:17 PM, Andrew Lunn wrote:
>>> The 88e1545 PHYs are discrete Marvell PHYs, found in a quad package on
>>> the zii-devel-b board. Add support for it to the Marvell PHY driver.
>>>
>>> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
>>> ---
>>>
>>> NOTE: To apply cleanly, the "Work around missing PHY product ID in mv88e6390"
>>> patches need to be applied first.
>>>
>>> drivers/net/phy/marvell.c | 21 +++++++++++++++++++++
>>> include/linux/marvell_phy.h | 1 +
>>> 2 files changed, 22 insertions(+)
>>>
>>> diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
>>> index 1a0ac48cbc50..f9d0fa315a47 100644
>>> --- a/drivers/net/phy/marvell.c
>>> +++ b/drivers/net/phy/marvell.c
>>> @@ -2123,6 +2123,26 @@ static struct phy_driver marvell_drivers[] = {
>>> .get_stats = marvell_get_stats,
>>> },
>>> {
>>> + .phy_id = MARVELL_PHY_ID_88E1545,
>>> + .phy_id_mask = MARVELL_PHY_ID_MASK,
>>> + .name = "Marvell 88E1545",
>>> + .probe = m88e1510_probe,
>>> + .remove = &marvell_remove,
>>> + .features = PHY_GBIT_FEATURES,
>>> + .flags = PHY_HAS_INTERRUPT,
>>> + .config_init = &marvell_config_init,
>>> + .config_aneg = &m88e1510_config_aneg,
>>> + .read_status = &marvell_read_status,
>>> + .ack_interrupt = &marvell_ack_interrupt,
>>> + .config_intr = &marvell_config_intr,
>>> + .did_interrupt = &m88e1121_did_interrupt,
>>> + .resume = &genphy_resume,
>>> + .suspend = &genphy_suspend,
>>> + .get_sset_count = marvell_get_sset_count,
>>> + .get_strings = marvell_get_strings,
>>> + .get_stats = marvell_get_stats,
>>
>> Using & on some method inits and not using it on others doesn't
>> look very consistent...
>
> Hi Sergei
>
> Very true. I think it has been historically like that, and adding new
> PHYs is mostly a cut/paste operation. With this list getting longer
> all the time, i'm thinking we should start using some macros.
>
> Are you O.K. with the patch as it is, and a follow-up series to follow
> soon?
I don't care that much. :-)
> Thanks
> Andrew
MBR, Sergei
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] net: phy: marvell: Add support for 88e1545 PHY
2017-02-01 23:35 [PATCH net-next] net: phy: marvell: Add support for 88e1545 PHY Andrew Lunn
2017-02-02 2:22 ` Florian Fainelli
2017-02-02 9:55 ` Sergei Shtylyov
@ 2017-02-03 3:05 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2017-02-03 3:05 UTC (permalink / raw)
To: andrew; +Cc: netdev
From: Andrew Lunn <andrew@lunn.ch>
Date: Thu, 2 Feb 2017 00:35:03 +0100
> The 88e1545 PHYs are discrete Marvell PHYs, found in a quad package on
> the zii-devel-b board. Add support for it to the Marvell PHY driver.
>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-02-03 3:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-01 23:35 [PATCH net-next] net: phy: marvell: Add support for 88e1545 PHY Andrew Lunn
2017-02-02 2:22 ` Florian Fainelli
2017-02-02 9:55 ` Sergei Shtylyov
2017-02-02 13:17 ` Andrew Lunn
2017-02-02 18:19 ` Sergei Shtylyov
2017-02-03 3:05 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).