Merge tag 'tegra-for-5.5-arm-core' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Mon, 4 Nov 2019 01:26:32 +0000 (17:26 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 4 Nov 2019 01:26:33 +0000 (17:26 -0800)
commitf5ed5010dfaa1ca67408b7821279c362fa98a16d
treea2918d0cf9fb9e06d22e2cec3186ceaef9cc0e8d
parent3bd00db6f0ea637b9d4cfe9eea98a2855e4e462c
parent91d7ff5aa7e3edd9ab99a424099476ed5667b152
Merge tag 'tegra-for-5.5-arm-core' of git://git./linux/kernel/git/tegra/linux into arm/soc

ARM: tegra: Core changes for v5.5-rc1

Contains two fixes for CPU idle and suspend/resume on early Tegra SoCs.

* tag 'tegra-for-5.5-arm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Use WFE for power-gating on Tegra30
  ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume()

Link: https://lore.kernel.org/r/20191102144521.3863321-5-thierry.reding@gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>