* [PATCH] ARM: at91: remove ksz8081 phy fixup registration for sama5d4ek board
@ 2015-03-04 11:20 Boris Brezillon
2015-03-04 11:35 ` Alexandre Belloni
0 siblings, 1 reply; 5+ messages in thread
From: Boris Brezillon @ 2015-03-04 11:20 UTC (permalink / raw)
To: linux-arm-kernel
Commit 2b0ba96cea60 ("net: phy: micrel: disable NAND-tree for KSZ8021,
KSZ8031, KSZ8051, KSZ8081") automated the NAND-tree mode deactivation
process, thus making this phy fixup useless.
Remove it along with the associated headers inclusion.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
---
arch/arm/mach-at91/sama5.c | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c
index 03dcb44..23d067a 100644
--- a/arch/arm/mach-at91/sama5.c
+++ b/arch/arm/mach-at91/sama5.c
@@ -11,13 +11,10 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/gpio.h>
-#include <linux/micrel_phy.h>
#include <linux/of.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
-#include <linux/phy.h>
#include <linux/clk-provider.h>
-#include <linux/phy.h>
#include <mach/hardware.h>
@@ -29,25 +26,8 @@
#include "generic.h"
-static int ksz8081_phy_fixup(struct phy_device *phy)
-{
- int value;
-
- value = phy_read(phy, 0x16);
- value &= ~0x20;
- phy_write(phy, 0x16, value);
-
- return 0;
-}
-
static void __init sama5_dt_device_init(void)
{
- if (of_machine_is_compatible("atmel,sama5d4ek") &&
- IS_ENABLED(CONFIG_PHYLIB)) {
- phy_register_fixup_for_id("fc028000.etherne:00",
- ksz8081_phy_fixup);
- }
-
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
at91sam9x5_pm_init();
}
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] ARM: at91: remove ksz8081 phy fixup registration for sama5d4ek board
2015-03-04 11:20 [PATCH] ARM: at91: remove ksz8081 phy fixup registration for sama5d4ek board Boris Brezillon
@ 2015-03-04 11:35 ` Alexandre Belloni
2015-03-05 23:37 ` Alexandre Belloni
0 siblings, 1 reply; 5+ messages in thread
From: Alexandre Belloni @ 2015-03-04 11:35 UTC (permalink / raw)
To: linux-arm-kernel
On 04/03/2015 at 12:20:12 +0100, Boris Brezillon wrote :
> Commit 2b0ba96cea60 ("net: phy: micrel: disable NAND-tree for KSZ8021,
> KSZ8031, KSZ8051, KSZ8081") automated the NAND-tree mode deactivation
> process, thus making this phy fixup useless.
> Remove it along with the associated headers inclusion.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
> arch/arm/mach-at91/sama5.c | 20 --------------------
> 1 file changed, 20 deletions(-)
>
> diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c
> index 03dcb44..23d067a 100644
> --- a/arch/arm/mach-at91/sama5.c
> +++ b/arch/arm/mach-at91/sama5.c
> @@ -11,13 +11,10 @@
> #include <linux/init.h>
> #include <linux/module.h>
> #include <linux/gpio.h>
> -#include <linux/micrel_phy.h>
> #include <linux/of.h>
> #include <linux/of_irq.h>
> #include <linux/of_platform.h>
> -#include <linux/phy.h>
> #include <linux/clk-provider.h>
> -#include <linux/phy.h>
>
> #include <mach/hardware.h>
>
> @@ -29,25 +26,8 @@
>
> #include "generic.h"
>
> -static int ksz8081_phy_fixup(struct phy_device *phy)
> -{
> - int value;
> -
> - value = phy_read(phy, 0x16);
> - value &= ~0x20;
> - phy_write(phy, 0x16, value);
> -
> - return 0;
> -}
> -
> static void __init sama5_dt_device_init(void)
> {
> - if (of_machine_is_compatible("atmel,sama5d4ek") &&
> - IS_ENABLED(CONFIG_PHYLIB)) {
> - phy_register_fixup_for_id("fc028000.etherne:00",
> - ksz8081_phy_fixup);
> - }
> -
> of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
> at91sam9x5_pm_init();
> }
> --
> 1.9.1
>
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: at91: remove ksz8081 phy fixup registration for sama5d4ek board
2015-03-04 11:35 ` Alexandre Belloni
@ 2015-03-05 23:37 ` Alexandre Belloni
2015-03-06 8:24 ` Nicolas Ferre
0 siblings, 1 reply; 5+ messages in thread
From: Alexandre Belloni @ 2015-03-05 23:37 UTC (permalink / raw)
To: linux-arm-kernel
On 04/03/2015 at 12:35:23 +0100, Alexandre Belloni wrote :
> On 04/03/2015 at 12:20:12 +0100, Boris Brezillon wrote :
> > Commit 2b0ba96cea60 ("net: phy: micrel: disable NAND-tree for KSZ8021,
> > KSZ8031, KSZ8051, KSZ8081") automated the NAND-tree mode deactivation
> > process, thus making this phy fixup useless.
> > Remove it along with the associated headers inclusion.
> >
> > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
>
Actually, as Rob pointed out in my patch series, please remove the
selection of PHYLIB in the Kconfig.
> > ---
> > arch/arm/mach-at91/sama5.c | 20 --------------------
> > 1 file changed, 20 deletions(-)
> >
> > diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c
> > index 03dcb44..23d067a 100644
> > --- a/arch/arm/mach-at91/sama5.c
> > +++ b/arch/arm/mach-at91/sama5.c
> > @@ -11,13 +11,10 @@
> > #include <linux/init.h>
> > #include <linux/module.h>
> > #include <linux/gpio.h>
> > -#include <linux/micrel_phy.h>
> > #include <linux/of.h>
> > #include <linux/of_irq.h>
> > #include <linux/of_platform.h>
> > -#include <linux/phy.h>
> > #include <linux/clk-provider.h>
> > -#include <linux/phy.h>
> >
> > #include <mach/hardware.h>
> >
> > @@ -29,25 +26,8 @@
> >
> > #include "generic.h"
> >
> > -static int ksz8081_phy_fixup(struct phy_device *phy)
> > -{
> > - int value;
> > -
> > - value = phy_read(phy, 0x16);
> > - value &= ~0x20;
> > - phy_write(phy, 0x16, value);
> > -
> > - return 0;
> > -}
> > -
> > static void __init sama5_dt_device_init(void)
> > {
> > - if (of_machine_is_compatible("atmel,sama5d4ek") &&
> > - IS_ENABLED(CONFIG_PHYLIB)) {
> > - phy_register_fixup_for_id("fc028000.etherne:00",
> > - ksz8081_phy_fixup);
> > - }
> > -
> > of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
> > at91sam9x5_pm_init();
> > }
> > --
> > 1.9.1
> >
>
> --
> Alexandre Belloni, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: at91: remove ksz8081 phy fixup registration for sama5d4ek board
2015-03-05 23:37 ` Alexandre Belloni
@ 2015-03-06 8:24 ` Nicolas Ferre
2015-03-11 16:34 ` Nicolas Ferre
0 siblings, 1 reply; 5+ messages in thread
From: Nicolas Ferre @ 2015-03-06 8:24 UTC (permalink / raw)
To: linux-arm-kernel
Le 06/03/2015 00:37, Alexandre Belloni a ?crit :
> On 04/03/2015 at 12:35:23 +0100, Alexandre Belloni wrote :
>> On 04/03/2015 at 12:20:12 +0100, Boris Brezillon wrote :
>>> Commit 2b0ba96cea60 ("net: phy: micrel: disable NAND-tree for KSZ8021,
>>> KSZ8031, KSZ8051, KSZ8081") automated the NAND-tree mode deactivation
>>> process, thus making this phy fixup useless.
>>> Remove it along with the associated headers inclusion.
>>>
>>> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
>> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> Actually, as Rob pointed out in my patch series, please remove the
> selection of PHYLIB in the Kconfig.
Ok, I do it when I queue this patch in at91-4.1-cleanup (aka no need to
re-send).
Thanks, bye.
>>> ---
>>> arch/arm/mach-at91/sama5.c | 20 --------------------
>>> 1 file changed, 20 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c
>>> index 03dcb44..23d067a 100644
>>> --- a/arch/arm/mach-at91/sama5.c
>>> +++ b/arch/arm/mach-at91/sama5.c
>>> @@ -11,13 +11,10 @@
>>> #include <linux/init.h>
>>> #include <linux/module.h>
>>> #include <linux/gpio.h>
>>> -#include <linux/micrel_phy.h>
>>> #include <linux/of.h>
>>> #include <linux/of_irq.h>
>>> #include <linux/of_platform.h>
>>> -#include <linux/phy.h>
>>> #include <linux/clk-provider.h>
>>> -#include <linux/phy.h>
>>>
>>> #include <mach/hardware.h>
>>>
>>> @@ -29,25 +26,8 @@
>>>
>>> #include "generic.h"
>>>
>>> -static int ksz8081_phy_fixup(struct phy_device *phy)
>>> -{
>>> - int value;
>>> -
>>> - value = phy_read(phy, 0x16);
>>> - value &= ~0x20;
>>> - phy_write(phy, 0x16, value);
>>> -
>>> - return 0;
>>> -}
>>> -
>>> static void __init sama5_dt_device_init(void)
>>> {
>>> - if (of_machine_is_compatible("atmel,sama5d4ek") &&
>>> - IS_ENABLED(CONFIG_PHYLIB)) {
>>> - phy_register_fixup_for_id("fc028000.etherne:00",
>>> - ksz8081_phy_fixup);
>>> - }
>>> -
>>> of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
>>> at91sam9x5_pm_init();
>>> }
>>> --
>>> 1.9.1
>>>
>>
>> --
>> Alexandre Belloni, Free Electrons
>> Embedded Linux, Kernel and Android engineering
>> http://free-electrons.com
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: at91: remove ksz8081 phy fixup registration for sama5d4ek board
2015-03-06 8:24 ` Nicolas Ferre
@ 2015-03-11 16:34 ` Nicolas Ferre
0 siblings, 0 replies; 5+ messages in thread
From: Nicolas Ferre @ 2015-03-11 16:34 UTC (permalink / raw)
To: linux-arm-kernel
Le 06/03/2015 09:24, Nicolas Ferre a ?crit :
> Le 06/03/2015 00:37, Alexandre Belloni a ?crit :
>> On 04/03/2015 at 12:35:23 +0100, Alexandre Belloni wrote :
>>> On 04/03/2015 at 12:20:12 +0100, Boris Brezillon wrote :
>>>> Commit 2b0ba96cea60 ("net: phy: micrel: disable NAND-tree for KSZ8021,
>>>> KSZ8031, KSZ8051, KSZ8081") automated the NAND-tree mode deactivation
>>>> process, thus making this phy fixup useless.
>>>> Remove it along with the associated headers inclusion.
>>>>
>>>> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
>>> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
>
> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>
>> Actually, as Rob pointed out in my patch series, please remove the
>> selection of PHYLIB in the Kconfig.
>
> Ok, I do it when I queue this patch in at91-4.1-cleanup (aka no need to
> re-send).
In at91-4.1-cleanup now. Thanks!
Bye,
>>>> ---
>>>> arch/arm/mach-at91/sama5.c | 20 --------------------
>>>> 1 file changed, 20 deletions(-)
>>>>
>>>> diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c
>>>> index 03dcb44..23d067a 100644
>>>> --- a/arch/arm/mach-at91/sama5.c
>>>> +++ b/arch/arm/mach-at91/sama5.c
>>>> @@ -11,13 +11,10 @@
>>>> #include <linux/init.h>
>>>> #include <linux/module.h>
>>>> #include <linux/gpio.h>
>>>> -#include <linux/micrel_phy.h>
>>>> #include <linux/of.h>
>>>> #include <linux/of_irq.h>
>>>> #include <linux/of_platform.h>
>>>> -#include <linux/phy.h>
>>>> #include <linux/clk-provider.h>
>>>> -#include <linux/phy.h>
>>>>
>>>> #include <mach/hardware.h>
>>>>
>>>> @@ -29,25 +26,8 @@
>>>>
>>>> #include "generic.h"
>>>>
>>>> -static int ksz8081_phy_fixup(struct phy_device *phy)
>>>> -{
>>>> - int value;
>>>> -
>>>> - value = phy_read(phy, 0x16);
>>>> - value &= ~0x20;
>>>> - phy_write(phy, 0x16, value);
>>>> -
>>>> - return 0;
>>>> -}
>>>> -
>>>> static void __init sama5_dt_device_init(void)
>>>> {
>>>> - if (of_machine_is_compatible("atmel,sama5d4ek") &&
>>>> - IS_ENABLED(CONFIG_PHYLIB)) {
>>>> - phy_register_fixup_for_id("fc028000.etherne:00",
>>>> - ksz8081_phy_fixup);
>>>> - }
>>>> -
>>>> of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
>>>> at91sam9x5_pm_init();
>>>> }
>>>> --
>>>> 1.9.1
>>>>
>>>
>>> --
>>> Alexandre Belloni, Free Electrons
>>> Embedded Linux, Kernel and Android engineering
>>> http://free-electrons.com
>>
>
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-03-11 16:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-04 11:20 [PATCH] ARM: at91: remove ksz8081 phy fixup registration for sama5d4ek board Boris Brezillon
2015-03-04 11:35 ` Alexandre Belloni
2015-03-05 23:37 ` Alexandre Belloni
2015-03-06 8:24 ` Nicolas Ferre
2015-03-11 16:34 ` Nicolas Ferre
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).