* [PATCH net-next 1/3] lan78xx: replace devid to chipid & chiprev
@ 2016-02-10 21:13 Woojung.Huh
2016-02-10 21:36 ` Sergei Shtylyov
2016-02-10 22:45 ` Andrew Lunn
0 siblings, 2 replies; 4+ messages in thread
From: Woojung.Huh @ 2016-02-10 21:13 UTC (permalink / raw)
To: davem; +Cc: netdev
Replace devid to chipid & chiprev for easy access.
Signed-off-by: Woojung Huh <woojung.huh@microchip.com>
---
drivers/net/usb/lan78xx.c | 20 +++++++++++---------
drivers/net/usb/lan78xx.h | 1 +
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 1c299b8..b14b22d 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -278,7 +278,8 @@ struct lan78xx_net {
int link_on;
u8 mdix_ctrl;
- u32 devid;
+ u32 chipid;
+ u32 chiprev;
struct mii_bus *mdiobus;
};
@@ -471,7 +472,7 @@ static int lan78xx_read_raw_eeprom(struct lan78xx_net *dev, u32 offset,
*/
ret = lan78xx_read_reg(dev, HW_CFG, &val);
saved = val;
- if ((dev->devid & ID_REV_CHIP_ID_MASK_) == 0x78000000) {
+ if ((dev->chipid) == ID_REV_CHIP_ID_7800_) {
val &= ~(HW_CFG_LED1_EN_ | HW_CFG_LED0_EN_);
ret = lan78xx_write_reg(dev, HW_CFG, val);
}
@@ -505,7 +506,7 @@ static int lan78xx_read_raw_eeprom(struct lan78xx_net *dev, u32 offset,
retval = 0;
exit:
- if ((dev->devid & ID_REV_CHIP_ID_MASK_) == 0x78000000)
+ if ((dev->chipid) == ID_REV_CHIP_ID_7800_)
ret = lan78xx_write_reg(dev, HW_CFG, saved);
return retval;
@@ -539,7 +540,7 @@ static int lan78xx_write_raw_eeprom(struct lan78xx_net *dev, u32 offset,
*/
ret = lan78xx_read_reg(dev, HW_CFG, &val);
saved = val;
- if ((dev->devid & ID_REV_CHIP_ID_MASK_) == 0x78000000) {
+ if ((dev->chipid) == ID_REV_CHIP_ID_7800_) {
val &= ~(HW_CFG_LED1_EN_ | HW_CFG_LED0_EN_);
ret = lan78xx_write_reg(dev, HW_CFG, val);
}
@@ -587,7 +588,7 @@ static int lan78xx_write_raw_eeprom(struct lan78xx_net *dev, u32 offset,
retval = 0;
exit:
- if ((dev->devid & ID_REV_CHIP_ID_MASK_) == 0x78000000)
+ if ((dev->chipid) == ID_REV_CHIP_ID_7800_)
ret = lan78xx_write_reg(dev, HW_CFG, saved);
return retval;
@@ -1555,9 +1556,9 @@ static int lan78xx_mdio_init(struct lan78xx_net *dev)
snprintf(dev->mdiobus->id, MII_BUS_ID_SIZE, "usb-%03d:%03d",
dev->udev->bus->busnum, dev->udev->devnum);
- switch (dev->devid & ID_REV_CHIP_ID_MASK_) {
- case 0x78000000:
- case 0x78500000:
+ switch (dev->chipid) {
+ case ID_REV_CHIP_ID_7800_:
+ case ID_REV_CHIP_ID_7850_:
/* set to internal PHY id */
dev->mdiobus->phy_mask = ~(1 << 1);
break;
@@ -1918,7 +1919,8 @@ static int lan78xx_reset(struct lan78xx_net *dev)
/* save DEVID for later usage */
ret = lan78xx_read_reg(dev, ID_REV, &buf);
- dev->devid = buf;
+ dev->chipid = (buf & ID_REV_CHIP_ID_MASK_) >> 16;
+ dev->chiprev = buf & ID_REV_CHIP_REV_MASK_;
/* Respond to the IN token with a NAK */
ret = lan78xx_read_reg(dev, USB_CFG0, &buf);
diff --git a/drivers/net/usb/lan78xx.h b/drivers/net/usb/lan78xx.h
index a93fb65..4092790 100644
--- a/drivers/net/usb/lan78xx.h
+++ b/drivers/net/usb/lan78xx.h
@@ -107,6 +107,7 @@
#define ID_REV_CHIP_ID_MASK_ (0xFFFF0000)
#define ID_REV_CHIP_REV_MASK_ (0x0000FFFF)
#define ID_REV_CHIP_ID_7800_ (0x7800)
+#define ID_REV_CHIP_ID_7850_ (0x7850)
#define FPGA_REV (0x04)
#define FPGA_REV_MINOR_MASK_ (0x0000FF00)
--
2.7.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 1/3] lan78xx: replace devid to chipid & chiprev
2016-02-10 21:13 [PATCH net-next 1/3] lan78xx: replace devid to chipid & chiprev Woojung.Huh
@ 2016-02-10 21:36 ` Sergei Shtylyov
2016-02-10 22:49 ` Woojung.Huh
2016-02-10 22:45 ` Andrew Lunn
1 sibling, 1 reply; 4+ messages in thread
From: Sergei Shtylyov @ 2016-02-10 21:36 UTC (permalink / raw)
To: Woojung.Huh, davem; +Cc: netdev
On 02/11/2016 12:13 AM, Woojung.Huh@microchip.com wrote:
> Replace devid to chipid & chiprev for easy access.
>
> Signed-off-by: Woojung Huh <woojung.huh@microchip.com>
> ---
> drivers/net/usb/lan78xx.c | 20 +++++++++++---------
> drivers/net/usb/lan78xx.h | 1 +
> 2 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
> index 1c299b8..b14b22d 100644
> --- a/drivers/net/usb/lan78xx.c
> +++ b/drivers/net/usb/lan78xx.c
[...]
> @@ -471,7 +472,7 @@ static int lan78xx_read_raw_eeprom(struct lan78xx_net *dev, u32 offset,
> */
> ret = lan78xx_read_reg(dev, HW_CFG, &val);
> saved = val;
> - if ((dev->devid & ID_REV_CHIP_ID_MASK_) == 0x78000000) {
> + if ((dev->chipid) == ID_REV_CHIP_ID_7800_) {
Inner parens not needed.
[...]
> @@ -505,7 +506,7 @@ static int lan78xx_read_raw_eeprom(struct lan78xx_net *dev, u32 offset,
>
> retval = 0;
> exit:
> - if ((dev->devid & ID_REV_CHIP_ID_MASK_) == 0x78000000)
> + if ((dev->chipid) == ID_REV_CHIP_ID_7800_)
Same here.
[...]
> @@ -539,7 +540,7 @@ static int lan78xx_write_raw_eeprom(struct lan78xx_net *dev, u32 offset,
> */
> ret = lan78xx_read_reg(dev, HW_CFG, &val);
> saved = val;
> - if ((dev->devid & ID_REV_CHIP_ID_MASK_) == 0x78000000) {
> + if ((dev->chipid) == ID_REV_CHIP_ID_7800_) {
And here.
[...]
> @@ -587,7 +588,7 @@ static int lan78xx_write_raw_eeprom(struct lan78xx_net *dev, u32 offset,
>
> retval = 0;
> exit:
> - if ((dev->devid & ID_REV_CHIP_ID_MASK_) == 0x78000000)
> + if ((dev->chipid) == ID_REV_CHIP_ID_7800_)
Here too.
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 1/3] lan78xx: replace devid to chipid & chiprev
2016-02-10 21:13 [PATCH net-next 1/3] lan78xx: replace devid to chipid & chiprev Woojung.Huh
2016-02-10 21:36 ` Sergei Shtylyov
@ 2016-02-10 22:45 ` Andrew Lunn
1 sibling, 0 replies; 4+ messages in thread
From: Andrew Lunn @ 2016-02-10 22:45 UTC (permalink / raw)
To: Woojung.Huh; +Cc: davem, netdev
On Wed, Feb 10, 2016 at 09:13:37PM +0000, Woojung.Huh@microchip.com wrote:
>
> Replace devid to chipid & chiprev for easy access.
>
> Signed-off-by: Woojung Huh <woojung.huh@microchip.com>
> ---
> drivers/net/usb/lan78xx.c | 20 +++++++++++---------
> drivers/net/usb/lan78xx.h | 1 +
> 2 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
> index 1c299b8..b14b22d 100644
> --- a/drivers/net/usb/lan78xx.c
> +++ b/drivers/net/usb/lan78xx.c
> @@ -278,7 +278,8 @@ struct lan78xx_net {
> int link_on;
> u8 mdix_ctrl;
>
> - u32 devid;
> + u32 chipid;
> + u32 chiprev;
> struct mii_bus *mdiobus;
> };
>
> @@ -471,7 +472,7 @@ static int lan78xx_read_raw_eeprom(struct lan78xx_net *dev, u32 offset,
> */
> ret = lan78xx_read_reg(dev, HW_CFG, &val);
> saved = val;
> - if ((dev->devid & ID_REV_CHIP_ID_MASK_) == 0x78000000) {
> + if ((dev->chipid) == ID_REV_CHIP_ID_7800_) {
Why the extra ( ... )?
Andrew
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH net-next 1/3] lan78xx: replace devid to chipid & chiprev
2016-02-10 21:36 ` Sergei Shtylyov
@ 2016-02-10 22:49 ` Woojung.Huh
0 siblings, 0 replies; 4+ messages in thread
From: Woojung.Huh @ 2016-02-10 22:49 UTC (permalink / raw)
To: sergei.shtylyov, andrew; +Cc: netdev, davem
Thanks Sergei & Andrew,
Will remove extra brackets and repost.
Woojung
> > @@ -471,7 +472,7 @@ static int lan78xx_read_raw_eeprom(struct
> lan78xx_net *dev, u32 offset,
> > */
> > ret = lan78xx_read_reg(dev, HW_CFG, &val);
> > saved = val;
> > - if ((dev->devid & ID_REV_CHIP_ID_MASK_) == 0x78000000) {
> > + if ((dev->chipid) == ID_REV_CHIP_ID_7800_) {
> > @@ -505,7 +506,7 @@ static int lan78xx_read_raw_eeprom(struct
> lan78xx_net *dev, u32 offset,
> >
> > retval = 0;
> > exit:
> > - if ((dev->devid & ID_REV_CHIP_ID_MASK_) == 0x78000000)
> > + if ((dev->chipid) == ID_REV_CHIP_ID_7800_)
> > @@ -539,7 +540,7 @@ static int lan78xx_write_raw_eeprom(struct
> lan78xx_net *dev, u32 offset,
> > */
> > ret = lan78xx_read_reg(dev, HW_CFG, &val);
> > saved = val;
> > - if ((dev->devid & ID_REV_CHIP_ID_MASK_) == 0x78000000) {
> > + if ((dev->chipid) == ID_REV_CHIP_ID_7800_) {
> > @@ -587,7 +588,7 @@ static int lan78xx_write_raw_eeprom(struct
> lan78xx_net *dev, u32 offset,
> >
> > retval = 0;
> > exit:
> > - if ((dev->devid & ID_REV_CHIP_ID_MASK_) == 0x78000000)
> > + if ((dev->chipid) == ID_REV_CHIP_ID_7800_)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-02-10 22:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-10 21:13 [PATCH net-next 1/3] lan78xx: replace devid to chipid & chiprev Woojung.Huh
2016-02-10 21:36 ` Sergei Shtylyov
2016-02-10 22:49 ` Woojung.Huh
2016-02-10 22:45 ` Andrew Lunn
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).