From: Florian Fainelli <florian@openwrt•org>
To: Chris Healy <cphealy@gmail•com>
Cc: "David S. Miller" <davem@davemloft•net>,
Ben Hutchings <ben@decadent•org.uk>,
Lennert Buytenhek <buytenh@wantstofly•org>,
netdev@vger•kernel.org
Subject: Re: [PATCH 1/1] dsa: Add reporting of silicon revision for Marvell 88E6123/88E6161/88E6165 switches.
Date: Mon, 23 Jan 2012 10:48:10 +0100 [thread overview]
Message-ID: <4F1D2CDA.9050107@openwrt.org> (raw)
In-Reply-To: <1327303254-28573-1-git-send-email-cphealy@gmail.com>
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@gmail•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
next prev parent reply other threads:[~2012-01-23 9:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-23 7:20 [PATCH 1/1] dsa: Add reporting of silicon revision for Marvell 88E6123/88E6161/88E6165 switches Chris Healy
2012-01-23 9:48 ` Florian Fainelli [this message]
2012-01-23 18:59 ` David Miller
2012-01-23 19:35 ` Ben Hutchings
2012-01-23 19:46 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F1D2CDA.9050107@openwrt.org \
--to=florian@openwrt$(echo .)org \
--cc=ben@decadent$(echo .)org.uk \
--cc=buytenh@wantstofly$(echo .)org \
--cc=cphealy@gmail$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox