From mboxrd@z Thu Jan 1 00:00:00 1970 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 C0BEBC4332F for ; Fri, 9 Dec 2022 13:46:53 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2AF0E84FF0; Fri, 9 Dec 2022 14:46:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (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=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=collabora.com header.i=@collabora.com header.b="nk4uNm1B"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8F3E384E8F; Fri, 9 Dec 2022 14:46:49 +0100 (CET) Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) (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 CF18F84FF0 for ; Fri, 9 Dec 2022 14:46:45 +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.localnet (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 89A7D6602BFB; Fri, 9 Dec 2022 13:46:44 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1670593605; bh=dC779mheCejzvKQFlyU+fio7d4KIuwtTh78HoLUuxR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nk4uNm1BqSO2VZa3EfLArcTl2cLiOG9wLxYyVfE5oKW2yoPimdIHIcdYKU9hA6kBX 9N6wLlTcwS/sTO+5IM+F19G4z1IMtoJolsyQspjt6/puNQr2ZRW0vYvNEMkL5k75pm oUz2IE+3nT2iBDLS8d7Xde4b3kT5/dO1Vnm5rmNjplFZxzBtkRL+DzasYKuAm1ewBJ XepjGyADf6TDWiGZRYyNjYqqRul5+Z3ybtd9oLQt0Is1iSwsR9eDy7+l0HcqRJf/eK LoPNVMkb9lK1NSPZSlUh/uS4BnUhtetjx2qc3zmYXjva3hz/wXHNOje2UC50LKKVS0 5gVrcDC4+kw0w== From: Detlev Casanova To: Peter Robinson Cc: u-boot@lists.denx.de, Stefano Babic , Fabio Estevam , "NXP i . MX U-Boot Team" , Troy Kisky Subject: Re: [PATCH v2] imx6: Re-add mmc aliases Date: Fri, 09 Dec 2022 08:46:42 -0500 Message-ID: <5885954.lOV4Wx5bFT@falcon9> In-Reply-To: References: <20221208152317.16278-1-detlev.casanova@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit X-Content-Filtered-By: Mailman/MimeDel 2.1.39 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 On Friday, December 9, 2022 6:01:13 A.M. EST Peter Robinson wrote: > On Thu, Dec 8, 2022 at 3:23 PM Detlev Casanova > > wrote: > > In commit d0399a46e7cda63c07e3eb8558bef84cfb068028, the device tree was > > synchronized from linux and the aliases were dropped. > > Is there a reason not to get this change upstreamed in to Linux and > then this wouldn't be a problem moving forward? Yes, please check this conversation: http://patchwork.ozlabs.org/comment/3016037/[1] > > 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 > > > > Gbp-Pq: Topic apertis/imx6 > > Gbp-Pq: Name 0010-imx6-Re-add-mmc-aliases.patch > > --- > > > > arch/arm/dts/imx6q-sabrelite-u-boot.dtsi | 15 +++++++++++++++ > > 1 file changed, 15 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..706ec9ba25 > > --- /dev/null > > +++ b/arch/arm/dts/imx6q-sabrelite-u-boot.dtsi > > @@ -0,0 +1,15 @@ > > +// SPDX-License-Identifier: GPL-2.0+ > > +/* > > + * Copyright (C) 2022 Collabora > > + */ > > + > > +#include "imx6qdl-u-boot.dtsi" > > + > > +/ { > > + aliases { > > + mmc0 = &usdhc3; > > + mmc1 = &usdhc4; > > + pwm_lcd = &pwm1; > > + pwm_lvds = &pwm4; > > + }; > > +}; > > -- > > 2.38.1 -------- [1] http://patchwork.ozlabs.org/comment/3016037/