From: Arnd Bergmann Date: Thu, 1 Apr 2021 09:33:34 +0000 (+0200) Subject: Merge tag 'omap-for-v5.12/fixes-rc4-signed' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: accepted/tizen/unified/20230118.172025~7525^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=111a5a421fb770d0fc2e09f7d57eb2cbe51e3ade;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'omap-for-v5.12/fixes-rc4-signed' of git://git./linux/kernel/git/tmlind/linux-omap into arm/fixes More fixes for omaps for v5.12-rc cycle Two fixes for hangs, mmc slot order fix, and a voltage typo fix: - Remove unused duplicate sha2md5_fck clock node that can race with the OMAP4_SHA2MD5_CLKCTRL clock node for disable for unused clocks - Add aliases for omap4/5 mmc to put the slots back into the right order again - Fix typo for bionic voltage controllers that accidentally use mpu for all instances instead of mpu, core and iva - Fix random hangs for droid4 caused by missing fix from TI Android kernel tree to do a dummy smc call on cpuidle wakeup path * tag 'omap-for-v5.12/fixes-rc4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP4: PM: update ROM return address for OSWR and OFF ARM: OMAP4: Fix PMIC voltage domains for bionic ARM: dts: Fix moving mmc devices with aliases for omap4 & 5 ARM: dts: Drop duplicate sha2md5_fck to fix clk_disable race Link: https://lore.kernel.org/r/pull-1616584662-702939@atomide.com Signed-off-by: Arnd Bergmann --- 111a5a421fb770d0fc2e09f7d57eb2cbe51e3ade