From patchwork Thu Jul 22 10:11:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 12393771 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=-18.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 57365C6377D for ; Thu, 22 Jul 2021 10:16:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 251ED61264 for ; Thu, 22 Jul 2021 10:16:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 251ED61264 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Pc1mcc4QCzXiK5Q0oQO+y3XgcXueiOO4FiZe5h4LCW4=; b=C29dE/4A0Nb7mT kynBijEBgmw9dXeKlB3Cd6cXyfDKHQYLqWhCdt2qxlrdpHcHpe2qf9LeXtaKopv7wpnPa+pDzEC+4 H98F0aHyDpTxKC35BPVD4opfU5Chi03B9WdkOOpBMR+GDfec5UcuW76rffL2KpWh6XgjwWhr7AT95 /HUqinwG1FBGDHN2Vqb47bRZnEvQcqY27s/+cf7SJAECMuPdxiUzZ3GDLjx1xPbYIETDkcdFhNTH+ ORjg6GZ/RVNHEN8JuCY8ewizp8rsJjQ29Z98BcY6q+okjcHFzhwsH39vGSHiKSN56UkaLWwqlF1MB E3gEJySUa5RIrRV/43hg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6Vhw-0019mY-8N; Thu, 22 Jul 2021 10:13:37 +0000 Received: from mail-eopbgr40050.outbound.protection.outlook.com ([40.107.4.50] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6VgV-0019Ga-E2 for linux-arm-kernel@lists.infradead.org; Thu, 22 Jul 2021 10:12:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F8jqb5pU2/7xaFsmUcqDBrbuHrCxt73RfFl5Jb87mgPS9oEMyNr2LzedVtcN0M0LMxyikBFOMbq0nLr4wv8cKM1BspMphMBXVpJ8OQ5PSA//WSOVpyttdowjeSAUTeFg87m9N7c/SF1Huvn6wn3MbTTDZLuygHQhsyVVFXqx9O+IaksIKf5psKx/erO/H9MKpFk/QRqZQuoINaG4HI50rS3ZduUlCUWGAnRt9kE5B0purz6FyEkiT87pw5JKucdbHT4bZ2hSDlFOnW3jh7U4eCMxc4TVQRZyH1cRt2nxtFK4+0Mk2XxMlX1KTlF1qjy6XHQDSySWdeVRF0osLyWGFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sWY7Q/PZ3Lf9bu5T5h0FTQDfos+bqFK5pE3hQtimb0w=; b=kS7qXnc0ZCdQRciMaIaLhJ8VlD70r9zQCC/RdlIRDubXlnZGdBIcXWAEkukA+rLsoiMte8XaPwr60VHf7ZJoyiSC6XPXGKt1ry85WlpXsNZEyF0D54CpTzvWweVZnnjo/pLpAjWxBaWmgG8TCbCtXJGZHSIQW/tQduqwB2eucudJhfoAJgwcyBvU360897QJK4BliHjpfWwXHHEpG7hO6QXp70d2/2UjKaC9UxZAsySdJgXxF6SJEplmUL1XBGRenVsEyrheb8VNZx6nhQhcuDEWgraDo/w2SF9qP90Xd/ZfJ+XhmQ/Fr+myWFx6isSH/VYOcBjgM9lN9fMoiWTtwg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sWY7Q/PZ3Lf9bu5T5h0FTQDfos+bqFK5pE3hQtimb0w=; b=O1aQ2cASDpQbtt9tp++/LijmbMdlxpwhXnkDNXnq0a9SNzG+40eMONfzxWTa+J4qxREj4HMuIa/VYprCk6GE2osJbgG9LB5k1rWb/aPN5qaGBDbuDg2eOft77qJgy1OHiHz8Q9cJ0GD0GAvwsFRs0sa+WhuAEdAgrqQ6qj+a03s= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by VI1PR0402MB2862.eurprd04.prod.outlook.com (2603:10a6:800:b6::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.25; Thu, 22 Jul 2021 10:12:01 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::109:1995:3e6b:5bd0%2]) with mapi id 15.20.4352.026; Thu, 22 Jul 2021 10:12:00 +0000 From: Vladimir Oltean To: devicetree@vger.kernel.org Cc: =?utf-8?q?Marek_Beh=C3=BAn?= , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Ulf Hansson , Douglas Anderson , Wolfram Sang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] arm64: dts: armada-3720-turris-mox: fixed indices for the SDHC controllers Date: Thu, 22 Jul 2021 13:11:34 +0300 Message-Id: <20210722101134.2514089-1-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: AM0PR02CA0107.eurprd02.prod.outlook.com (2603:10a6:208:154::48) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (82.76.66.29) by AM0PR02CA0107.eurprd02.prod.outlook.com (2603:10a6:208:154::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.24 via Frontend Transport; Thu, 22 Jul 2021 10:11:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 40195ce7-ed52-463e-3941-08d94cf92531 X-MS-TrafficTypeDiagnostic: VI1PR0402MB2862: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Z804K+rhIhpkoO4zVfwK66uMrvSt3jxSA2JfuQNR/RAMxWPp4uc8RUZ+3ic3ecxdqVyjJ0c+NTFDx9XzKt0B4bcWvLwnhpHC2Iq48ov1BgDXtL9aOEOaRCKRD+5WhGO4kBuwbW7+Zf8Y8TJC5bMy+4qZXADcf60ab6z6HdRLD2ERGpA9ioLyMHWP3g6AYGhX8/wIJctffiQry9925o4P8x+TkZeVTPM8OvlyTp4SAxpTS1GsWDYCs6xOo0iidI9JoMxB+EJavXDJhXdgm9bYTpZWTzE8hesI1HrzR0OUweSTbd5zFkjmsdrVqKqa9B+k6N3KwJNROakn5p7AGpl939aHyLNfL6tUczfDWyUmqgFKiI7rDk3g75IjEk+UTXwYI0YVwdmBey5aqDiUrG2ctav6zpg+otDtULxf/PDVjTr/KLtT/IKRFDfE7khp6YCi3zkQwk2HlsfxVUMJ9ODOSQI6bHDgXHQ38veLTm5Q7bIyTnPDuNvn/m6ACSIq6UJFrAIbe4ztUWwj/8NG174YkMeTn23z5VLClL18fxeLNxXjp3U7adpnej/HXFBrfKXiUrNlqbKGH4Pirmn4GNHrhWEQTuU/inUvXE6HpPszpVrEgMzwZpv3iQUkR2BfbJCqvMYFy2m9GMMMN0ck7pY/YhscE+QpkYFZZSFvGMuZILGA7LhqsdjJb10Y68SAM3ANlNMmZ9RAd1rjjdLKo8ELLw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(346002)(366004)(136003)(39860400002)(376002)(956004)(1076003)(86362001)(2616005)(7416002)(5660300002)(4744005)(54906003)(6506007)(6916009)(66556008)(66476007)(66946007)(36756003)(8936002)(52116002)(44832011)(316002)(8676002)(6486002)(4326008)(38100700002)(38350700002)(2906002)(6666004)(26005)(478600001)(186003)(6512007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: O8jv/2ZTZp7zcWD7xTkqw6YvIWH1RSHQz2K6mrWkw9ojllIpL+rDa33wPMDxcyqDi0YVmaBq2ctWnd/7mfKFboYC4c0YGo+Oc6+0/wLcAzF7Enc+o2a8I+y6+dIreUVHPIfeZDcE/iZDOLU2GsjtrhAgUkNrFIlH9KM3PfW+z3rEd1InM8VYuykD6wHoXUjbMoklGzc7tFwT5CfBTS15ToWZEpuNkcFm6sPz49Y+7mE54nCqLBtlhkFRDUfCfxjIgxyoX/Fh8KaO1n67n+tvEmMOZRRzUj2mEwyFXHDjL2aXbmZJ4PNw0E5WJ9H9+TrRqTxuRaw8XpocuXHHzgUkVOgzarbg9uA/bEa85oXLRanJdPrh8oN7mDW+Yd5zKUfDofmxCOvJeStL6Gh4KntreCM2NfIKjOchK/hC0zO6i+uPr7QMyQVBG2sPs0IRd06DOZyLM1Q7pB3UxHhq8WkpckaFaxZpWQdAPPlxjh1BpprF1AkFmUL87u8SX7qKd3p+GeM2zCpVKmYNd3vN3O/2NBqjfN5NUH8rs3GWtKO2L4bt4hN6+ruxOMCUOn/9dSwcFfzX+ma07tGH8zYvMCXJL0IUOH2dRbWH8gzEMAJzmm2A2LSJ9eQHRIRZah7qN/7BlTG/QEsVYL/Fx8TYFjtOJ5WUkGxT/fogeQuGaNvijpcwxMnnMVepS7c6V7rjdeycoZaaGyS4TH3a6CbqOkb0rJTsjqWzJYpLP2hIX5b9xrYtVepFvJJBPTo7XjsIUtvAtzrUwsngT3oNUF+h6qbMamHXIKa1LAn9jvLYMTH31q5mdI8f7Zxd0JRyjLIN6TngaBUKNrTrJ6NSLerI0w+xUzosC3Tg3a9EdhBKLQjc3GAgYPs6NWDjehtl0DUB9yrNHJ8G+r8Va/mD9SeBD2uVAdlSOTaS/AuJP9F1WBXaRVUpAYLy+A2xaA8GZGu3VkodPGqjacQAxjuc+yWnHMm55nu5tzD1dSyqU8tGE2QLEvZN8NdzP7DpWUvUqG9+lEibiAGCzj6hXE4wfcN1jRWXqJwnoxOTDpqZUTmuGIFJtF+dbjhU840CR5mWOoduuYvgoy0j6bq9/sJA3U5C7kfyYDZ8r6zSDQ0EPHqJiuN+vICXRHCqKxpP7uHgjouuZbbT6SX7H8m79Funbi+lsoVRWXkoGC/Ch2zVJgQp7UKzM3ElrFE+g4vkBIUDZ4lNevvXx0KjS/t20Ks5kw5VIWoKbacSaUvipyjPvnh/B7APIxvW4hVONU1jWnbbEY6VQGrJnzv1bc2k1elMAYgNyEEwuEk8T4VHm/yqd6Sq1t+3BiPK/luMPMjncLTqsub5hu2y X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 40195ce7-ed52-463e-3941-08d94cf92531 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2021 10:12:00.6854 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: chD/sOQTgvnD0QgEC8Q0Z/EcDdhoz+/JWdwy4Hl07XRNHhkmjy53a/gEAOM3bsuhDrckxKi9uRcCzziYHkTqyw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2862 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210722_031207_521342_5D81EC69 X-CRM114-Status: GOOD ( 11.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Since drivers/mmc/host/sdhci-xenon.c declares the PROBE_PREFER_ASYNCHRONOUS probe type, it is not guaranteed whether /dev/mmcblk0 will belong to sdhci0 or sdhci1. In turn, this will break booting by: root=/dev/mmcblk0p1 Fix the issue by adding aliases so that the old MMC controller indices are preserved. Fixes: 7320915c8861 ("mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.14") Signed-off-by: Vladimir Oltean --- arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts index ce2bcddf396f..f2d7d6f071bc 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts @@ -19,6 +19,8 @@ / { aliases { spi0 = &spi0; ethernet1 = ð1; + mmc0 = &sdhci0; + mmc1 = &sdhci1; }; chosen {