ARM: at91: remove ksz8081 phy fixup registration for sama5d4ek board

PATCH New Boris Brezillon 3 participants 5 messages Mar 4, 2015 – Mar 11, 2015

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm/Microchip (AT91) SoC support

lore

Share & tools

lore

Boris Brezillon

author

2015-03-04 11:20 UTC #0 lore raw

PATCH 1/1 ARM: at91: remove ksz8081 phy fixup registration for sama5d4ek board

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 <[email protected]>

---
 arch/arm/mach-at91/sama5.c | 20 --------------------
 1 file changed, 20 deletions(-)

arch/arm/mach-at91/sama5.c +0 ~~-20~~

index 03dcb44..23d067a 100644
@@ -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();
 }

Signature · 1 line

1.9.1

Alexandre Belloni

2015-03-04 11:35 UTC #1 lore raw

PATCH 1/1 ARM: at91: remove ksz8081 phy fixup registration for sama5d4ek board

Quoted 6 lines · Boris Brezillon

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 <[email protected]>

Acked-by Alexandre Belloni <[email protected]>

Quoted 51 lines

---
 arch/arm/mach-at91/sama5.c | 20 --------------------
 1 file changed, 20 deletions(-)

arch/arm/mach-at91/sama5.c +0 ~~-20~~

index 03dcb44..23d067a 100644
@@ -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();
 }

Signature · 1 line

1.9.1

Signature · 3 lines

Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Alexandre Belloni

2015-03-05 23:37 UTC #2 lore raw

PATCH 1/1 ARM: at91: remove ksz8081 phy fixup registration for sama5d4ek board

Quoted 9 lines · Alexandre Belloni

Quoted 6 lines · Boris Brezillon
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 <[email protected]>
Acked-by Alexandre Belloni <[email protected]>

Actually, as Rob pointed out in my patch series, please remove the selection of PHYLIB in the Kconfig.

Quoted 56 lines

Quoted 51 lines

---
 arch/arm/mach-at91/sama5.c | 20 --------------------
 1 file changed, 20 deletions(-)

arch/arm/mach-at91/sama5.c +0 ~~-20~~

index 03dcb44..23d067a 100644
@@ -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();
 }

Signature · 1 line

1.9.1

Signature · 3 lines

Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Signature · 3 lines

Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Nicolas Ferre

2015-03-06 08:24 UTC #3 lore raw

PATCH 1/1 ARM: at91: remove ksz8081 phy fixup registration for sama5d4ek board

Le 06/03/2015 00:37, Alexandre Belloni a ?crit :

Quoted 9 lines · Alexandre Belloni

Quoted 8 lines · Boris Brezillon
Quoted 6 lines
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 <[email protected]>
Acked-by Alexandre Belloni <[email protected]>

Acked-by Nicolas Ferre <[email protected]>

Quoted 2 lines

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.

Quoted 57 lines

Quoted 56 lines

Quoted 51 lines

---
 arch/arm/mach-at91/sama5.c | 20 --------------------
 1 file changed, 20 deletions(-)

arch/arm/mach-at91/sama5.c +0 ~~-20~~

index 03dcb44..23d067a 100644
@@ -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();
 }

Signature · 1 line

1.9.1

Signature · 3 lines

Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Signature · 1 line

Nicolas Ferre

Nicolas Ferre

2015-03-11 16:34 UTC #4 lore raw

PATCH 1/1 ARM: at91: remove ksz8081 phy fixup registration for sama5d4ek board

Le 06/03/2015 09:24, Nicolas Ferre a ?crit :

Quoted 11 lines

Le 06/03/2015 00:37, Alexandre Belloni a ?crit :
Quoted 9 lines · Alexandre Belloni
Quoted 8 lines · Boris Brezillon
Quoted 6 lines
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 <[email protected]>
Acked-by Alexandre Belloni <[email protected]>

Quoted 7 lines

Acked-by Nicolas Ferre <[email protected]>
Quoted 2 lines
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,

Quoted 59 lines

Quoted 57 lines

Quoted 56 lines

Quoted 51 lines

---
 arch/arm/mach-at91/sama5.c | 20 --------------------
 1 file changed, 20 deletions(-)

arch/arm/mach-at91/sama5.c +0 ~~-20~~

index 03dcb44..23d067a 100644
@@ -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();
 }

Signature · 1 line

1.9.1

Signature · 3 lines

Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Signature · 1 line

Nicolas Ferre