Commit 121711bb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Merge "The i.MX SoC updates for 4.7" from Shawn Guo":

 - Allow TWD to be used on UP kernel, as the PREEMPT-RT and cyclictest
   shows that TWD has a slightly better performance than i.MX timer.

* tag 'imx-soc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: always use TWD on IMX6Q
parents 8946bdf7 acc98009

arch/arm/mach-imx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ config SOC_IMX6Q 
	bool "i.MX6 Quad/DualLite support"

	select ARM_ERRATA_764369 if SMP

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_ARM_TWD

	select PCI_DOMAINS if PCI

	select PINCTRL_IMX6Q

	select SOC_IMX6

CRA Git | Maintained and supported by SUSTech CRA and CCSE