From mboxrd@z Thu Jan 1 00:00:00 1970 From: nicolas.ferre@atmel.com (Nicolas Ferre) Date: Fri, 6 Mar 2015 09:24:47 +0100 Subject: [PATCH] ARM: at91: remove ksz8081 phy fixup registration for sama5d4ek board In-Reply-To: <20150305233736.GE3989@piout.net> References: <1425468012-17274-1-git-send-email-boris.brezillon@free-electrons.com> <20150304113523.GF3989@piout.net> <20150305233736.GE3989@piout.net> Message-ID: <54F9644F.2050803@atmel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 >> Acked-by: Alexandre Belloni Acked-by: Nicolas Ferre > 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 >>> #include >>> #include >>> -#include >>> #include >>> #include >>> #include >>> -#include >>> #include >>> -#include >>> >>> #include >>> >>> @@ -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