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 95590C433B4 for ; Mon, 19 Apr 2021 20:48:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6D46E6101C for ; Mon, 19 Apr 2021 20:48:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240092AbhDSUs2 (ORCPT ); Mon, 19 Apr 2021 16:48:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:54402 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242788AbhDSUph (ORCPT ); Mon, 19 Apr 2021 16:45:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 550B5613D7; Mon, 19 Apr 2021 20:45:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618865101; bh=g/eXUpVLDWn4ZrQfKGHLQWDA56ui5qqB1PXgWsHwueE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D2D3C/9zfroeJ1Pl+ifI1pAxP/0vmwwLzcyNfwSvz25wtyw0+K4EZBQPmzxjk8Sc2 KSVHqE/1iyCtP79MiaUqbt3TsXO09mMtw2W2A1monLQNVlJfZV+nZPFnaG1B+RrWE4 zh3sJGpagNwNvfWYuLPhah6tK7h84sg4VZiPwUl+cVRF70bK3S7G7NbWed20P9PZLy rPwpCYqkrhRzMzCv+bF2h2U23/Tn962JqP8oNgY9uOr0TIeo6tyvwpW+rFSavS344G Syh4PLedQrphmT9+uSp9fee8pUCJa4PDuOoEI3/HrxiE/ejNAyLTuPnMKqu9wYZ4x7 pHanMurvPOTBQ== 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.4 04/14] ARM: dts: Fix swapped mmc order for omap3 Date: Mon, 19 Apr 2021 16:44:44 -0400 Message-Id: <20210419204454.6601-4-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210419204454.6601-1-sashal@kernel.org> References: <20210419204454.6601-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: linux-kernel@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 4043ecb38016..0c8fcfb292bf 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -23,6 +23,9 @@ aliases { i2c0 = &i2c1; i2c1 = &i2c2; i2c2 = &i2c3; + mmc0 = &mmc1; + mmc1 = &mmc2; + mmc2 = &mmc3; serial0 = &uart1; serial1 = &uart2; serial2 = &uart3; -- 2.30.2