From patchwork Wed Nov 4 16:23:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Reichl X-Patchwork-Id: 11881475 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,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 78D7AC2D0A3 for ; Wed, 4 Nov 2020 16:25:56 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 045B4206A5 for ; Wed, 4 Nov 2020 16:25:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="vZ27PSKd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 045B4206A5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=fivetechno.de 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=r1p8f1AlwFQadaFUwEJFq+X4jHjklITYl1b1ZMQzzkI=; b=vZ27PSKdrZr4HOD60VtRPg4y8g I9/mrx+qUb7EnxSiG4rAvh5nb/vYRvKvnmgO/WscWp1QpiJ5CfmHZcWyiGCZq0coew44zAezVFz6N 0Dq52sSkk5pSPl/7SJUn5A2wF1DC7/vU0MqRiF1GzOJEvtURXI1nTzGnfY+zmE0iDWrMROwn5PESC jsiSnxbBlz2sPol5B4ZgYo20Hp1YH+ZlNYlUTteShLDws6fvboCGbQjAiueJ/mjfAB0Mu/izeDBtB MjbeJnGYEcTnFQwhjKzNHhtIomzeATuB9iQCihlVXCm1h16GERej7V6STuw4W4lUtU/w/B0UQCds0 KswKa34A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaLaN-0003Ws-U8; Wed, 04 Nov 2020 16:24:35 +0000 Received: from wp126.webpack.hosteurope.de ([80.237.132.133]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaLaJ-0003VR-OQ; Wed, 04 Nov 2020 16:24:32 +0000 Received: from [2003:a:659:3f00:1e6f:65ff:fe31:d1d5] (helo=hermes.fivetechno.de); authenticated by wp126.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1kaLaF-0007tB-SY; Wed, 04 Nov 2020 17:24:27 +0100 X-Virus-Scanned: by amavisd-new 2.11.1 using newest ClamAV at linuxbbg.five-lan.de Received: from roc (p5098d998.dip0.t-ipconnect.de [80.152.217.152]) (authenticated bits=0) by hermes.fivetechno.de (8.15.2/8.14.5/SuSE Linux 0.8) with ESMTPSA id 0A4GOQQo020573 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 4 Nov 2020 17:24:26 +0100 From: Markus Reichl To: linux-rockchip@lists.infradead.org, Rob Herring , Heiko Stuebner Subject: [PATCH] arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards. Date: Wed, 4 Nov 2020 17:23:55 +0100 Message-Id: <20201104162356.1251-1-m.reichl@fivetechno.de> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-bounce-key: webpack.hosteurope.de; m.reichll@fivetechno.de; 1604507071; 621b1f40; X-HE-SMSGID: 1kaLaF-0007tB-SY X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201104_112431_922117_347ACC58 X-CRM114-Status: GOOD ( 11.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, dianders@chromium.org, linux-kernel@vger.kernel.org, Markus Reichl , wens@kernel.org, robin.murphy@arm.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Recently introduced async probe on mmc devices can shuffle block IDs. Pin them to fixed values to ease booting in environments where UUIDs are not practical. Use newly introduced aliases for mmcblk devices from [1]. [1] https://patchwork.kernel.org/patch/11747669/ Signed-off-by: Markus Reichl Reviewed-by: Douglas Anderson --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index ada724b12f01..7a9a7aca86c6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -29,6 +29,9 @@ aliases { i2c6 = &i2c6; i2c7 = &i2c7; i2c8 = &i2c8; + mmc0 = &sdio0; + mmc1 = &sdmmc; + mmc2 = &sdhci; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2;