[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20090428.021203.74435054.davem@davemloft.net>
Date: Tue, 28 Apr 2009 02:12:03 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: grant.likely@...retlab.ca
Cc: scottwood@...escale.com, Joakim.Tjernlund@...nsmode.se,
afleming@...escale.com, benh@...nel.crashing.org,
linuxppc-dev@...abs.org, netdev@...r.kernel.org
Subject: Re: [PATCH] net: Fix ucc_geth.c handling of phy 'interface'
property.
From: Grant Likely <grant.likely@...retlab.ca>
Date: Mon, 27 Apr 2009 11:50:20 -0600
> On Mon, Apr 27, 2009 at 11:36 AM, Scott Wood <scottwood@...escale.com> wrote:
>> On Mon, Apr 27, 2009 at 09:36:13AM -0600, Grant Likely wrote:
>>> From: Grant Likely <grant.likely@...retlab.ca>
>>>
>>> Previous rework to ucc_geth.c to add of_mdio support (net: Rework
>>> ucc_geth driver to use of_mdio infrastructure) added a block of
>>> code which broke older openfirmware device trees which use an
>>> 'interface' property in the phy node to describe the connection
>>> between the MAC and the PHY. This patch removes the offending blurb.
>> [snip]
>>> prop = of_get_property(np, "phy-connection-type", NULL);
>>> if (!prop) {
>>> /* handle interface property present in old trees */
>>> - if (!phy)
>>> - return -ENODEV;
>>> -
>>> prop = of_get_property(phy, "interface", NULL);
>>> if (prop != NULL) {
>>> phy_interface = enet_to_phy_interface[*prop];
>>
>> The above test only makes a difference when there is no phy node -- so I
>> don't see how it was breaking device trees that had a phy node (with or
>> without an "interface" property). I can see it breaking fixed link
>> device trees, though.
>
> Sorry, you're right. I got myself confused when I was writing the
> description. This patch fixes breakage when using a fixed-link and
> there is no phy-connection-type property.
Patch applied with commit message fixed up.
--
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