Commit 7752b0d5 authored Jun 18, 2016 by Olof Johansson

Merge tag 'imx-fixes-4.7' of...

Merge tag 'imx-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

The i.MX fixes for 4.7:
 - Correct Micrel PHY mask to fix the issue that i.MX6UL ethernet works
   in U-Boot but not in kernel.

* tag 'imx-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: imx6ul: Fix Micrel PHY mask

Signed-off-by: Olof Johansson <olof@lixom.net>

parents a0110642 20c15226

arch/arm/mach-imx/mach-imx6ul.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ static int ksz8081_phy_fixup(struct phy_device *dev)
		static void __init imx6ul_enet_phy_init(void)
		{
		if (IS_BUILTIN(CONFIG_PHYLIB))
		phy_register_fixup_for_uid(PHY_ID_KSZ8081, 0xffffffff,
		phy_register_fixup_for_uid(PHY_ID_KSZ8081, MICREL_PHY_ID_MASK,
		ksz8081_phy_fixup);
		}