diff options
| author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2015-03-04 14:20:12 +0300 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-03-12 17:30:32 +0300 |
| commit | 936748fd34be484c8638a8547b4ca85afdfdf3a6 (patch) | |
| tree | ba4f4e3dacf35e6d9e387203d9d1484ae10e734c /arch/arm/mach-at91 | |
| parent | 5e7f82d73057a4b99643999e02c036cfbf1ed3ba (diff) | |
| download | linux-936748fd34be484c8638a8547b4ca85afdfdf3a6.tar.xz | |
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 <boris.brezillon@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
[nicolas.ferre@atmel.com: remove selection of PHYLIB in at91 Kconfig]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/sama5.c | 20 |
2 files changed, 0 insertions, 21 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index c74a44324e5b..d65981a8a4a9 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -24,7 +24,6 @@ config SOC_SAMA5 select GENERIC_CLOCKEVENTS select MEMORY select ATMEL_SDRAMC - select PHYLIB if NETDEVICES menu "Atmel AT91 System-on-Chip" diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c index 03dcb441f3d2..23d067a91cff 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(); } |