Commit e6dde5cc authored Sep 03, 2019 by Arnd Bergmann

Merge tag 'imx-soc-5.4' of...

Merge tag 'imx-soc-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/soc

i.MX SoC changes for 5.4:
 - Drop AR8031 PHY TX delay adjusting from i.MX7D machine code, as
   it's superfluous due to the recent changes to Atheros AT803X driver.
 - Select TIMER_IMX_SYS_CTR for arm64 ARCH_MXC platform, since the
   system counter is needed as broadcast timer for cpuidle support.

* tag 'imx-soc-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: stop adjusting ar8031 phy tx delay
  arm64: Enable TIMER_IMX_SYS_CTR for ARCH_MXC platforms

Link: https://lore.kernel.org/r/20190825153237.28829-2-shawnguo@kernel.org


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents bf0b0eee acf993a0

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -30,12 +30,6 @@ static int ar8031_phy_fixup(struct phy_device *dev)
		val &= ~(0x1 << 8);
		phy_write(dev, 0xe, val);

		/* introduce tx clock delay */
		phy_write(dev, 0x1d, 0x5);
		val = phy_read(dev, 0x1e);
		val \|= 0x0100;
		phy_write(dev, 0x1e, val);

		return 0;
		}

arch/arm64/Kconfig.platforms

+1 −0

Original line number	Diff line number	Diff line
		@@ -173,6 +173,7 @@ config ARCH_MXC
		select PM
		select PM_GENERIC_DOMAINS
		select SOC_BUS
		select TIMER_IMX_SYS_CTR
		help
		This enables support for the ARMv8 based SoCs in the
		NXP i.MX family.