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 4C84FC433FE for ; Fri, 4 Nov 2022 10:58:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 950FA851A0; Fri, 4 Nov 2022 11:57:58 +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="UG0IRdYK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0261D851E4; Fri, 4 Nov 2022 11:57:56 +0100 (CET) Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) (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 7B8F484BD8 for ; Fri, 4 Nov 2022 11:57:52 +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-ot1-x329.google.com with SMTP id cn2-20020a056830658200b0066c74617e3dso2467564otb.2 for ; Fri, 04 Nov 2022 03:57:52 -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=M2/wCLttKaP0DCOq7R80ekEQj8Qfcfiz5bOVwQ2C7Kc=; b=UG0IRdYKokLXJNpdvxhhoYKnp1JO6mL42SL8/KMKEODgQ61fF+YDNksYecX+wayWfj DVjh/py9Qwv6u5qyWM0dS2e4cKcdXVpSadDJB2rFoXME54QI7O70waYYfejoJTrBD4CR 2Z8QPgrcf+wfvA0iAhEuEw8jOwvsm0ljsgYGeg583aPYnwhWba0IVA7NsnT69KYBzS7I nPskGCMtzKR0eHaeLYXHTJs/A3++UvhPjEPgQD542oXIiUhx8h1nzrlp2IjfBKnpf9yr kFj3Jyazcn9fmEtrivvB12D51g3SQzJ2jmcaffwd4VOJbfFpJLM/2hoVJLmLtDeMPKqf Yvag== 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=M2/wCLttKaP0DCOq7R80ekEQj8Qfcfiz5bOVwQ2C7Kc=; b=OnisKcwfAfriqBfNL4EZLuteZ5sBQ/Le0HfrV1xQa093dJV7p+6wYOFSgLEGTXxZ96 yrnLwTeWrUQ54F1qpY46h0LNyBe6C6s7eq6fORb05bZ/9nOR9j9pzltLuyMm/NWaEH6g UvZm3UfBwCxKBZVCfLe2ig1Rw84tRN8ksP+6WLZfZDIgJeWVtXNWepOAMX8jhzZoPkIp 8M1aS+bJehnUX7WUAg+jGijstP3TCUBpptTcy9cexC8GvA+kN6rJ+btRLi3QBcgbPokP XHm6aRLikYDvBjHgo3uJmikzid7MONmjaUwB8IS+xNjb1j7uGt8U1BrW5mhxLwmgz3Ht Wdng== X-Gm-Message-State: ACrzQf2zn2podZakWEDdgsP7FPGR27LDhduYt/ZJJa2dpJIv+YmXCAt8 PJ72/Yy8AXRMrxt/9kZekpU= X-Google-Smtp-Source: AMsMyM7MxlSHIOooyPBF/ezLyH5NNO17oupi/cIYG8ayh6sMmur+GYGBI0hOyPTx0XWTBrHEZncUyw== X-Received: by 2002:a05:6830:2901:b0:66c:3305:4ced with SMTP id z1-20020a056830290100b0066c33054cedmr16490003otu.300.1667559470959; Fri, 04 Nov 2022 03:57:50 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:485:4b69:c60a:5410:da59:aea3]) by smtp.gmail.com with ESMTPSA id i9-20020a4ac509000000b0049e9fbf1615sm966576ooq.48.2022.11.04.03.57.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 03:57:50 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: u-boot@lists.denx.de, marcel.ziswiler@toradex.com, Fabio Estevam Subject: [PATCH] wandboard: Pass mmc aliases Date: Fri, 4 Nov 2022 07:57:32 -0300 Message-Id: <20221104105733.657133-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 --- 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