From patchwork Fri Dec 6 16:24:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1205196 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VmiJmcE0"; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47TybR2Z0Bz9sR7 for ; Sat, 7 Dec 2019 03:24:35 +1100 (AEDT) Received: from phobos.denx.de (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2E56C81622; Fri, 6 Dec 2019 17:24:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (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=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VmiJmcE0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6D926815E1; Fri, 6 Dec 2019 17:24:22 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, SPF_HELO_NONE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (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 2D700808F2 for ; Fri, 6 Dec 2019 17:24:20 +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=igor.opaniuk@gmail.com Received: by mail-wr1-x443.google.com with SMTP id c14so8404068wrn.7 for ; Fri, 06 Dec 2019 08:24:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=RmT3pQZ8Wx6PgaH49rnInyvZU0bRh7kT54srVRrM0sA=; b=VmiJmcE0gHi+AWnk0KMdFNe8aRDfUkg+fKVOWtQjTpFTs+gobYGAUufczQBprqa3i2 KzKMyHqZ5oYAKJ+skV7rblL9wIFr8xejo9Pz2sG/G8fbC7yt4dBAcNAMaZnvJx1rE0JV Gke7WrSqn/1ng603+CeHHHjzVDSKEGNBmEYICGv5nDdnJSQfAsPhNCuJpATzhFstoKBL sUGznKadtqRDqQwqoGiTMjVS4idSwjisxfc9QJCTDsLx1G9DKzrBnJD0k+zXoDpys+NZ NkSdoahdK8BH3o2V+MeKhNWFR66iM/Ruh2261iWt1tDRjoDf+H4bZaJMjHp2OUB0uSYk LQAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=RmT3pQZ8Wx6PgaH49rnInyvZU0bRh7kT54srVRrM0sA=; b=aHPyC/TPgPd0Mf1zyTT+M7kcCpEuqyy1hFy5iigZ3Bzyos3JVPmAJwyFveXEeEwxf5 Q8dnhTixWY1H/M9pp0PeknnfKVqEcmuHmon9z4fy5lZuQ8LSTkmPVNAcw65vcJVgNvVX KuGeB+qrDtqx5+2MBMQA5CP1CtAw5rVgjpM1WL1g1HxWxqfd9M64hXC8lYkBF2R0zTvI hcsAgrR62sq+pF1ZYhs8V1xuNYp0mBSFNgQLUXMcLKrvbKG55dR+7b+25MB9KuFNqYYz FyA3nJD5kFgJMylT7nsj5vURoKTQHrlWzKO+AahZ6/K0mP2yQcxPmlYr8DVnkgjdvp8a cLiA== X-Gm-Message-State: APjAAAUaPVEwR/rRFoOUKa5gIny8/+plbLMmg4B5iHrH8qCXeaUC9XYo utAELUwog3zw3z9GpEI39Hb9ce7Q+dk= X-Google-Smtp-Source: APXvYqzQgaakOC308BR5tjTtXk89y6b2jNobqBlOM5F3bZCZ0vjQVUSxUzkvox+Q+0t73o3Jz3Jrxg== X-Received: by 2002:adf:f508:: with SMTP id q8mr13584428wro.334.1575649459442; Fri, 06 Dec 2019 08:24:19 -0800 (PST) Received: from localhost ([194.105.145.90]) by smtp.gmail.com with ESMTPSA id n188sm4473866wme.14.2019.12.06.08.24.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Dec 2019 08:24:18 -0800 (PST) From: Igor Opaniuk To: u-boot@lists.denx.de Subject: [RESEND PATCH v1] colibri_imx6: fix broken fsl_esdhc_imx conversion Date: Fri, 6 Dec 2019 18:24:16 +0200 Message-Id: <20191206162416.30200-1-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcel Ziswiler , Steffen Dirkwinkel , Martyn Welch , Igor Opaniuk , Max Krummenacher , Jason Liu Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk Not all CONFIG_FSL_ESDHC defines were properly replaced with CONFIG_FSL_ESDHC_IMX, which broke U-boot proper booting on Colibri iMX6 SoMs. U-boot is stuck after this message: Commercial temperature grade DDR3 timings, 64bit bus width. Trying to boot from MMC1 Fixes: e37ac717d7("Convert to use fsl_esdhc_imx for i.MX platforms") Signed-off-by: Igor Opaniuk --- board/toradex/colibri_imx6/colibri_imx6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index ad40b589c1..44173dde1f 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -83,7 +83,7 @@ iomux_v3_cfg_t const uart1_pads[] = { MX6_PAD_CSI0_DAT11__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), }; -#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD) /* Colibri MMC */ iomux_v3_cfg_t const usdhc1_pads[] = { MX6_PAD_SD1_CLK__SD1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), @@ -304,7 +304,7 @@ int board_ehci_hcd_init(int port) } #endif -#if defined(CONFIG_FSL_ESDHC) && defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_FSL_ESDHC_IMX) && defined(CONFIG_SPL_BUILD) /* use the following sequence: eMMC, MMC */ struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = { {USDHC3_BASE_ADDR},