linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Aaro Koskinen <aaro.koskinen@iki.fi>,
	Peter Ujfalusi <peter.ujfalusi@gmail.com>,
	Tony Lindgren <tony@atomide.com>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH 4.4 24/32] ARM: dts: Fix swapped mmc order for omap3
Date: Mon, 26 Apr 2021 09:29:22 +0200	[thread overview]
Message-ID: <20210426072817.388695663@linuxfoundation.org> (raw)
In-Reply-To: <20210426072816.574319312@linuxfoundation.org>

From: Tony Lindgren <tony@atomide.com>

[ Upstream commit a1ebdb3741993f853865d1bd8f77881916ad53a7 ]

Also some omap3 devices like n900 seem to have eMMC and micro-sd swapped
around with commit 21b2cec61c04 ("mmc: Set PROBE_PREFER_ASYNCHRONOUS for
drivers that existed in v4.4").

Let's fix the issue with aliases as discussed on the mailing lists. While
the mmc aliases should be board specific, let's first fix the issue with
minimal changes.

Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Peter Ujfalusi <peter.ujfalusi@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 arch/arm/boot/dts/omap3.dtsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 8a2b25332b8c..a2e41d79e829 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -22,6 +22,9 @@
 		i2c0 = &i2c1;
 		i2c1 = &i2c2;
 		i2c2 = &i2c3;
+		mmc0 = &mmc1;
+		mmc1 = &mmc2;
+		mmc2 = &mmc3;
 		serial0 = &uart1;
 		serial1 = &uart2;
 		serial2 = &uart3;
-- 
2.30.2




  parent reply	other threads:[~2021-04-26  7:32 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-26  7:28 [PATCH 4.4 00/32] 4.4.268-rc1 review Greg Kroah-Hartman
2021-04-26  7:28 ` [PATCH 4.4 01/32] net/sctp: fix race condition in sctp_destroy_sock Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 02/32] Input: nspire-keypad - enable interrupts only when opened Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 03/32] dmaengine: dw: Make it dependent to HAS_IOMEM Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 04/32] ARM: dts: Fix moving mmc devices with aliases for omap4 & 5 Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 05/32] arc: kernel: Return -EFAULT if copy_to_user() fails Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 06/32] neighbour: Disregard DEAD dst in neigh_update Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 07/32] ARM: keystone: fix integer overflow warning Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 08/32] ASoC: fsl_esai: Fix TDM slot setup for I2S mode Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 09/32] net: ieee802154: stop dump llsec keys for monitors Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 10/32] net: ieee802154: stop dump llsec devs " Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 11/32] net: ieee802154: forbid monitor for add llsec dev Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 12/32] net: ieee802154: stop dump llsec devkeys for monitors Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 13/32] net: ieee802154: forbid monitor for add llsec devkey Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 14/32] net: ieee802154: stop dump llsec seclevels for monitors Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 15/32] net: ieee802154: forbid monitor for add llsec seclevel Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 16/32] pcnet32: Use pci_resource_len to validate PCI resource Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 17/32] Input: i8042 - fix Pegatron C15B ID entry Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 18/32] scsi: libsas: Reset num_scatter if libata marks qc as NODATA Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 19/32] net: davicom: Fix regulator not turned off on failed probe Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 20/32] i40e: fix the panic when running bpf in xdpdrv mode Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 21/32] ARM: 9071/1: uprobes: Dont hook on thumb instructions Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 22/32] net: hso: fix null-ptr-deref during tty device unregistration Greg Kroah-Hartman
2021-04-26  7:36   ` Johan Hovold
2021-04-26  7:58     ` Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 23/32] ext4: correct error label in ext4_rename() Greg Kroah-Hartman
2021-04-26  7:29 ` Greg Kroah-Hartman [this message]
2021-04-26  7:29 ` [PATCH 4.4 25/32] s390/entry: save the caller of psw_idle Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 26/32] xen-netback: Check for hotplug-status existence before watching Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 27/32] cavium/liquidio: Fix duplicate argument Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 28/32] ia64: fix discontig.c section mismatches Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 29/32] ia64: tools: remove duplicate definition of ia64_mf() on ia64 Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 30/32] compiler.h: enable builtin overflow checkers and add fallback code Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 31/32] overflow.h: Add allocation size calculation helpers Greg Kroah-Hartman
2021-04-26  7:29 ` [PATCH 4.4 32/32] x86/crash: Fix crash_setup_memmap_entries() out-of-bounds access Greg Kroah-Hartman
2021-04-26  9:05 ` [PATCH 4.4 00/32] 4.4.268-rc1 review Pavel Machek
2021-04-26 18:32 ` Guenter Roeck
2021-04-26 23:48 ` Shuah Khan
2021-04-27  7:48 ` Naresh Kamboju

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210426072817.388695663@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=aaro.koskinen@iki.fi \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peter.ujfalusi@gmail.com \
    --cc=sashal@kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).