Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp3763815pxt; Tue, 10 Aug 2021 10:45:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZ6hZTSmzlUFBlyK++SdtRhCIUmiW/56sB2tM+vas6T1cjiutx/a0dcQ9zyazrblWnzvVJ X-Received: by 2002:a05:6402:22c5:: with SMTP id dm5mr3014486edb.317.1628617556655; Tue, 10 Aug 2021 10:45:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628617556; cv=none; d=google.com; s=arc-20160816; b=pUm12Ba3jKIad2EektJlWLpHTrsZnDTGxEutR++2wM53oV8qXsEVz6BhA/N2PKgLwU 5xCHKoHAK0hFbrphoirv7zPPigKAROz5yJ7kHIv2sKlMtRKYUWc4nhB8ncQ/yK/BXc6E BmCccIoHiiTIZHWFnSvDfr1r1KF6eBWZsfrq2FciDEc6fOG/hrOwwYQg+oLvV3cmfWfl 8FgA9DshMHDA64Odk/ajHiJz5+AUUNgTCdbZInQLWeUmOjCjOcvOBtsxpcu1TV1KWhiu 0Ol/i6WY/ah6uuBRAvap5yzE4KufhhoWz5wTAjlcJifgvhfawxa3XGYEnN9tPMCUdboj 0lHg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ecQfg/z/xhQ/vwKHYTHPfLfCsYWZeXrG6qiEQenM4/M=; b=VR+gFzP0eJSHPFsTZtUPZhHCE/q7x3U9ZgQXcUImDpLxSidYHRUEARTc/Zg4O41yjZ 4IZJsmS9peu58OcUcsRdHM1yPmwOg4PwwIyeOaHCcx0HzolvgL7RCN7dTBM+PgtMP+Lb UCKYaZP91/Xl64QVUumaKyv9CPjqsJQ9Ac1bHXVApY6c9LU/T4OiICyS/Nvk/KTi50At kZu5zJT9HojSYuk0ZdLXjlnngrxl4ZsLuLJI8mYL0TV7zjJ1bCmb4y9P90AtlByREGgF 00mMenu/5oCERShDAowiKcWkFzzhAfLpnyw9z5Y1Rw8XxwvD8X1q62eXD8xph3VNNLDc 8juw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rl8DaUNY; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id yc20si1879161ejb.363.2021.08.10.10.45.29; Tue, 10 Aug 2021 10:45:56 -0700 (PDT) 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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rl8DaUNY; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232627AbhHJRmW (ORCPT + 99 others); Tue, 10 Aug 2021 13:42:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:44144 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235293AbhHJRj3 (ORCPT ); Tue, 10 Aug 2021 13:39:29 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 104C661164; Tue, 10 Aug 2021 17:37:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628617027; bh=VHK4iE+ZouWV29FULJZcZrMDuQ9PHpmquCZJ8/3fJvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rl8DaUNYc3h5xGhrtTZ/k8J8zt2BHiAvX6uEs1MhhevKiEKpJuJzogqFwDrVO3pny NN3EURjP4NViRpaq6aY62cQQe2/WuDYbkoKPBHbU61Cw3CDGhccbtEyolf88ZSYOL3 5eYgaqhEljwTuNmRQNcRJUr+xoY23Zz7PuGOsJ0w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vladimir Oltean , Gregory CLEMENT , Sasha Levin Subject: [PATCH 5.10 013/135] arm64: dts: armada-3720-turris-mox: fixed indices for the SDHC controllers Date: Tue, 10 Aug 2021 19:29:07 +0200 Message-Id: <20210810172956.130850164@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810172955.660225700@linuxfoundation.org> References: <20210810172955.660225700@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vladimir Oltean [ Upstream commit 923f98929182dfd04e9149be839160b63a3db145 ] 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 Signed-off-by: Gregory CLEMENT Signed-off-by: Sasha Levin --- 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 389aebdb35f1..2d51c6f3915d 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 { -- 2.30.2