From: afaerber@suse•de (Andreas Färber)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v1 2/2] net: stmmac: add fixed_phy support via fixed-link DT binding
Date: Mon, 26 Jan 2015 04:01:59 +0100 [thread overview]
Message-ID: <54C5AE27.4080206@suse.de> (raw)
In-Reply-To: <1422239858-3452-3-git-send-email-ming.lei@canonical.com>
Am 26.01.2015 um 03:37 schrieb Ming Lei:
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 8c6b7c16..ddb4351 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -847,8 +847,11 @@ static int stmmac_init_phy(struct net_device *dev)
> * 0 rather than 0xffff. Catch this here and treat 0 as a non-existent
> * device as well.
> * Note: phydev->phy_id is the result of reading the UID PHY registers.
> + * But phy_id returned from fixed phy is always zero, so bypass the
> + * check for fixed phy.
> */
> - if (phydev->phy_id == 0) {
> + if (phydev->phy_id == 0 && (!priv->plat->phy_bus_name ||
> + strcmp(priv->plat->phy_bus_name,"fixed"))) {
Small nit here: There's a space missing between the arguments.
Cheers,
Andreas
> phy_disconnect(phydev);
> return -ENODEV;
> }
[snip]
--
SUSE Linux GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany
GF: Felix Imend?rffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu,
Graham Norton; HRB 21284 (AG N?rnberg)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150126/4315fdde/attachment.sig>
prev parent reply other threads:[~2015-01-26 3:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-26 2:37 [PATCH v1 0/2] ARM EXYNOS5 & net: add fixed phy support Ming Lei
2015-01-26 2:37 ` [PATCH v1 1/2] ARM: exynos5440-sd5v1: switch to fixed-link DT binding Ming Lei
2015-01-26 2:37 ` [PATCH v1 2/2] net: stmmac: add fixed_phy support via " Ming Lei
2015-01-26 3:01 ` Andreas Färber [this message]
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=54C5AE27.4080206@suse.de \
--to=afaerber@suse$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.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