From: Arnd Bergmann Date: Tue, 3 Sep 2019 12:21:51 +0000 (+0200) Subject: Merge tag 'imx-soc-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... X-Git-Tag: v5.4-rc1~187^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6dde5cc391c73c8915f72c83e50c3973f6afe27;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'imx-soc-5.4' of git://git./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 --- e6dde5cc391c73c8915f72c83e50c3973f6afe27