Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4E5BBC4332F for ; Thu, 8 Dec 2022 18:16:22 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1F21185106; Thu, 8 Dec 2022 19:16:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=collabora.com header.i=@collabora.com header.b="Oh7pHvlf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CA7A48510E; Thu, 8 Dec 2022 19:16:18 +0100 (CET) Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8FB4381101 for ; Thu, 8 Dec 2022 19:16:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=detlev.casanova@collabora.com Received: from Falcon9.mtl.collabora.ca (mtl.collabora.ca [66.171.169.34]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: detlev) by madras.collabora.co.uk (Postfix) with ESMTPSA id 688266602BB8; Thu, 8 Dec 2022 18:16:15 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1670523376; bh=Tbj4DVuYxg6X2XLT6S61F/I0/Vg02RwPeavxYjHlFPk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Oh7pHvlfPbFW46M2UQA74ne2qTbLMhcD5xPMR683X0cZW9DtlKFe/bodYtL5nTxmO BI0yYY6mjHqIzyOcqFjLbmbJ7K4Iyy9lNaajoL3Qn2sTJrpzfFWbxfefARKsHexyj0 yVSvaZUzcOasmIXkbG20QOuj0B8Kpk+YSxcdcNfe/EynFOn1wXomigBMHcG4/ujXXU TGDrsMq0OGx3qSRurmMynjKvl1vvBL/gOwwMSMLQ2/qYArrJ6Mf812g7aO84cJ3Afh 6g0YXzZt3Gl5FuURmybZcXFpz6eOPPfjALMIWXnlEiT58+JarBZ4WnNoh9vnSPO4nV Ci204LpX+wJUQ== From: Detlev Casanova To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , "NXP i . MX U-Boot Team" , Troy Kisky , Detlev Casanova Subject: [PATCH v3] imx6q-sabrelite: Re-add mmc aliases Date: Thu, 8 Dec 2022 13:15:52 -0500 Message-Id: <20221208181552.36921-1-detlev.casanova@collabora.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean In commit d0399a46e7cda63c07e3eb8558bef84cfb068028, the device tree was synchronized from linux and the aliases were dropped. They need to be kept so that the mmc cards are in the right order. Without the aliases, u-boot reports: MMC: FSL_SDHC: 2, FSL_SDHC: 3 With the aliases, u-boot reports: MMC: FSL_SDHC: 0, FSL_SDHC: 1 The upstream linux device tree does not contain the same aliases than u-boot (It keeps the devices order with /dev/mmcblk2 and /dev/mmcblk3). Because this board has been using different aliases in u-boot and linux, a imx6q-sabrelite-u-boot.dtsi file is added to be automatically included in imx6q-sabrelite.dts. This way, linux and u-boot each keep their own aliases and there is no breakage on current installations. This should never be done for new boards as we want to keep linux and u-boot with the same aliases as much as possible. This patch is only necessary to avoid breaking existing setups. Signed-off-by: Detlev Casanova --- arch/arm/dts/imx6q-sabrelite-u-boot.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 arch/arm/dts/imx6q-sabrelite-u-boot.dtsi diff --git a/arch/arm/dts/imx6q-sabrelite-u-boot.dtsi b/arch/arm/dts/imx6q-sabrelite-u-boot.dtsi new file mode 100644 index 0000000000..9eb1c34b20 --- /dev/null +++ b/arch/arm/dts/imx6q-sabrelite-u-boot.dtsi @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2022 Collabora + */ + +#include "imx6qdl-u-boot.dtsi" + +/ { + aliases { + mmc0 = &usdhc3; + mmc1 = &usdhc4; + }; +}; -- 2.38.1