[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Mon, 23 Jan 2012 10:48:10 +0100
From: Florian Fainelli <florian@...nwrt.org>
To: Chris Healy <cphealy@...il.com>
CC: "David S. Miller" <davem@...emloft.net>,
Ben Hutchings <ben@...adent.org.uk>,
Lennert Buytenhek <buytenh@...tstofly.org>,
netdev@...r.kernel.org
Subject: Re: [PATCH 1/1] dsa: Add reporting of silicon revision for Marvell
88E6123/88E6161/88E6165 switches.
Hello,
On 01/23/12 08:20, Chris Healy wrote:
> Add reporting of silicon revision during the probe function for Marvell 88E6123/88E6161/88E6165 switches.
>
> Signed-off-by: Chris Healy<cphealy@...il.com>
> ---
> drivers/net/dsa/mv88e6123_61_65.c | 21 +++++++++++++++++----
> 1 files changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/dsa/mv88e6123_61_65.c b/drivers/net/dsa/mv88e6123_61_65.c
> index c0a458f..6f23c95 100644
> --- a/drivers/net/dsa/mv88e6123_61_65.c
> +++ b/drivers/net/dsa/mv88e6123_61_65.c
> @@ -20,12 +20,25 @@ static char *mv88e6123_61_65_probe(struct mii_bus *bus, int sw_addr)
>
> ret = __mv88e6xxx_reg_read(bus, sw_addr, REG_PORT(0), 0x03);
> if (ret>= 0) {
> - ret&= 0xfff0;
> - if (ret == 0x1210)
> + if (ret == 0x1212)
> + return "Marvell 88E6123 (A1)";
> + if (ret == 0x1213)
> + return "Marvell 88E6123 (A2)";
> + if ((ret& 0xfff0) == 0x1210)
> return "Marvell 88E6123";
> - if (ret == 0x1610)
> +
> + if (ret == 0x1612)
> + return "Marvell 88E6161 (A1)";
> + if (ret == 0x1613)
> + return "Marvell 88E6161 (A2)";
> + if ((ret& 0xfff0) == 0x1610)
> return "Marvell 88E6161";
> - if (ret == 0x1650)
> +
> + if (ret == 0x1652)
> + return "Marvell 88E6165 (A1)";
> + if (ret == 0x1653)
> + return "Marvell 88e6165 (A2)";
> + if ((ret& 0xfff0) == 0x1650)
> return "Marvell 88E6165";
> }
What about a switch/case here?
--
Florian
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists