Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp485738pxu; Thu, 3 Dec 2020 05:31:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJzYQO5ZyClORfMFKPREhcobJbLi2sIH2wYrQ3gA2mnbDmbcZPHD/o7x1BBTggpo3sLtt5R0 X-Received: by 2002:a50:8f64:: with SMTP id 91mr2855378edy.310.1607002307922; Thu, 03 Dec 2020 05:31:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607002307; cv=none; d=google.com; s=arc-20160816; b=aYAN9HRUHRbl+mGul4bsEN2KMpoGcytqpSbr1GvAU133Ddplu0yceaDL19P3D0uRRn D0bVIUa2FJT9nxeZjyGvv49EHucKiTdwdMX90joTmcNjtSiM9lqNEhY31pzFk7nTzCyC tdiYY/NW0X4RWnC3wG8RCPTsrplSxSw82za8bIipyYHVn3kqAZ8fdH0Tv/XcMsWICR9z jGknc4HCupj8b5WRx0fAAA9lKw8GWL2T+DrQI2Q+Ab6z6z//ejh86GZ/U1WYpmEm6Z1P tXkz7gWM3nxiC7UKaERY2NxHFO/oqwh/WmslUfrHUOyIBcL4duu5JYdXE4gOpJ5g93Ou ESXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=kiQv1pHabFmSJuWsV1kb0Y/3kQOqGhYXoPLgdtKwKMw=; b=APC9YHTCvf57GRUHb+0gvrgvOK9eA8jderw2oov+mWzuIgZi3RW9S+nc/SCtGQauuU 41duzP+mBh9e353RBXwD9lgIG1MN9Acpj104kQi5gAu47LbV8hJEb2ytIhVIfAsiJhN9 zXphb2Fv2TpnV0qPAaLYNafSY6oUxnvkxtXdI/AMyojd7PtVPRbgRpGc5IV+LNp/R85A JYFwh5eStBjAadP+4aXvH34tFpmFbEHJyJsGnMWfZ3wCV7n8kMJ40kTZ1SRT6dUhsNBv o2cknMQADaWm9BH3xc9pQBBZCVfsKnyiR6kcWwCf6KngEVvWkZTm12TN9smcENWLLxi/ BQag== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a18si1069608ejb.180.2020.12.03.05.31.21; Thu, 03 Dec 2020 05:31:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388022AbgLCN3X (ORCPT + 99 others); Thu, 3 Dec 2020 08:29:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:46920 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728067AbgLCN3W (ORCPT ); Thu, 3 Dec 2020 08:29:22 -0500 From: Sasha Levin Authentication-Results: mail.kernel.org; dkim=permerror (bad message/signature format) To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Markus Reichl , Douglas Anderson , Heiko Stuebner , Sasha Levin , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH AUTOSEL 5.9 04/39] arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards. Date: Thu, 3 Dec 2020 08:27:58 -0500 Message-Id: <20201203132834.930999-4-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201203132834.930999-1-sashal@kernel.org> References: <20201203132834.930999-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: Markus Reichl [ Upstream commit 0011c6d182774fc781fb9e115ebe8baa356029ae ] 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 Link: https://lore.kernel.org/r/20201104162356.1251-1-m.reichl@fivetechno.de Signed-off-by: Heiko Stuebner Signed-off-by: Sasha Levin --- 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 ada724b12f014..7a9a7aca86c6a 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; -- 2.27.0