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 6A2DBC433FE for ; Fri, 4 Nov 2022 11:13:17 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D1AC9850FC; Fri, 4 Nov 2022 12:13:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.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=gmail.com header.i=@gmail.com header.b="f47zAfoa"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8FBF4850FA; Fri, 4 Nov 2022 12:13:12 +0100 (CET) Received: from mail-oa1-x35.google.com (mail-oa1-x35.google.com [IPv6:2001:4860:4864:20::35]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BE7E984BD8 for ; Fri, 4 Nov 2022 12:13:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-oa1-x35.google.com with SMTP id 586e51a60fabf-13b103a3e5dso5176830fac.2 for ; Fri, 04 Nov 2022 04:13:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=gW1qMLmSN8CzVg6Ceoqt8NoAboXMkl4FXwfEbX5P9Y0=; b=f47zAfoaJxX7VSlhE1QZNH1BfsrC5kh/quT+ydgh0n5TbYo5DRUHl0QzJqCQUoHh0u qsKIunFXZoupEXhjgynB5np2y/H5x1TOg5cxQpGRZpm1ZCh8LzVdeIIJozjAuSnX14Vp Pi3jrKhZP2o1j2JyqJbzGSWumzj27AdZunWDgkqsfyFwEZGzqp+ki5/lf7D+gAe9ZNOP WXRJPKPqiDyOUtQhpQC8bhZdZTt7nG1YWmQ/pMnFOozI02xTv5d/BmzFHrlTy2G7h9FK 2XFntD9+PABZPGAUtbaWuQ+LlbjD960vkuouna0NksR8aw2xYs4gT2CKokz1BJ/XCmbw MlzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gW1qMLmSN8CzVg6Ceoqt8NoAboXMkl4FXwfEbX5P9Y0=; b=fRwvZf4ldW0UBbnZ39ks3yC3u/OI/TSVXRx5o/wAbHVpL8oPXgVAlzylC1LhFvL9jh W9RaltvSzF0eW4mtFKHOniexpfPHTdGc8oO4XpysODoSF2AsH76XK402n0Tuy4Te3K9a T239/YHfS4TDs0D+kIqT7TNgy7eVsdG/cAUc2Cg/MrKOhGt7qJWSSXfecadn4oF+Kf68 dQf29MpVzrUEfRdtQajS7UkkPs8jHRr1TvHi8RCu1cecUCBD4hiGIawTkJoeFZ15dk2g qNqlPN+I9fiPBg2feovlOIB4vT2F3cD8rlpD3mmr/X68/U7PRu+EX/PSCn7nZmsHKYEp Wviw== X-Gm-Message-State: ACrzQf2O7Qxc8NjhCvUCKjrp8QgkI1K3K5FHlM8Ny1m7tUvlAzsbQYMS X0D+11MywXk3VXUn+e/sPbs= X-Google-Smtp-Source: AMsMyM7wpj+Mx7+6Z7oIJU0qU4PdJYMEhpv116EoVCG/5mCCwC/eb3JMlMXJbuBBTsLZhzMW45lVSA== X-Received: by 2002:a05:6870:f6a6:b0:13c:c80:6d7d with SMTP id el38-20020a056870f6a600b0013c0c806d7dmr30000631oab.221.1667560387235; Fri, 04 Nov 2022 04:13:07 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:485:4b69:c60a:5410:da59:aea3]) by smtp.gmail.com with ESMTPSA id 24-20020aca1018000000b0035763a9a36csm1323954oiq.44.2022.11.04.04.13.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 04:13:06 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: u-boot@lists.denx.de, marcel.ziswiler@toradex.com, Fabio Estevam Subject: [PATCH v2 1/2] wandboard: Pass mmc aliases Date: Fri, 4 Nov 2022 08:12:54 -0300 Message-Id: <20221104111255.661416-1-festevam@gmail.com> X-Mailer: git-send-email 2.25.1 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 From: Fabio Estevam Originally, the mmc aliases node was present in imx6qdl-wandboard.dtsi. After the sync with Linux in commit d0399a46e7cd ("imx6dl/imx6qdl: synchronise device trees with linux"), the aliases node is gone as the upstream version does not have it. This causes a regression in which the SD card cannot be found anymore: Since commit the aliases node has been removed U-Boot 2022.10-00999-gcca41ed3d63f-dirty (Nov 03 2022 - 22:07:38 -0300) CPU: Freescale i.MX6QP rev1.0 at 792 MHz Reset cause: POR DRAM: 2 GiB Core: 62 devices, 17 uclasses, devicetree: separate PMIC: PFUZE100 ID=0x10 MMC: FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2 Loading Environment from MMC... MMC: no card present *** Warning - No block device, using default environment Fix it by passing the alias node in the u-boot.dtsi file to restore the original behaviour where the SD card (esdhc3) was mapped to mmc0. Fixes: d0399a46e7cd ("imx6dl/imx6qdl: synchronise device trees with linux") Signed-off-by: Fabio Estevam --- Changes since v1: - Add patch numbering. arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi | 1 + arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi | 1 + arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi | 9 +++++++++ arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi | 1 + 4 files changed, 12 insertions(+) create mode 100644 arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi diff --git a/arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi b/arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi new file mode 100644 index 000000000000..6785db754b79 --- /dev/null +++ b/arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi @@ -0,0 +1 @@ +#include "imx6qdl-wandboard-u-boot.dtsi" diff --git a/arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi b/arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi new file mode 100644 index 000000000000..6785db754b79 --- /dev/null +++ b/arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi @@ -0,0 +1 @@ +#include "imx6qdl-wandboard-u-boot.dtsi" diff --git a/arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi b/arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi new file mode 100644 index 000000000000..46c4b3b31f4a --- /dev/null +++ b/arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include "imx6qdl-u-boot.dtsi" + +/ { + aliases { + mmc0 = &usdhc3; + }; +}; diff --git a/arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi b/arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi new file mode 100644 index 000000000000..6785db754b79 --- /dev/null +++ b/arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi @@ -0,0 +1 @@ +#include "imx6qdl-wandboard-u-boot.dtsi" -- 2.25.1