From patchwork Mon Apr 19 02:52:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 424754 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.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, 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 13675C433B4 for ; Mon, 19 Apr 2021 02:52:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E5FEC610CA for ; Mon, 19 Apr 2021 02:52:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237297AbhDSCxU (ORCPT ); Sun, 18 Apr 2021 22:53:20 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:35723 "EHLO wout5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232775AbhDSCxT (ORCPT ); Sun, 18 Apr 2021 22:53:19 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id A28CF22D9; Sun, 18 Apr 2021 22:52:49 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 18 Apr 2021 22:52:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=fknWd3je8bKB9 0K09u49b0QN8C2hWKG3Vt+kDBR0zXE=; b=aDdWixQ7+0dBsYBrY1EbUBs1EeDKj kzXKTpy1ES8KlSB5eZWrf2uKe5oPEDDoAM86fTuz7xy+EhqMf4keKNjpsvQyFCFs OGt8Op0ZbDUCJBW7FM/95hPA44g4R22hpTcKi5/+QbltOo+AxvBjS8fLDEY8oJ2/ /ie1bbCPz+N6eHpcb0AAlXAHuhhkOHHV6//wxYo2hQxFkYcXgf5tzYerJIGaUxlR 29HH9CWLzeHSwwE3kJlEyYINzoizYFOPFU88MSXEgYqnuCZ9TgJZqGY96mArnzW7 +HGasOaOS7jqma/lFDelY2F6hfCwPLuwKJMgUGOlcRu1ptO4/ro1B3inA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=fknWd3je8bKB90K09u49b0QN8C2hWKG3Vt+kDBR0zXE=; b=Uzkm73pX iCSwF8gZJDLUVkZFIbLS7QiSvKF493qM1NBpRIoftIEEGBykeuyuP1oggU05tq2c F2WWXj+GBL3WyG1WdX6imnIYu66vnBXdDfZ9ZqsLmpuKgIjFj/CJtXiJ1YUi2eC9 t0b51LHZ0wrrw15Gv3QUvpSFoMtxDIUr6LFB4c37O/tP5RkMt5B98mGdlCEkei0d gOnfS1zOgiAzqFGX4v27S2/sNTqQVVFSStGYlVAQWBPKWvB3k/vnV4PmmpVjn9Vv LxbtDAkHrxj/gyYGlDxHHB/f3envEZM5BpCzPOhlCYMCCELXUt+8Peu3Zr9vU/qv 8eCNOk4h/1I8eA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvddtvddgleekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucfkphepjedtrddufeehrddugeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghn ugdrohhrgh X-ME-Proxy: Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 17A8824005B; Sun, 18 Apr 2021 22:52:48 -0400 (EDT) From: Samuel Holland To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH 2/2] arm64: dts: allwinner: Enforce consistent MMC numbering Date: Sun, 18 Apr 2021 21:52:46 -0500 Message-Id: <20210419025246.21722-3-samuel@sholland.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210419025246.21722-1-samuel@sholland.org> References: <20210419025246.21722-1-samuel@sholland.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Traditionally, the sunxi-mmc device numbers matched the register address order. However, that was broken by asynchronous probe, and now the MMC device numbers are not deterministic. Add aliases to keep the device numbers consistent between boots. Use the traditional order, since there is no need to change it. Signed-off-by: Samuel Holland --- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 6 ++++++ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index 9b58cfbefa6d..3df70a41b3b9 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -17,6 +17,12 @@ / { #address-cells = <1>; #size-cells = <1>; + aliases { + mmc0 = &mmc0; + mmc1 = &mmc1; + mmc2 = &mmc2; + }; + chosen { #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi index d8ebc1a84af9..4bdc48caf68a 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi @@ -16,6 +16,12 @@ / { #address-cells = <1>; #size-cells = <1>; + aliases { + mmc0 = &mmc0; + mmc1 = &mmc1; + mmc2 = &mmc2; + }; + cpus { #address-cells = <1>; #size-cells = <0>;