* [PATCH 0/3] Add Marvell 88E1340S, 88E1548P support
@ 2020-06-19 8:49 Maxim Kochetkov
2020-06-19 8:49 ` [PATCH 1/3] net: phy: marvell: use a single style for referencing functions Maxim Kochetkov
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Maxim Kochetkov @ 2020-06-19 8:49 UTC (permalink / raw)
To: netdev
Cc: Maxim Kochetkov, Andrew Lunn, Florian Fainelli, Heiner Kallweit,
Russell King, David S. Miller, Jakub Kicinski
This patch series add new PHY id support.
Russell King asked to use single style for referencing functions.
Maxim Kochetkov (3):
net: phy: marvell: use a single style for referencing functions
net: phy: marvell: Add Marvell 88E1340S support
net: phy: marvell: Add Marvell 88E1548P support
drivers/net/phy/marvell.c | 269 +++++++++++++++++++++---------------
include/linux/marvell_phy.h | 2 +
2 files changed, 160 insertions(+), 111 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 1/3] net: phy: marvell: use a single style for referencing functions 2020-06-19 8:49 [PATCH 0/3] Add Marvell 88E1340S, 88E1548P support Maxim Kochetkov @ 2020-06-19 8:49 ` Maxim Kochetkov 2020-06-19 14:56 ` Andrew Lunn 2020-06-19 18:08 ` Florian Fainelli 2020-06-19 8:49 ` [PATCH 2/3] net: phy: marvell: Add Marvell 88E1340S support Maxim Kochetkov ` (2 subsequent siblings) 3 siblings, 2 replies; 13+ messages in thread From: Maxim Kochetkov @ 2020-06-19 8:49 UTC (permalink / raw) To: netdev Cc: Maxim Kochetkov, Andrew Lunn, Florian Fainelli, Heiner Kallweit, Russell King, David S. Miller, Jakub Kicinski The kernel in general does not use &func referencing format. Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru> --- drivers/net/phy/marvell.c | 222 +++++++++++++++++++------------------- 1 file changed, 111 insertions(+), 111 deletions(-) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 7fc8e10c5f33..db5257f3b362 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -2157,12 +2157,12 @@ static struct phy_driver marvell_drivers[] = { .name = "Marvell 88E1101", /* PHY_GBIT_FEATURES */ .probe = marvell_probe, - .config_init = &marvell_config_init, - .config_aneg = &m88e1101_config_aneg, - .ack_interrupt = &marvell_ack_interrupt, - .config_intr = &marvell_config_intr, - .resume = &genphy_resume, - .suspend = &genphy_suspend, + .config_init = marvell_config_init, + .config_aneg = m88e1101_config_aneg, + .ack_interrupt = marvell_ack_interrupt, + .config_intr = marvell_config_intr, + .resume = genphy_resume, + .suspend = genphy_suspend, .read_page = marvell_read_page, .write_page = marvell_write_page, .get_sset_count = marvell_get_sset_count, @@ -2175,12 +2175,12 @@ static struct phy_driver marvell_drivers[] = { .name = "Marvell 88E1112", /* PHY_GBIT_FEATURES */ .probe = marvell_probe, - .config_init = &m88e1111_config_init, - .config_aneg = &marvell_config_aneg, - .ack_interrupt = &marvell_ack_interrupt, - .config_intr = &marvell_config_intr, - .resume = &genphy_resume, - .suspend = &genphy_suspend, + .config_init = m88e1111_config_init, + .config_aneg = marvell_config_aneg, + .ack_interrupt = marvell_ack_interrupt, + .config_intr = marvell_config_intr, + .resume = genphy_resume, + .suspend = genphy_suspend, .read_page = marvell_read_page, .write_page = marvell_write_page, .get_sset_count = marvell_get_sset_count, @@ -2195,13 +2195,13 @@ static struct phy_driver marvell_drivers[] = { .name = "Marvell 88E1111", /* PHY_GBIT_FEATURES */ .probe = marvell_probe, - .config_init = &m88e1111_config_init, - .config_aneg = &marvell_config_aneg, - .read_status = &marvell_read_status, - .ack_interrupt = &marvell_ack_interrupt, - .config_intr = &marvell_config_intr, - .resume = &genphy_resume, - .suspend = &genphy_suspend, + .config_init = m88e1111_config_init, + .config_aneg = marvell_config_aneg, + .read_status = marvell_read_status, + .ack_interrupt = marvell_ack_interrupt, + .config_intr = marvell_config_intr, + .resume = genphy_resume, + .suspend = genphy_suspend, .read_page = marvell_read_page, .write_page = marvell_write_page, .get_sset_count = marvell_get_sset_count, @@ -2216,12 +2216,12 @@ static struct phy_driver marvell_drivers[] = { .name = "Marvell 88E1118", /* PHY_GBIT_FEATURES */ .probe = marvell_probe, - .config_init = &m88e1118_config_init, - .config_aneg = &m88e1118_config_aneg, - .ack_interrupt = &marvell_ack_interrupt, - .config_intr = &marvell_config_intr, - .resume = &genphy_resume, - .suspend = &genphy_suspend, + .config_init = m88e1118_config_init, + .config_aneg = m88e1118_config_aneg, + .ack_interrupt = marvell_ack_interrupt, + .config_intr = marvell_config_intr, + .resume = genphy_resume, + .suspend = genphy_suspend, .read_page = marvell_read_page, .write_page = marvell_write_page, .get_sset_count = marvell_get_sset_count, @@ -2233,15 +2233,15 @@ static struct phy_driver marvell_drivers[] = { .phy_id_mask = MARVELL_PHY_ID_MASK, .name = "Marvell 88E1121R", /* PHY_GBIT_FEATURES */ - .probe = &m88e1121_probe, - .config_init = &marvell_config_init, - .config_aneg = &m88e1121_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, + .probe = m88e1121_probe, + .config_init = marvell_config_init, + .config_aneg = m88e1121_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, .read_page = marvell_read_page, .write_page = marvell_write_page, .get_sset_count = marvell_get_sset_count, @@ -2256,16 +2256,16 @@ static struct phy_driver marvell_drivers[] = { .name = "Marvell 88E1318S", /* PHY_GBIT_FEATURES */ .probe = marvell_probe, - .config_init = &m88e1318_config_init, - .config_aneg = &m88e1318_config_aneg, - .read_status = &marvell_read_status, - .ack_interrupt = &marvell_ack_interrupt, - .config_intr = &marvell_config_intr, - .did_interrupt = &m88e1121_did_interrupt, - .get_wol = &m88e1318_get_wol, - .set_wol = &m88e1318_set_wol, - .resume = &genphy_resume, - .suspend = &genphy_suspend, + .config_init = m88e1318_config_init, + .config_aneg = m88e1318_config_aneg, + .read_status = marvell_read_status, + .ack_interrupt = marvell_ack_interrupt, + .config_intr = marvell_config_intr, + .did_interrupt = m88e1121_did_interrupt, + .get_wol = m88e1318_get_wol, + .set_wol = m88e1318_set_wol, + .resume = genphy_resume, + .suspend = genphy_suspend, .read_page = marvell_read_page, .write_page = marvell_write_page, .get_sset_count = marvell_get_sset_count, @@ -2278,13 +2278,13 @@ static struct phy_driver marvell_drivers[] = { .name = "Marvell 88E1145", /* PHY_GBIT_FEATURES */ .probe = marvell_probe, - .config_init = &m88e1145_config_init, - .config_aneg = &m88e1101_config_aneg, - .read_status = &genphy_read_status, - .ack_interrupt = &marvell_ack_interrupt, - .config_intr = &marvell_config_intr, - .resume = &genphy_resume, - .suspend = &genphy_suspend, + .config_init = m88e1145_config_init, + .config_aneg = m88e1101_config_aneg, + .read_status = genphy_read_status, + .ack_interrupt = marvell_ack_interrupt, + .config_intr = marvell_config_intr, + .resume = genphy_resume, + .suspend = genphy_suspend, .read_page = marvell_read_page, .write_page = marvell_write_page, .get_sset_count = marvell_get_sset_count, @@ -2299,12 +2299,12 @@ static struct phy_driver marvell_drivers[] = { .name = "Marvell 88E1149R", /* PHY_GBIT_FEATURES */ .probe = marvell_probe, - .config_init = &m88e1149_config_init, - .config_aneg = &m88e1118_config_aneg, - .ack_interrupt = &marvell_ack_interrupt, - .config_intr = &marvell_config_intr, - .resume = &genphy_resume, - .suspend = &genphy_suspend, + .config_init = m88e1149_config_init, + .config_aneg = m88e1118_config_aneg, + .ack_interrupt = marvell_ack_interrupt, + .config_intr = marvell_config_intr, + .resume = genphy_resume, + .suspend = genphy_suspend, .read_page = marvell_read_page, .write_page = marvell_write_page, .get_sset_count = marvell_get_sset_count, @@ -2317,12 +2317,12 @@ static struct phy_driver marvell_drivers[] = { .name = "Marvell 88E1240", /* PHY_GBIT_FEATURES */ .probe = marvell_probe, - .config_init = &m88e1111_config_init, - .config_aneg = &marvell_config_aneg, - .ack_interrupt = &marvell_ack_interrupt, - .config_intr = &marvell_config_intr, - .resume = &genphy_resume, - .suspend = &genphy_suspend, + .config_init = m88e1111_config_init, + .config_aneg = marvell_config_aneg, + .ack_interrupt = marvell_ack_interrupt, + .config_intr = marvell_config_intr, + .resume = genphy_resume, + .suspend = genphy_suspend, .read_page = marvell_read_page, .write_page = marvell_write_page, .get_sset_count = marvell_get_sset_count, @@ -2335,11 +2335,11 @@ static struct phy_driver marvell_drivers[] = { .name = "Marvell 88E1116R", /* PHY_GBIT_FEATURES */ .probe = marvell_probe, - .config_init = &m88e1116r_config_init, - .ack_interrupt = &marvell_ack_interrupt, - .config_intr = &marvell_config_intr, - .resume = &genphy_resume, - .suspend = &genphy_suspend, + .config_init = m88e1116r_config_init, + .ack_interrupt = marvell_ack_interrupt, + .config_intr = marvell_config_intr, + .resume = genphy_resume, + .suspend = genphy_suspend, .read_page = marvell_read_page, .write_page = marvell_write_page, .get_sset_count = marvell_get_sset_count, @@ -2353,17 +2353,17 @@ static struct phy_driver marvell_drivers[] = { .phy_id_mask = MARVELL_PHY_ID_MASK, .name = "Marvell 88E1510", .features = PHY_GBIT_FIBRE_FEATURES, - .probe = &m88e1510_probe, - .config_init = &m88e1510_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, - .get_wol = &m88e1318_get_wol, - .set_wol = &m88e1318_set_wol, - .resume = &marvell_resume, - .suspend = &marvell_suspend, + .probe = m88e1510_probe, + .config_init = m88e1510_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, + .get_wol = m88e1318_get_wol, + .set_wol = m88e1318_set_wol, + .resume = marvell_resume, + .suspend = marvell_suspend, .read_page = marvell_read_page, .write_page = marvell_write_page, .get_sset_count = marvell_get_sset_count, @@ -2379,14 +2379,14 @@ static struct phy_driver marvell_drivers[] = { .name = "Marvell 88E1540", /* PHY_GBIT_FEATURES */ .probe = m88e1510_probe, - .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, + .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, .read_page = marvell_read_page, .write_page = marvell_write_page, .get_sset_count = marvell_get_sset_count, @@ -2401,14 +2401,14 @@ static struct phy_driver marvell_drivers[] = { .name = "Marvell 88E1545", .probe = m88e1510_probe, /* PHY_GBIT_FEATURES */ - .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, + .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, .read_page = marvell_read_page, .write_page = marvell_write_page, .get_sset_count = marvell_get_sset_count, @@ -2423,14 +2423,14 @@ static struct phy_driver marvell_drivers[] = { .name = "Marvell 88E3016", /* PHY_BASIC_FEATURES */ .probe = marvell_probe, - .config_init = &m88e3016_config_init, - .aneg_done = &marvell_aneg_done, - .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, + .config_init = m88e3016_config_init, + .aneg_done = marvell_aneg_done, + .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, .read_page = marvell_read_page, .write_page = marvell_write_page, .get_sset_count = marvell_get_sset_count, @@ -2443,14 +2443,14 @@ static struct phy_driver marvell_drivers[] = { .name = "Marvell 88E6390", /* PHY_GBIT_FEATURES */ .probe = m88e6390_probe, - .config_init = &marvell_config_init, - .config_aneg = &m88e6390_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, + .config_init = marvell_config_init, + .config_aneg = m88e6390_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, .read_page = marvell_read_page, .write_page = marvell_write_page, .get_sset_count = marvell_get_sset_count, -- 2.25.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] net: phy: marvell: use a single style for referencing functions 2020-06-19 8:49 ` [PATCH 1/3] net: phy: marvell: use a single style for referencing functions Maxim Kochetkov @ 2020-06-19 14:56 ` Andrew Lunn 2020-06-19 18:08 ` Florian Fainelli 1 sibling, 0 replies; 13+ messages in thread From: Andrew Lunn @ 2020-06-19 14:56 UTC (permalink / raw) To: Maxim Kochetkov Cc: netdev, Florian Fainelli, Heiner Kallweit, Russell King, David S. Miller, Jakub Kicinski On Fri, Jun 19, 2020 at 11:49:02AM +0300, Maxim Kochetkov wrote: > The kernel in general does not use &func referencing format. > > Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] net: phy: marvell: use a single style for referencing functions 2020-06-19 8:49 ` [PATCH 1/3] net: phy: marvell: use a single style for referencing functions Maxim Kochetkov 2020-06-19 14:56 ` Andrew Lunn @ 2020-06-19 18:08 ` Florian Fainelli 1 sibling, 0 replies; 13+ messages in thread From: Florian Fainelli @ 2020-06-19 18:08 UTC (permalink / raw) To: Maxim Kochetkov, netdev Cc: Andrew Lunn, Heiner Kallweit, Russell King, David S. Miller, Jakub Kicinski On 6/19/2020 1:49 AM, Maxim Kochetkov wrote: > The kernel in general does not use &func referencing format. > > Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> -- Florian ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 2/3] net: phy: marvell: Add Marvell 88E1340S support 2020-06-19 8:49 [PATCH 0/3] Add Marvell 88E1340S, 88E1548P support Maxim Kochetkov 2020-06-19 8:49 ` [PATCH 1/3] net: phy: marvell: use a single style for referencing functions Maxim Kochetkov @ 2020-06-19 8:49 ` Maxim Kochetkov 2020-06-19 14:59 ` Andrew Lunn 2020-06-19 18:09 ` Florian Fainelli 2020-06-19 8:49 ` [PATCH 3/3] net: phy: marvell: Add Marvell 88E1548P support Maxim Kochetkov 2020-06-19 14:58 ` [PATCH 0/3] Add Marvell 88E1340S, " Andrew Lunn 3 siblings, 2 replies; 13+ messages in thread From: Maxim Kochetkov @ 2020-06-19 8:49 UTC (permalink / raw) To: netdev Cc: Maxim Kochetkov, Andrew Lunn, Florian Fainelli, Heiner Kallweit, Russell King, David S. Miller, Jakub Kicinski Add support for this new phy ID. Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru> --- drivers/net/phy/marvell.c | 23 +++++++++++++++++++++++ include/linux/marvell_phy.h | 1 + 2 files changed, 24 insertions(+) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index db5257f3b362..de6bd07a5983 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -2459,6 +2459,28 @@ static struct phy_driver marvell_drivers[] = { .get_tunable = m88e1540_get_tunable, .set_tunable = m88e1540_set_tunable, }, + { + .phy_id = MARVELL_PHY_ID_88E1340S, + .phy_id_mask = MARVELL_PHY_ID_MASK, + .name = "Marvell 88E1340S", + .probe = m88e1510_probe, + /* PHY_GBIT_FEATURES */ + .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, + .read_page = marvell_read_page, + .write_page = marvell_write_page, + .get_sset_count = marvell_get_sset_count, + .get_strings = marvell_get_strings, + .get_stats = marvell_get_stats, + .get_tunable = m88e1540_get_tunable, + .set_tunable = m88e1540_set_tunable, + }, }; module_phy_driver(marvell_drivers); @@ -2479,6 +2501,7 @@ static struct mdio_device_id __maybe_unused marvell_tbl[] = { { MARVELL_PHY_ID_88E1545, MARVELL_PHY_ID_MASK }, { MARVELL_PHY_ID_88E3016, MARVELL_PHY_ID_MASK }, { MARVELL_PHY_ID_88E6390, MARVELL_PHY_ID_MASK }, + { MARVELL_PHY_ID_88E1340S, MARVELL_PHY_ID_MASK }, { } }; diff --git a/include/linux/marvell_phy.h b/include/linux/marvell_phy.h index af6b11d4d673..c4390e9cbf15 100644 --- a/include/linux/marvell_phy.h +++ b/include/linux/marvell_phy.h @@ -15,6 +15,7 @@ #define MARVELL_PHY_ID_88E1149R 0x01410e50 #define MARVELL_PHY_ID_88E1240 0x01410e30 #define MARVELL_PHY_ID_88E1318S 0x01410e90 +#define MARVELL_PHY_ID_88E1340S 0x01410dc0 #define MARVELL_PHY_ID_88E1116R 0x01410e40 #define MARVELL_PHY_ID_88E1510 0x01410dd0 #define MARVELL_PHY_ID_88E1540 0x01410eb0 -- 2.25.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 2/3] net: phy: marvell: Add Marvell 88E1340S support 2020-06-19 8:49 ` [PATCH 2/3] net: phy: marvell: Add Marvell 88E1340S support Maxim Kochetkov @ 2020-06-19 14:59 ` Andrew Lunn 2020-06-19 18:09 ` Florian Fainelli 1 sibling, 0 replies; 13+ messages in thread From: Andrew Lunn @ 2020-06-19 14:59 UTC (permalink / raw) To: Maxim Kochetkov Cc: netdev, Florian Fainelli, Heiner Kallweit, Russell King, David S. Miller, Jakub Kicinski On Fri, Jun 19, 2020 at 11:49:03AM +0300, Maxim Kochetkov wrote: > Add support for this new phy ID. > > Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 2/3] net: phy: marvell: Add Marvell 88E1340S support 2020-06-19 8:49 ` [PATCH 2/3] net: phy: marvell: Add Marvell 88E1340S support Maxim Kochetkov 2020-06-19 14:59 ` Andrew Lunn @ 2020-06-19 18:09 ` Florian Fainelli 1 sibling, 0 replies; 13+ messages in thread From: Florian Fainelli @ 2020-06-19 18:09 UTC (permalink / raw) To: Maxim Kochetkov, netdev Cc: Andrew Lunn, Heiner Kallweit, Russell King, David S. Miller, Jakub Kicinski On 6/19/2020 1:49 AM, Maxim Kochetkov wrote: > Add support for this new phy ID. > > Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> -- Florian ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/3] net: phy: marvell: Add Marvell 88E1548P support 2020-06-19 8:49 [PATCH 0/3] Add Marvell 88E1340S, 88E1548P support Maxim Kochetkov 2020-06-19 8:49 ` [PATCH 1/3] net: phy: marvell: use a single style for referencing functions Maxim Kochetkov 2020-06-19 8:49 ` [PATCH 2/3] net: phy: marvell: Add Marvell 88E1340S support Maxim Kochetkov @ 2020-06-19 8:49 ` Maxim Kochetkov 2020-06-19 14:59 ` Andrew Lunn 2020-06-19 18:09 ` Florian Fainelli 2020-06-19 14:58 ` [PATCH 0/3] Add Marvell 88E1340S, " Andrew Lunn 3 siblings, 2 replies; 13+ messages in thread From: Maxim Kochetkov @ 2020-06-19 8:49 UTC (permalink / raw) To: netdev Cc: Maxim Kochetkov, Andrew Lunn, Florian Fainelli, Heiner Kallweit, Russell King, David S. Miller, Jakub Kicinski Add support for this new phy ID. Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru> --- drivers/net/phy/marvell.c | 24 ++++++++++++++++++++++++ include/linux/marvell_phy.h | 1 + 2 files changed, 25 insertions(+) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index de6bd07a5983..38e3ed448c64 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -2481,6 +2481,29 @@ static struct phy_driver marvell_drivers[] = { .get_tunable = m88e1540_get_tunable, .set_tunable = m88e1540_set_tunable, }, + { + .phy_id = MARVELL_PHY_ID_88E1548P, + .phy_id_mask = MARVELL_PHY_ID_MASK, + .name = "Marvell 88E1548P", + .probe = m88e1510_probe, + .features = PHY_GBIT_FIBRE_FEATURES, + .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, + .read_page = marvell_read_page, + .write_page = marvell_write_page, + .get_sset_count = marvell_get_sset_count, + .get_strings = marvell_get_strings, + .get_stats = marvell_get_stats, + .get_tunable = m88e1540_get_tunable, + .set_tunable = m88e1540_set_tunable, + }, + }; module_phy_driver(marvell_drivers); @@ -2502,6 +2525,7 @@ static struct mdio_device_id __maybe_unused marvell_tbl[] = { { MARVELL_PHY_ID_88E3016, MARVELL_PHY_ID_MASK }, { MARVELL_PHY_ID_88E6390, MARVELL_PHY_ID_MASK }, { MARVELL_PHY_ID_88E1340S, MARVELL_PHY_ID_MASK }, + { MARVELL_PHY_ID_88E1548P, MARVELL_PHY_ID_MASK }, { } }; diff --git a/include/linux/marvell_phy.h b/include/linux/marvell_phy.h index c4390e9cbf15..ff7b7607c8cf 100644 --- a/include/linux/marvell_phy.h +++ b/include/linux/marvell_phy.h @@ -20,6 +20,7 @@ #define MARVELL_PHY_ID_88E1510 0x01410dd0 #define MARVELL_PHY_ID_88E1540 0x01410eb0 #define MARVELL_PHY_ID_88E1545 0x01410ea0 +#define MARVELL_PHY_ID_88E1548P 0x01410ec0 #define MARVELL_PHY_ID_88E3016 0x01410e60 #define MARVELL_PHY_ID_88X3310 0x002b09a0 #define MARVELL_PHY_ID_88E2110 0x002b09b0 -- 2.25.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] net: phy: marvell: Add Marvell 88E1548P support 2020-06-19 8:49 ` [PATCH 3/3] net: phy: marvell: Add Marvell 88E1548P support Maxim Kochetkov @ 2020-06-19 14:59 ` Andrew Lunn 2020-06-19 18:09 ` Florian Fainelli 1 sibling, 0 replies; 13+ messages in thread From: Andrew Lunn @ 2020-06-19 14:59 UTC (permalink / raw) To: Maxim Kochetkov Cc: netdev, Florian Fainelli, Heiner Kallweit, Russell King, David S. Miller, Jakub Kicinski On Fri, Jun 19, 2020 at 11:49:04AM +0300, Maxim Kochetkov wrote: > Add support for this new phy ID. > > Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/3] net: phy: marvell: Add Marvell 88E1548P support 2020-06-19 8:49 ` [PATCH 3/3] net: phy: marvell: Add Marvell 88E1548P support Maxim Kochetkov 2020-06-19 14:59 ` Andrew Lunn @ 2020-06-19 18:09 ` Florian Fainelli 1 sibling, 0 replies; 13+ messages in thread From: Florian Fainelli @ 2020-06-19 18:09 UTC (permalink / raw) To: Maxim Kochetkov, netdev Cc: Andrew Lunn, Heiner Kallweit, Russell King, David S. Miller, Jakub Kicinski On 6/19/2020 1:49 AM, Maxim Kochetkov wrote: > Add support for this new phy ID. > > Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> -- Florian ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/3] Add Marvell 88E1340S, 88E1548P support 2020-06-19 8:49 [PATCH 0/3] Add Marvell 88E1340S, 88E1548P support Maxim Kochetkov ` (2 preceding siblings ...) 2020-06-19 8:49 ` [PATCH 3/3] net: phy: marvell: Add Marvell 88E1548P support Maxim Kochetkov @ 2020-06-19 14:58 ` Andrew Lunn 2020-06-19 20:27 ` David Miller 3 siblings, 1 reply; 13+ messages in thread From: Andrew Lunn @ 2020-06-19 14:58 UTC (permalink / raw) To: Maxim Kochetkov Cc: netdev, Florian Fainelli, Heiner Kallweit, Russell King, David S. Miller, Jakub Kicinski On Fri, Jun 19, 2020 at 11:49:01AM +0300, Maxim Kochetkov wrote: > This patch series add new PHY id support. > Russell King asked to use single style for referencing functions. Hi Maxim In future, please put which tree this patchset is for into the subject line: [PATCH net-next v2] ... Andrew ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/3] Add Marvell 88E1340S, 88E1548P support 2020-06-19 14:58 ` [PATCH 0/3] Add Marvell 88E1340S, " Andrew Lunn @ 2020-06-19 20:27 ` David Miller [not found] ` <1592602289.1450270@f540.i.mail.ru> 0 siblings, 1 reply; 13+ messages in thread From: David Miller @ 2020-06-19 20:27 UTC (permalink / raw) To: andrew; +Cc: fido_max, netdev, f.fainelli, hkallweit1, linux, kuba From: Andrew Lunn <andrew@lunn.ch> Date: Fri, 19 Jun 2020 16:58:02 +0200 > On Fri, Jun 19, 2020 at 11:49:01AM +0300, Maxim Kochetkov wrote: >> This patch series add new PHY id support. >> Russell King asked to use single style for referencing functions. > > Hi Maxim > > In future, please put which tree this patchset is for into the subject > line: > > [PATCH net-next v2] ... This patch series doesn't apply to net-next. It probably depends upon a recent change which is only in 'net'? ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <1592602289.1450270@f540.i.mail.ru>]
* Re: [PATCH 0/3] Add Marvell 88E1340S, 88E1548P support [not found] ` <1592602289.1450270@f540.i.mail.ru> @ 2020-06-20 2:47 ` David Miller 0 siblings, 0 replies; 13+ messages in thread From: David Miller @ 2020-06-20 2:47 UTC (permalink / raw) To: fido_max; +Cc: netdev, f.fainelli, hkallweit1, linux, kuba, andrew From: Кочетков Максим <fido_max@inbox.ru> Date: Sat, 20 Jun 2020 00:31:29 +0300 > It is based on 5.7.0 You need to post your patches against the tree onto which it will be applied, which in this case is net-next. ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2020-06-20 2:47 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-19 8:49 [PATCH 0/3] Add Marvell 88E1340S, 88E1548P support Maxim Kochetkov
2020-06-19 8:49 ` [PATCH 1/3] net: phy: marvell: use a single style for referencing functions Maxim Kochetkov
2020-06-19 14:56 ` Andrew Lunn
2020-06-19 18:08 ` Florian Fainelli
2020-06-19 8:49 ` [PATCH 2/3] net: phy: marvell: Add Marvell 88E1340S support Maxim Kochetkov
2020-06-19 14:59 ` Andrew Lunn
2020-06-19 18:09 ` Florian Fainelli
2020-06-19 8:49 ` [PATCH 3/3] net: phy: marvell: Add Marvell 88E1548P support Maxim Kochetkov
2020-06-19 14:59 ` Andrew Lunn
2020-06-19 18:09 ` Florian Fainelli
2020-06-19 14:58 ` [PATCH 0/3] Add Marvell 88E1340S, " Andrew Lunn
2020-06-19 20:27 ` David Miller
[not found] ` <1592602289.1450270@f540.i.mail.ru>
2020-06-20 2:47 ` 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).