* [PATCH 1/1] phy: micrel: Fix finding PHY properties in MAC node for KSZ9031.
@ 2015-12-22 10:58 Henri Roosen
2015-12-22 11:06 ` Andrew Lunn
0 siblings, 1 reply; 6+ messages in thread
From: Henri Roosen @ 2015-12-22 10:58 UTC (permalink / raw)
To: f.fainelli; +Cc: netdev, linux-kernel, andrew, Henri Roosen
Commit 651df2183543 ("phy: micrel: Fix finding PHY properties in MAC
node.") only fixes finding PHY properties in MAC node for KSZ9021. This
commit applies the same fix for KSZ9031.
Signed-off-by: Henri Roosen <henri.roosen@ginzinger.com>
---
drivers/net/phy/micrel.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index e13ad6c..fc6c058 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -470,9 +470,18 @@ static int ksz9031_config_init(struct phy_device *phydev)
"txd2-skew-ps", "txd3-skew-ps"
};
static const char *control_skews[2] = {"txen-skew-ps", "rxdv-skew-ps"};
+ const struct device *dev_walker;
- if (!of_node && dev->parent->of_node)
- of_node = dev->parent->of_node;
+ /* The Micrel driver has a deprecated option to place phy OF
+ * properties in the MAC node. Walk up the tree of devices to
+ * find a device with an OF node.
+ */
+ dev_walker = &phydev->dev;
+ do {
+ of_node = dev_walker->of_node;
+ dev_walker = dev_walker->parent;
+
+ } while (!of_node && dev_walker);
if (of_node) {
ksz9031_of_load_skew_values(phydev, of_node,
--
2.1.4
________________________________
Ginzinger electronic systems GmbH
Gewerbegebiet Pirath 16
4952 Weng im Innkreis
www.ginzinger.com
Firmenbuchnummer: FN 364958d
Firmenbuchgericht: Ried im Innkreis
UID-Nr.: ATU66521089
________________________________
*** WEIHNACHTSURLAUB VON DONNERSTAG, DEN 24. DEZEMBER 2015 BIS MITTWOCH, DEN 6. JAENNER 2016 ***
*** CHRISTMAS VACATION FROM THURSDAY, THE 24 DECEMBER 2015 TO WEDNESDAY, 6 JANUARY 2016 ***
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] phy: micrel: Fix finding PHY properties in MAC node for KSZ9031.
2015-12-22 10:58 [PATCH 1/1] phy: micrel: Fix finding PHY properties in MAC node for KSZ9031 Henri Roosen
@ 2015-12-22 11:06 ` Andrew Lunn
2015-12-22 22:14 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Lunn @ 2015-12-22 11:06 UTC (permalink / raw)
To: Henri Roosen, David Miller; +Cc: f.fainelli, netdev, linux-kernel
On Tue, Dec 22, 2015 at 11:58:40AM +0100, Henri Roosen wrote:
> Commit 651df2183543 ("phy: micrel: Fix finding PHY properties in MAC
> node.") only fixes finding PHY properties in MAC node for KSZ9021. This
> commit applies the same fix for KSZ9031.
>
> Signed-off-by: Henri Roosen <henri.roosen@ginzinger.com>
Fixes: 8b63ec1837fa ("phylib: Make PHYs children of their MDIO bus, not the bus' parent.")
Acked-by: Andrew Lunn <andrew@lunn.ch>
Andrew
> ---
> drivers/net/phy/micrel.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
> index e13ad6c..fc6c058 100644
> --- a/drivers/net/phy/micrel.c
> +++ b/drivers/net/phy/micrel.c
> @@ -470,9 +470,18 @@ static int ksz9031_config_init(struct phy_device *phydev)
> "txd2-skew-ps", "txd3-skew-ps"
> };
> static const char *control_skews[2] = {"txen-skew-ps", "rxdv-skew-ps"};
> + const struct device *dev_walker;
>
> - if (!of_node && dev->parent->of_node)
> - of_node = dev->parent->of_node;
> + /* The Micrel driver has a deprecated option to place phy OF
> + * properties in the MAC node. Walk up the tree of devices to
> + * find a device with an OF node.
> + */
> + dev_walker = &phydev->dev;
> + do {
> + of_node = dev_walker->of_node;
> + dev_walker = dev_walker->parent;
> +
> + } while (!of_node && dev_walker);
>
> if (of_node) {
> ksz9031_of_load_skew_values(phydev, of_node,
> --
> 2.1.4
>
>
> ________________________________
>
> Ginzinger electronic systems GmbH
> Gewerbegebiet Pirath 16
> 4952 Weng im Innkreis
> www.ginzinger.com
>
> Firmenbuchnummer: FN 364958d
> Firmenbuchgericht: Ried im Innkreis
> UID-Nr.: ATU66521089
>
> ________________________________
> *** WEIHNACHTSURLAUB VON DONNERSTAG, DEN 24. DEZEMBER 2015 BIS MITTWOCH, DEN 6. JAENNER 2016 ***
> *** CHRISTMAS VACATION FROM THURSDAY, THE 24 DECEMBER 2015 TO WEDNESDAY, 6 JANUARY 2016 ***
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] phy: micrel: Fix finding PHY properties in MAC node for KSZ9031.
2015-12-22 11:06 ` Andrew Lunn
@ 2015-12-22 22:14 ` David Miller
2015-12-23 8:11 ` Henri Roosen
2015-12-23 8:42 ` Henri Roosen
0 siblings, 2 replies; 6+ messages in thread
From: David Miller @ 2015-12-22 22:14 UTC (permalink / raw)
To: andrew; +Cc: henri.roosen, f.fainelli, netdev, linux-kernel
From: Andrew Lunn <andrew@lunn.ch>
Date: Tue, 22 Dec 2015 12:06:34 +0100
> On Tue, Dec 22, 2015 at 11:58:40AM +0100, Henri Roosen wrote:
>> Commit 651df2183543 ("phy: micrel: Fix finding PHY properties in MAC
>> node.") only fixes finding PHY properties in MAC node for KSZ9021. This
>> commit applies the same fix for KSZ9031.
>>
>> Signed-off-by: Henri Roosen <henri.roosen@ginzinger.com>
>
> Fixes: 8b63ec1837fa ("phylib: Make PHYs children of their MDIO bus, not the bus' parent.")
>
> Acked-by: Andrew Lunn <andrew@lunn.ch>
This does not apply cleanly to any of my trees.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] phy: micrel: Fix finding PHY properties in MAC node for KSZ9031.
2015-12-22 22:14 ` David Miller
@ 2015-12-23 8:11 ` Henri Roosen
2015-12-23 16:37 ` David Miller
2015-12-23 8:42 ` Henri Roosen
1 sibling, 1 reply; 6+ messages in thread
From: Henri Roosen @ 2015-12-23 8:11 UTC (permalink / raw)
To: David Miller, andrew; +Cc: f.fainelli, netdev, linux-kernel
On 12/22/2015 11:14 PM, David Miller wrote:
> From: Andrew Lunn <andrew@lunn.ch>
> Date: Tue, 22 Dec 2015 12:06:34 +0100
>
>> On Tue, Dec 22, 2015 at 11:58:40AM +0100, Henri Roosen wrote:
>>> Commit 651df2183543 ("phy: micrel: Fix finding PHY properties in MAC
>>> node.") only fixes finding PHY properties in MAC node for KSZ9021. This
>>> commit applies the same fix for KSZ9031.
>>>
>>> Signed-off-by: Henri Roosen <henri.roosen@ginzinger.com>
>>
>> Fixes: 8b63ec1837fa ("phylib: Make PHYs children of their MDIO bus, not the bus' parent.")
>>
>> Acked-by: Andrew Lunn <andrew@lunn.ch>
>
> This does not apply cleanly to any of my trees.
David, does the original patch not apply cleanly or is your comment only
on the message from Andrew?
Else please let me know what is wrong with the original patch. I've
tested it applies cleanly to v4.4-rc6 and to v4.3.
>
________________________________
Ginzinger electronic systems GmbH
Gewerbegebiet Pirath 16
4952 Weng im Innkreis
www.ginzinger.com
Firmenbuchnummer: FN 364958d
Firmenbuchgericht: Ried im Innkreis
UID-Nr.: ATU66521089
________________________________
*** WEIHNACHTSURLAUB VON DONNERSTAG, DEN 24. DEZEMBER 2015 BIS MITTWOCH, DEN 6. JAENNER 2016 ***
*** CHRISTMAS VACATION FROM THURSDAY, THE 24 DECEMBER 2015 TO WEDNESDAY, 6 JANUARY 2016 ***
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] phy: micrel: Fix finding PHY properties in MAC node for KSZ9031.
2015-12-22 22:14 ` David Miller
2015-12-23 8:11 ` Henri Roosen
@ 2015-12-23 8:42 ` Henri Roosen
1 sibling, 0 replies; 6+ messages in thread
From: Henri Roosen @ 2015-12-23 8:42 UTC (permalink / raw)
To: David Miller, andrew; +Cc: f.fainelli, netdev, linux-kernel
On 12/22/2015 11:14 PM, David Miller wrote:
> From: Andrew Lunn <andrew@lunn.ch>
> Date: Tue, 22 Dec 2015 12:06:34 +0100
>
>> On Tue, Dec 22, 2015 at 11:58:40AM +0100, Henri Roosen wrote:
>>> Commit 651df2183543 ("phy: micrel: Fix finding PHY properties in MAC
>>> node.") only fixes finding PHY properties in MAC node for KSZ9021. This
>>> commit applies the same fix for KSZ9031.
>>>
>>> Signed-off-by: Henri Roosen <henri.roosen@ginzinger.com>
>>
>> Fixes: 8b63ec1837fa ("phylib: Make PHYs children of their MDIO bus, not the bus' parent.")
>>
>> Acked-by: Andrew Lunn <andrew@lunn.ch>
>
> This does not apply cleanly to any of my trees.
Found the problem. It's the mail server. Will send a correct patch later.
>
________________________________
Ginzinger electronic systems GmbH
Gewerbegebiet Pirath 16
4952 Weng im Innkreis
www.ginzinger.com
Firmenbuchnummer: FN 364958d
Firmenbuchgericht: Ried im Innkreis
UID-Nr.: ATU66521089
________________________________
*** WEIHNACHTSURLAUB VON DONNERSTAG, DEN 24. DEZEMBER 2015 BIS MITTWOCH, DEN 6. JAENNER 2016 ***
*** CHRISTMAS VACATION FROM THURSDAY, THE 24 DECEMBER 2015 TO WEDNESDAY, 6 JANUARY 2016 ***
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] phy: micrel: Fix finding PHY properties in MAC node for KSZ9031.
2015-12-23 8:11 ` Henri Roosen
@ 2015-12-23 16:37 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2015-12-23 16:37 UTC (permalink / raw)
To: henri.roosen; +Cc: andrew, f.fainelli, netdev, linux-kernel
From: Henri Roosen <henri.roosen@ginzinger.com>
Date: Wed, 23 Dec 2015 09:11:22 +0100
> On 12/22/2015 11:14 PM, David Miller wrote:
>> From: Andrew Lunn <andrew@lunn.ch>
>> Date: Tue, 22 Dec 2015 12:06:34 +0100
>>
>>> On Tue, Dec 22, 2015 at 11:58:40AM +0100, Henri Roosen wrote:
>>>> Commit 651df2183543 ("phy: micrel: Fix finding PHY properties in MAC
>>>> node.") only fixes finding PHY properties in MAC node for
>>>> KSZ9021. This
>>>> commit applies the same fix for KSZ9031.
>>>>
>>>> Signed-off-by: Henri Roosen <henri.roosen@ginzinger.com>
>>>
>>> Fixes: 8b63ec1837fa ("phylib: Make PHYs children of their MDIO bus,
>>> not the bus' parent.")
>>>
>>> Acked-by: Andrew Lunn <andrew@lunn.ch>
>>
>> This does not apply cleanly to any of my trees.
>
> David, does the original patch not apply cleanly or is your comment
> only
> on the message from Andrew?
>
> Else please let me know what is wrong with the original patch. I've
> tested it applies cleanly to v4.4-rc6 and to v4.3.
Your original patch did not apply cleanly.
All patches must be against either my 'net' or 'net-next' trees. And
you must explicitly state what tree your patch is against and therefore
which tree you expect me to apply it too.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-12-23 16:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-22 10:58 [PATCH 1/1] phy: micrel: Fix finding PHY properties in MAC node for KSZ9031 Henri Roosen
2015-12-22 11:06 ` Andrew Lunn
2015-12-22 22:14 ` David Miller
2015-12-23 8:11 ` Henri Roosen
2015-12-23 16:37 ` David Miller
2015-12-23 8:42 ` Henri Roosen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).