Skip to contentSkip to conversation

Few more fixes for omaps for v5.12-rc cycle

GIT PULL Applied Tony Lindgren 2 participants 2 messages Apr 6, 2021 – Apr 8, 2021

lore
Share & tools
lore
#0 lore raw

From: "Tony Lindgren" <[email protected]>

The following changes since commit b3d09a06d89f474cb52664e016849315a97e09d9:

ARM: OMAP4: PM: update ROM return address for OSWR and OFF (2021-03-17 15:15:52 +0200)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.12/fixes-rc6-signed

for you to fetch changes up to fc85dc42a38405099f97aa2af709fe9504a82508:

ARM: OMAP2+: Fix uninitialized sr_inst (2021-03-31 09:27:41 +0300)

----------------------------------------------------------------
Fixes for omaps for v5.12-rc cycle

Fix swapped mmc device order also for omap3 that got changed with the recent PROBE_PREFER_ASYNCHRONOUS changes. While eventually the aliases should be board specific, all the mmc device instances are all there in the SoC, and we do probe them by default so that PM runtime can idle the devices if left enabled from the bootloader.

Also included are two compiler warning fixes.

----------------------------------------------------------------
Tony Lindgren (3):
ARM: OMAP2+: Fix warning for omap_init_time_of()
ARM: dts: Fix swapped mmc order for omap3
ARM: OMAP2+: Fix uninitialized sr_inst

 arch/arm/boot/dts/omap3.dtsi        | 3 +++
 arch/arm/mach-omap2/board-generic.c | 2 +-
 arch/arm/mach-omap2/sr_device.c     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
#1 lore raw

From: Arnd Bergmann <[email protected]>

Quoted 9 lines · Tony Lindgren

The following changes since commit b3d09a06d89f474cb52664e016849315a97e09d9:

ARM: OMAP4: PM: update ROM return address for OSWR and OFF (2021-03-17 15:15:52 +0200)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.12/fixes-rc6-signed

[...]

Merged into arm/fixes, thanks!

merge commit: b9a9786a13ea158ee3b23614217f2e3158178421

Arnd