Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / arch / arm / mach-at91 / board-dt-sama5.c

diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/board-dt-sama5.c
index 4cc84e8a32899dad46be92f22f997bd31a20e856..6a064e53f4d6e6f211ba48bb683344eda7aecf19 100644 (file)
--- a/arch/arm/mach-at91/board-dt-sama5.c
+++ b/arch/arm/mach-at91/board-dt-sama5.c
@@ -35,30 +35,8 @@ static void __init sama5_dt_timer_init(void)
        at91sam926x_pit_init();
 }
 
-static int ksz9021rn_phy_fixup(struct phy_device *phy)
-{
-       int value;
-
-       /* Set delay values */
-       value = MICREL_KSZ9021_RGMII_CLK_CTRL_PAD_SCEW | 0x8000;
-       phy_write(phy, MICREL_KSZ9021_EXTREG_CTRL, value);
-       value = 0xF2F4;
-       phy_write(phy, MICREL_KSZ9021_EXTREG_DATA_WRITE, value);
-       value = MICREL_KSZ9021_RGMII_RX_DATA_PAD_SCEW | 0x8000;
-       phy_write(phy, MICREL_KSZ9021_EXTREG_CTRL, value);
-       value = 0x2222;
-       phy_write(phy, MICREL_KSZ9021_EXTREG_DATA_WRITE, value);
-
-       return 0;
-}
-
 static void __init sama5_dt_device_init(void)
 {
-       if (of_machine_is_compatible("atmel,sama5d3xcm") &&
-           IS_ENABLED(CONFIG_PHYLIB))
-               phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,
-                       ksz9021rn_phy_fixup);
-
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }