Message ID | 20210419025246.21722-3-samuel@sholland.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=+ow/=JQ=lists.infradead.org=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@kernel.org> 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=-16.8 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,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 E31DBC433B4 for <linux-arm-kernel@archiver.kernel.org>; Mon, 19 Apr 2021 02:54:50 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 713D3610CA for <linux-arm-kernel@archiver.kernel.org>; Mon, 19 Apr 2021 02:54:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 713D3610CA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sholland.org 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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: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:List-Owner; bh=5S61+PGtrL87Fg9BA23dJKCTlVxKHqVNJ6lZQYXqDIo=; b=SATJUMgL/wZzMLeuTu7CgMGcR gHBloMtLBdcDhuASJe1UZxCRDW6JJRNubdNfjaNfRUZJRTjgAt3kjedp6Cx4Rq1PFo/AOpNIAvopQ tAa9oYMJoWvQ67O2TbvcK/4V2+SM0o//+4aOFyBy9bP4LtgtCYTngf+pQH2Kv8WrdSwcm78UK3uEu 1s2PlFoKNbC+Y7ckA8dL/lxRteNJN2aqKHoBXbYxxqQawFvMugI34m/jbSrlPkH9UPy4MhbR56WES eaaggU6uoTjHAu3q9HOjvWLLxiCsCLA+YArUu8iBDnnuI39Etdm5ebCG8w6NApuqnqRmdpir77Wn0 glGpVLhtA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lYK20-008yCs-GQ; Mon, 19 Apr 2021 02:53:00 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lYK1x-008yCb-2b for linux-arm-kernel@desiato.infradead.org; Mon, 19 Apr 2021 02:52:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=fknWd3je8bKB90K09u49b0QN8C2hWKG3Vt+kDBR0zXE=; b=mcr9ZbIYk2eU911wkvQVN7doW+ bSpCkZGq0veanL6mVmIARIPawkak+sTaOTxm4aLg7XpbBWKLk4PfeQFz0QKn8HBrmoIkTIXlg7+F2 ulUr/KIx7fVuIrz6VFMPX5jkhSvDN8tT8pXWP1oboZWRbdExAAcdNtGVpmZ6PeiNPlYWwcUM236K2 Zsy+FiBSVCAYRQL0kJBbIWnyv06aVOhQJ5RcJ1MBIDQaWBooLd09r86tUtWX+6FzitnS8i7NiVc9+ V8hL0GUlv+6Sh1RhQ+qFIN6k4bld8Smbmrp8P9QbEZXmNLY4BArd8LP/2vKk39nzwpJhMP9me2phl GfVJbbeA==; Received: from wout5-smtp.messagingengine.com ([64.147.123.21]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lYK1t-00AtsT-7J for linux-arm-kernel@lists.infradead.org; Mon, 19 Apr 2021 02:52:55 +0000 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: <xms:gPB8YAZaGb0xFc_KlLxBs6bbZBvztjAqQy-_FE44uABQplCJvHKPQw> <xme:gPB8YLbUKsQycVJ-Cs9f0VHt6hjw4TluJi-2wF-uibiDSv3QR8IJ8ugMO2jqfJjzU 2HLmPYWaajXG2J1vQ> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvddtvddgleekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucfkphepjedtrddufeehrddugeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghn ugdrohhrgh X-ME-Proxy: <xmx:gPB8YK9tgOScctT5rIFKU8eUdT5IpyU2EDR7tmMzxobP00jCCh_cPQ> <xmx:gPB8YKpZcdHWjv9Qmpw2_XoITJNVvzTyg_GrN_VDMN1MFEhRC3NInQ> <xmx:gPB8YLqtzVTM1b3MVZQsDbvo14c__gZdqWqoGuJ3mxMMS3JWLJ92eQ> <xmx:gfB8YMC6U_baTtVdleFAskL8Ercsi5ULcDzxqjY02EICeHC3M1Szdw> 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 <samuel@sholland.org> To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@siol.net> Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Samuel Holland <samuel@sholland.org> 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210418_195253_325295_8BD20546 X-CRM114-Status: GOOD ( 10.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org |
Series |
sunxi: Enforce consistent MMC numbering
|
expand
|
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>;
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 <samuel@sholland.org> --- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 6 ++++++ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 6 ++++++ 2 files changed, 12 insertions(+)