Merge tag 'omap-for-v5.9/fixes-rc7' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Sat, 3 Oct 2020 19:45:11 +0000 (12:45 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 3 Oct 2020 19:45:12 +0000 (12:45 -0700)
commit6869f774b1cd2bf20b4e4c5bfa13da311e02d495
tree10e24c5ef49c5fa84d824c1c9ec329367a37af66
parentfbbb7c53bb246900a1a43870977d6a771416e660
parent8f04aea048d56f3e39a7e543939450246542a6fc
Merge tag 'omap-for-v5.9/fixes-rc7' of git://git./linux/kernel/git/tmlind/linux-omap into arm/fixes

Two regression fixes for omaps

Fix AM33XX_IOPAD macro that broke after recent pinctrl changes
to use #pinctrl-cells = 2. And fix omap_enter_idle_coupled()
for cases where cpu_cluster_pm_enter() returns an error as
otherwise we may end up wrongly idling the MPU domain on the
next WFI.

* tag 'omap-for-v5.9/fixes-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Restore MPU power domain if cpu_cluster_pm_enter() fails
  ARM: dts: am33xx: modify AM33XX_IOPAD for #pinctrl-cells = 2

Link: https://lore.kernel.org/r/pull-1601544624-617679@atomide.com
Signed-off-by: Olof Johansson <olof@lixom.net>