From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA717C43470 for ; Mon, 19 Apr 2021 20:43:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B0C71613C0 for ; Mon, 19 Apr 2021 20:43:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242316AbhDSUo1 (ORCPT ); Mon, 19 Apr 2021 16:44:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:53916 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242319AbhDSUo1 (ORCPT ); Mon, 19 Apr 2021 16:44:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3070D613C1; Mon, 19 Apr 2021 20:43:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618865037; bh=bgHmZ1/6TCRbtxpJQ8LOZf/6+RiYTG7ymWzx81OFBtg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EMeozkuiM+CsezsSzXKmQ6vR3DID69N9RY1eNQRJWzPzCg9DS+pVQdahQAKFzFX9M uKcifKx2kw0jzgD0jBxcbpNMYOJD/GT2MeHRov3TGg7vqrdxIoVceI59cJVv2BATbv T5pX4TAxyD2uEgBNNm8LVEpd6tEW3vZ+zqUXPkFZTY+SJRQccWVbTED+gcLiMbjaqw LcVZbiAE/a+5dOwU8ZBvweJ2RcB2Dt8rI1I3gpQ9L4OB5X+kdjkzVoukLpg6adI0Q9 1w74plCKAR3pZ/vYjQN87ZkNx8v3AOfR0aBpLh8rnvHmLjFHp/1OnhHmWbWQHZMBDF HmV1UFzWoj5lw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tony Lindgren , Aaro Koskinen , Peter Ujfalusi , Sasha Levin , linux-omap@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 5.11 09/23] ARM: dts: Fix swapped mmc order for omap3 Date: Mon, 19 Apr 2021 16:43:28 -0400 Message-Id: <20210419204343.6134-9-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210419204343.6134-1-sashal@kernel.org> References: <20210419204343.6134-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tony Lindgren [ 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 Cc: Peter Ujfalusi Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- 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 9dcae1f2bc99..c5b9da0d7e6c 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -24,6 +24,9 @@ aliases { i2c0 = &i2c1; i2c1 = &i2c2; i2c2 = &i2c3; + mmc0 = &mmc1; + mmc1 = &mmc2; + mmc2 = &mmc3; serial0 = &uart1; serial1 = &uart2; serial2 = &uart3; -- 2.30.2