| Message ID | 20171009120302.23611-1-dmurphy@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3,1/3] net: phy: Remove TI DP83822 from DP83848 driver | expand |
On 10/09/2017 05:03 AM, Dan Murphy wrote: > Removing the DP83822 device from the DP83848 to > support the TI DP83822 dedicated driver that will > initially support WoL settings. Hi Dan, The ordering of patch 1 and 2 may have to be reversed, otherwise you are leaving people with the Generic PHY driver matching the DP83822 PHY after applying patch 1, and without proper interrupt management again unless they apply patch 2. It may even be better to combine patch 1 and 2 actually to have a cleaner transition. Sorry for noticing this so late in the series... > > Signed-off-by: Dan Murphy <dmurphy@ti.com> > --- > > v3 - No changes made > v2 - There was no v1 on this patch this is new. > > drivers/net/phy/dp83848.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/net/phy/dp83848.c b/drivers/net/phy/dp83848.c > index 3de4fe4dda77..3966d43c5146 100644 > --- a/drivers/net/phy/dp83848.c > +++ b/drivers/net/phy/dp83848.c > @@ -20,7 +20,6 @@ > #define TI_DP83620_PHY_ID 0x20005ce0 > #define NS_DP83848C_PHY_ID 0x20005c90 > #define TLK10X_PHY_ID 0x2000a210 > -#define TI_DP83822_PHY_ID 0x2000a240 > > /* Registers */ > #define DP83848_MICR 0x11 /* MII Interrupt Control Register */ > @@ -80,7 +79,6 @@ static struct mdio_device_id __maybe_unused dp83848_tbl[] = { > { NS_DP83848C_PHY_ID, 0xfffffff0 }, > { TI_DP83620_PHY_ID, 0xfffffff0 }, > { TLK10X_PHY_ID, 0xfffffff0 }, > - { TI_DP83822_PHY_ID, 0xfffffff0 }, > { } > }; > MODULE_DEVICE_TABLE(mdio, dp83848_tbl); > @@ -110,7 +108,6 @@ static struct phy_driver dp83848_driver[] = { > DP83848_PHY_DRIVER(NS_DP83848C_PHY_ID, "NS DP83848C 10/100 Mbps PHY"), > DP83848_PHY_DRIVER(TI_DP83620_PHY_ID, "TI DP83620 10/100 Mbps PHY"), > DP83848_PHY_DRIVER(TLK10X_PHY_ID, "TI TLK10X 10/100 Mbps PHY"), > - DP83848_PHY_DRIVER(TI_DP83822_PHY_ID, "TI DP83822 10/100 Mbps PHY"), > }; > module_phy_driver(dp83848_driver); > > -- Florian
Florian On 10/09/2017 11:44 AM, Florian Fainelli wrote: > On 10/09/2017 05:03 AM, Dan Murphy wrote: >> Removing the DP83822 device from the DP83848 to >> support the TI DP83822 dedicated driver that will >> initially support WoL settings. > Hi Dan, > > The ordering of patch 1 and 2 may have to be reversed, otherwise you are > leaving people with the Generic PHY driver matching the DP83822 PHY > after applying patch 1, and without proper interrupt management again > unless they apply patch 2. > > It may even be better to combine patch 1 and 2 actually to have a > cleaner transition. > No worries I will squash patch 1 and 2. Dan > Sorry for noticing this so late in the series... > >> >> Signed-off-by: Dan Murphy <dmurphy@ti.com> >> --- >> >> v3 - No changes made >> v2 - There was no v1 on this patch this is new. >> >> drivers/net/phy/dp83848.c | 3 --- >> 1 file changed, 3 deletions(-) >> >> diff --git a/drivers/net/phy/dp83848.c b/drivers/net/phy/dp83848.c >> index 3de4fe4dda77..3966d43c5146 100644 >> --- a/drivers/net/phy/dp83848.c >> +++ b/drivers/net/phy/dp83848.c >> @@ -20,7 +20,6 @@ >> #define TI_DP83620_PHY_ID 0x20005ce0 >> #define NS_DP83848C_PHY_ID 0x20005c90 >> #define TLK10X_PHY_ID 0x2000a210 >> -#define TI_DP83822_PHY_ID 0x2000a240 >> >> /* Registers */ >> #define DP83848_MICR 0x11 /* MII Interrupt Control Register */ >> @@ -80,7 +79,6 @@ static struct mdio_device_id __maybe_unused dp83848_tbl[] = { >> { NS_DP83848C_PHY_ID, 0xfffffff0 }, >> { TI_DP83620_PHY_ID, 0xfffffff0 }, >> { TLK10X_PHY_ID, 0xfffffff0 }, >> - { TI_DP83822_PHY_ID, 0xfffffff0 }, >> { } >> }; >> MODULE_DEVICE_TABLE(mdio, dp83848_tbl); >> @@ -110,7 +108,6 @@ static struct phy_driver dp83848_driver[] = { >> DP83848_PHY_DRIVER(NS_DP83848C_PHY_ID, "NS DP83848C 10/100 Mbps PHY"), >> DP83848_PHY_DRIVER(TI_DP83620_PHY_ID, "TI DP83620 10/100 Mbps PHY"), >> DP83848_PHY_DRIVER(TLK10X_PHY_ID, "TI TLK10X 10/100 Mbps PHY"), >> - DP83848_PHY_DRIVER(TI_DP83822_PHY_ID, "TI DP83822 10/100 Mbps PHY"), >> }; >> module_phy_driver(dp83848_driver); >> >> > > -- ------------------ Dan Murphy
diff --git a/drivers/net/phy/dp83848.c b/drivers/net/phy/dp83848.c index 3de4fe4dda77..3966d43c5146 100644 --- a/drivers/net/phy/dp83848.c +++ b/drivers/net/phy/dp83848.c @@ -20,7 +20,6 @@ #define TI_DP83620_PHY_ID 0x20005ce0 #define NS_DP83848C_PHY_ID 0x20005c90 #define TLK10X_PHY_ID 0x2000a210 -#define TI_DP83822_PHY_ID 0x2000a240 /* Registers */ #define DP83848_MICR 0x11 /* MII Interrupt Control Register */ @@ -80,7 +79,6 @@ static struct mdio_device_id __maybe_unused dp83848_tbl[] = { { NS_DP83848C_PHY_ID, 0xfffffff0 }, { TI_DP83620_PHY_ID, 0xfffffff0 }, { TLK10X_PHY_ID, 0xfffffff0 }, - { TI_DP83822_PHY_ID, 0xfffffff0 }, { } }; MODULE_DEVICE_TABLE(mdio, dp83848_tbl); @@ -110,7 +108,6 @@ static struct phy_driver dp83848_driver[] = { DP83848_PHY_DRIVER(NS_DP83848C_PHY_ID, "NS DP83848C 10/100 Mbps PHY"), DP83848_PHY_DRIVER(TI_DP83620_PHY_ID, "TI DP83620 10/100 Mbps PHY"), DP83848_PHY_DRIVER(TLK10X_PHY_ID, "TI TLK10X 10/100 Mbps PHY"), - DP83848_PHY_DRIVER(TI_DP83822_PHY_ID, "TI DP83822 10/100 Mbps PHY"), }; module_phy_driver(dp83848_driver);
Removing the DP83822 device from the DP83848 to support the TI DP83822 dedicated driver that will initially support WoL settings. Signed-off-by: Dan Murphy <dmurphy@ti.com> --- v3 - No changes made v2 - There was no v1 on this patch this is new. drivers/net/phy/dp83848.c | 3 --- 1 file changed, 3 deletions(-) -- 2.14.0