Correct chip detect logic
PATCH 1/1 Correct chip detect logic
The lan91c96_detect_chip routine is not correct according to the manual.
Signed-off-by YanJun Yang <[email protected]>
--- drivers/net/lan91c96.c | 2 +- drivers/net/lan91c96.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/net/lan91c96.c +1 -1
@@ -780,7 +780,7 @@ static int lan91c96_detect_chip(struct eth_device *dev)u8 chip_id;int r;SMC_SELECT_BANK (dev,3 ); - chip_id =SMC_inw (dev,0xA ) &LAN91C96_REV_REVID ; + chip_id = (SMC_inw(dev, 0xA) & LAN91C96_REV_CHIPID) >>
LAN91C96_CHIPID_SHIFT;
SMC_SELECT_BANK(dev, 0);
for (r = 0; r < sizeof(supported_chips) / sizeof(struct id_type); r++)
if (chip_id == supported_chips[r].id)drivers/net/lan91c96.h +2 -1
@@ -519,7 +519,8 @@ typedef unsigned long int dword;**************************************************************************** */ #define LAN91C96_REV_REVID (0xFU << 0) -#define LAN91C96_REV_CHIPID (0xFU << 4) +#define LAN91C96_CHIPID_SHIFT 4 +#define LAN91C96_REV_CHIPID (0xFU << LAN91C96_CHIPID_SHIFT)/* ****************************************************************************
--
1.5.6.5
PATCH 1/1 Correct chip detect logic
Hello.
Quoted 4 lines · Yanjun Yang
The
lan91c96_detect_chiproutine is not correct according to the manual.Signed-off-by YanJun Yang<[email protected]>
[...]
drivers/net/lan91c96.c static int lan91c96_detect_chip(struct eth_device *dev) · line 783
Quoted 10 lines
drivers/net/lan91c96.c +1
-1@@ -780,7 +780,7 @@ static int lan91c96_detect_chip(struct eth_device *dev)u8 chip_id;int r;SMC_SELECT_BANK (dev,3 ); - chip_id =SMC_inw (dev,0xA )&LAN91C96_REV_REVID ; + chip_id = (SMC_inw(dev, 0xA)& LAN91C96_REV_CHIPID)>>
Indent with tabs, not spaces.
drivers/net/lan91c96.c static int lan91c96_detect_chip(struct eth_device *dev) · line 784
Quoted 1 line
drivers/net/lan91c96.c +0
-0LAN91C96_CHIPID_SHIFT ;
Your patch is line-wrapped.
Quoted 8 lines
drivers/net/lan91c96.c +0
-0SMC_SELECT_BANK (dev,0 );for (r =0 ; r<sizeof (supported_chips) /sizeof (struct id_type ); r++)if (chip_id == supported_chips[r].id)drivers/net/lan91c96.h +0
-0
drivers/net/lan91c96.h typedef unsigned long int dword; · line 523
Quoted 6 lines
drivers/net/lan91c96.h +2
-1@@ -519,7 +519,8 @@ typedef unsigned long int dword;**************************************************************************** */ #define LAN91C96_REV_REVID (0xFU<< 0) -#define LAN91C96_REV_CHIPID (0xFU<< 4) +#define LAN91C96_CHIPID_SHIFT 4 +#define LAN91C96_REV_CHIPID (0xFU<< LAN91C96_CHIPID_SHIFT)
Align the macro values please.
WBR, Sergei