| Message ID | 1344342187-29162-1-git-send-email-monstr@monstr.eu |
|---|---|
| State | Accepted |
| Delegated to: | Joe Hershberger |
| Headers | show |
On 08/07/2012 02:23 PM, Michal Simek wrote: > Marvell 88E1118R has different uid then 88E1118. > > Signed-off-by: Michal Simek <monstr@monstr.eu> > CC: Andy Fleming <afleming@freescale.com> > CC: Zang Roy-R61911 <tie-fei.zang@freescale.com> > CC: Kumar Gala <galak@kernel.crashing.org> > --- > drivers/net/phy/marvell.c | 11 +++++++++++ > 1 files changed, 11 insertions(+), 0 deletions(-) Joe: Could you add this patch to your custodian net repo? Thanks, Michal
Hi Tom and Joe, On 08/07/2012 02:23 PM, Michal Simek wrote: > Marvell 88E1118R has different uid then 88E1118. > > Signed-off-by: Michal Simek <monstr@monstr.eu> > CC: Andy Fleming <afleming@freescale.com> > CC: Zang Roy-R61911 <tie-fei.zang@freescale.com> > CC: Kumar Gala <galak@kernel.crashing.org> > --- > drivers/net/phy/marvell.c | 11 +++++++++++ > 1 files changed, 11 insertions(+), 0 deletions(-) can you please handle this patch? Or if you like I will add to my custodian tree. Thanks, Michal
Hi Michal, On Fri, Sep 14, 2012 at 8:15 AM, Michal Simek <monstr@monstr.eu> wrote: > Hi Tom and Joe, > > > On 08/07/2012 02:23 PM, Michal Simek wrote: >> >> Marvell 88E1118R has different uid then 88E1118. >> >> Signed-off-by: Michal Simek <monstr@monstr.eu> >> CC: Andy Fleming <afleming@freescale.com> >> CC: Zang Roy-R61911 <tie-fei.zang@freescale.com> >> CC: Kumar Gala <galak@kernel.crashing.org> >> --- >> drivers/net/phy/marvell.c | 11 +++++++++++ >> 1 files changed, 11 insertions(+), 0 deletions(-) > > > can you please handle this patch? Or if you like I will add > to my custodian tree. I'll apply it when I get to my backlog. -Joe
On 09/14/2012 06:17 PM, Joe Hershberger wrote: > Hi Michal, > > On Fri, Sep 14, 2012 at 8:15 AM, Michal Simek <monstr@monstr.eu> wrote: >> Hi Tom and Joe, >> >> >> On 08/07/2012 02:23 PM, Michal Simek wrote: >>> >>> Marvell 88E1118R has different uid then 88E1118. >>> >>> Signed-off-by: Michal Simek <monstr@monstr.eu> >>> CC: Andy Fleming <afleming@freescale.com> >>> CC: Zang Roy-R61911 <tie-fei.zang@freescale.com> >>> CC: Kumar Gala <galak@kernel.crashing.org> >>> --- >>> drivers/net/phy/marvell.c | 11 +++++++++++ >>> 1 files changed, 11 insertions(+), 0 deletions(-) >> >> >> can you please handle this patch? Or if you like I will add >> to my custodian tree. > > I'll apply it when I get to my backlog. Ok. Thanks, Michal
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index e51e799..4b27198 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -425,6 +425,16 @@ static struct phy_driver M88E1118_driver = { .shutdown = &genphy_shutdown, }; +static struct phy_driver M88E1118R_driver = { + .name = "Marvell 88E1118R", + .uid = 0x1410e40, + .mask = 0xffffff0, + .features = PHY_GBIT_FEATURES, + .config = &m88e1118_config, + .startup = &m88e1118_startup, + .shutdown = &genphy_shutdown, +}; + static struct phy_driver M88E1121R_driver = { .name = "Marvell 88E1121R", .uid = 0x1410cb0, @@ -461,6 +471,7 @@ int phy_marvell_init(void) phy_register(&M88E1145_driver); phy_register(&M88E1121R_driver); phy_register(&M88E1118_driver); + phy_register(&M88E1118R_driver); phy_register(&M88E1111S_driver); phy_register(&M88E1011S_driver);
Marvell 88E1118R has different uid then 88E1118. Signed-off-by: Michal Simek <monstr@monstr.eu> CC: Andy Fleming <afleming@freescale.com> CC: Zang Roy-R61911 <tie-fei.zang@freescale.com> CC: Kumar Gala <galak@kernel.crashing.org> --- drivers/net/phy/marvell.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)