Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3719252pxb; Mon, 24 Jan 2022 16:15:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJxc/xqUjX1I9scLXXr1Pfq0GlMDrwCPcGTVgc2LGSEaifNWqMUYu0S7bNcssiwm3qO3u01k X-Received: by 2002:a63:7f0c:: with SMTP id a12mr13605113pgd.548.1643069709582; Mon, 24 Jan 2022 16:15:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643069709; cv=none; d=google.com; s=arc-20160816; b=XoSYoon9dSgJ88XERIGHirf9ZCBWamKqOIX1pBRtY+RYJx+HqTVycYMXrXRb+lKoHL xjd9sgObQHaPfHKPzuu8UTDx2k0fZ8WZ3yCAHuNP6G99Ax/QI/RM3UlhWl1380unfYZv ob+tXZEyiTpSl3+2Gp/Swd6Oe+FkTA5yPX+EOSTRhlzre63mnUOyBbAKSl3A3xq5/juB O/pt5QJNX/XR7ovw9vX1+e+SSuJjXIHmF5UVuCfH/Af0JZR3uG82GAUGs4jtmyMvwqgX 0062/tP37tMBniDrqdownbJlAHGAYuOgAPKq80Vfqm5+28rUxrKtkB8OLX49bAEBXHPk nFxg== 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=zC1U4voFFQqos3o/lLnDzGgvHVh8KFvxRRX3XVTVs9g=; b=jumtCOd2JCfZgfOKxQSfEn8LigeDqZm6EvxND4UAmlSKu3KWkjVriRDRGl7hH7uGrk v3yQYwx+U/umBBtFbv+2sY5P0Ln2GmWmiA815ru487RHptUgsuYxbYMQyJ+5O047HESW yWbcz8QOY5BW7NyReuubCzk7kkqDcfEcVTYxgbmK9KasKV7BlviWjvlBFGgVBppCI2AR 2z9bjsk913mjb9yZQE2vnX2H6u0H1/cQWf/raXl9J1khkVdJVUcn06t2J4LDdjKHv2GO kqL3/x+G6SwbY1ernYyHwfbqsbFEYs56KdmBUoIGLEDyFTSbZPG684niTS9C6nqffnxQ RVlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ffCIs5yL; 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 f24si11257265pgg.792.2022.01.24.16.14.57; Mon, 24 Jan 2022 16:15:09 -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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ffCIs5yL; 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 S2372481AbiAYALo (ORCPT + 99 others); Mon, 24 Jan 2022 19:11:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356628AbiAXWjo (ORCPT ); Mon, 24 Jan 2022 17:39:44 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C144C05487F; Mon, 24 Jan 2022 13:02:58 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B4B476137C; Mon, 24 Jan 2022 21:02:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8677AC340E5; Mon, 24 Jan 2022 21:02:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643058177; bh=AsfyfCHEsg/BjcehF3eM9HOdbGRKyIGsqpPBSOJDue0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ffCIs5yLQtjkp06Ezk6RtY7uxioQ8BL5h/P3YkZA0Zzs5pLMedHu8pUzc82Cw59PQ nfoin8VtRzLNez3mxZMiYd7Xj38vVdhgqwUoAxJWJ23nxNwOtaeQnuGB3P432TkF1L ZkrMKshd6o97JX7sPH7j8wz7Go/0Xz0i1He+1VXM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Baryshkov , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.16 0205/1039] arm64: dts: qcom: msm8916: fix MMC controller aliases Date: Mon, 24 Jan 2022 19:33:14 +0100 Message-Id: <20220124184132.212229203@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184125.121143506@linuxfoundation.org> References: <20220124184125.121143506@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: Dmitry Baryshkov [ Upstream commit b0293c19d42f6d6951c2fab9a47fed50baf2c14d ] Change sdhcN aliases to mmcN to make them actually work. Currently the board uses non-standard aliases sdhcN, which do not work, resulting in mmc0 and mmc1 hosts randomly changing indices between boots. Fixes: c4da5a561627 ("arm64: dts: qcom: Add msm8916 sdhci configuration nodes") Signed-off-by: Dmitry Baryshkov Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20211201020559.1611890-1-dmitry.baryshkov@linaro.org Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index c1c42f26b61e0..8be601275e9b4 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -19,8 +19,8 @@ #size-cells = <2>; aliases { - sdhc1 = &sdhc_1; /* SDC1 eMMC slot */ - sdhc2 = &sdhc_2; /* SDC2 SD card slot */ + mmc0 = &sdhc_1; /* SDC1 eMMC slot */ + mmc1 = &sdhc_2; /* SDC2 SD card slot */ }; chosen { }; -- 2.34.1