Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / arm / mach-imx / mach-imx7d.c

diff --git a/arch/arm/mach-imx/mach-imx7d.c b/arch/arm/mach-imx/mach-imx7d.c
index 879c359..6fdd06b 100644 (file)
--- a/arch/arm/mach-imx/mach-imx7d.c
+++ b/arch/arm/mach-imx/mach-imx7d.c
@@ -14,25 +14,6 @@
 
 #include "common.h"
 
-static int ar8031_phy_fixup(struct phy_device *dev)
-{
-       u16 val;
-
-       /* Set RGMII IO voltage to 1.8V */
-       phy_write(dev, 0x1d, 0x1f);
-       phy_write(dev, 0x1e, 0x8);
-
-       /* disable phy AR8031 SmartEEE function. */
-       phy_write(dev, 0xd, 0x3);
-       phy_write(dev, 0xe, 0x805d);
-       phy_write(dev, 0xd, 0x4003);
-       val = phy_read(dev, 0xe);
-       val &= ~(0x1 << 8);
-       phy_write(dev, 0xe, val);
-
-       return 0;
-}
-
 static int bcm54220_phy_fixup(struct phy_device *dev)
 {
        /* enable RXC skew select RGMII copper mode */
@@ -44,14 +25,11 @@ static int bcm54220_phy_fixup(struct phy_device *dev)
        return 0;
 }
 
-#define PHY_ID_AR8031  0x004dd074
 #define PHY_ID_BCM54220        0x600d8589
 
 static void __init imx7d_enet_phy_init(void)
 {
        if (IS_BUILTIN(CONFIG_PHYLIB)) {
-               phy_register_fixup_for_uid(PHY_ID_AR8031, 0xffffffff,
-                                          ar8031_phy_fixup);
                phy_register_fixup_for_uid(PHY_ID_BCM54220, 0xffffffff,
                                           bcm54220_phy_fixup);
        }
@@ -91,7 +69,7 @@ static void __init imx7d_init_late(void)
 static void __init imx7d_init_irq(void)
 {
        imx_init_revision_from_anatop();
-       imx_src_init();
+       imx7_src_init();
        irqchip_init();
 }
 
@@ -102,6 +80,7 @@ static const char *const imx7d_dt_compat[] __initconst = {
 };
 
 DT_MACHINE_START(IMX7D, "Freescale i.MX7 Dual (Device Tree)")
+       .smp            = smp_ops(imx7_smp_ops),
        .init_irq       = imx7d_init_irq,
        .init_machine   = imx7d_init_machine,
        .init_late      = imx7d_init_late,