From patchwork Mon Sep 2 21:12:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Salveti X-Patchwork-Id: 1156732 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=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=foundries.io Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=foundries-io.20150623.gappssmtp.com header.i=@foundries-io.20150623.gappssmtp.com header.b="DA2+YNuE"; dkim-atps=neutral Received: from lists.denx.de (unknown [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46MlHj4MJQz9s4Y for ; Tue, 3 Sep 2019 08:34:07 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id BDCD1C21DFA; Mon, 2 Sep 2019 22:33:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4FBCBC21C50; Mon, 2 Sep 2019 22:33:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A799AC21C50; Mon, 2 Sep 2019 21:12:10 +0000 (UTC) Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by lists.denx.de (Postfix) with ESMTPS id 1CE56C21BE5 for ; Mon, 2 Sep 2019 21:12:10 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id r15so11331629qtn.12 for ; Mon, 02 Sep 2019 14:12:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundries-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4QQt4E5YPMAZCXXcFKNjsO7gFu89p+uhc1oDgwlaZw4=; b=DA2+YNuE8pvSjPgIzDTWNoS2CvmMoMNvuBd9Y8AGOJVC3phsksBLCs8ICsjxg1YNKJ eoxGP62vI6hfDOo1+O+nYivOv1xptxlDbyPTLNbkKgIDEm6qOFb/+I5An9ZO3Jl+rNbO OZ/wKNMW6y4CdbaA3VK72YWknw8nJxAQSfiCwfZdDPqAz5CkYCuLkhksy5XvlrTXTbQN X3Gz99VYk/fhdjJs9SgaFiFf22EsQ8bek61dZCu/BMbYSeyVmy5Vis+sDife+efaOvlV C3VAV+uwmDWKsTBxFh2Ecj8tOmPNqmggwl9N/nKFkV/tB94Q7Ycm48TrFDH3j/sS9KAI iWxw== 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:mime-version :content-transfer-encoding; bh=4QQt4E5YPMAZCXXcFKNjsO7gFu89p+uhc1oDgwlaZw4=; b=CWK1IcIk7mmH+DqyDJmkOR4VMxy1OuJziVo/ydR/1rfKpGi3NTrk/L/rg+XmSaYb5k o/iQGdDbCStTMRFcJ92D20d/LBPSTiOZXMoZ/B2gAryGpg7mVaBDAcSUoEf1U4w7ZFSL PPji5EYcK4clGNmRLqMrrcRydATwlxreeOvscwP4LaoenUsg6+MgDxvWoc4WKOm7sdZK ERlqaXbteONCm3TIoYa061JLcQGOgf8cGJ3Q9r4WEzQ87snahjjgDo/TkF4+EueFixoI uKmFKzjkKWdtInf9iyXrfCOIzDeKBb7Vd1tKjF6HMg++PynaH6MKBtnK3OY3wbFnrof7 Rgdg== X-Gm-Message-State: APjAAAXVGqoYS8R7vw1YXkttfxVrUkclL3oGXKDGLoDkD4I5Kcc5QOId 0qiO+RqtzFZ7HELoZrKTm6CKZU5koA== X-Google-Smtp-Source: APXvYqwZcOrlCaw3xYnn6+w7uYaLHtyeAOi3t9L9jVJriH6cigO0vBqi65b9TYaXktORVf4G67nwgA== X-Received: by 2002:ac8:4253:: with SMTP id r19mr30724836qtm.348.1567458728572; Mon, 02 Sep 2019 14:12:08 -0700 (PDT) Received: from localhost.localdomain ([2804:14d:badc:8822:d03d:f48e:97da:9d51]) by smtp.gmail.com with ESMTPSA id a14sm2791083qkg.59.2019.09.02.14.12.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 14:12:08 -0700 (PDT) From: Ricardo Salveti To: u-boot@lists.denx.de Date: Mon, 2 Sep 2019 18:12:02 -0300 Message-Id: <20190902211202.7722-1-ricardo@foundries.io> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 02 Sep 2019 22:33:28 +0000 Cc: stefan.agner@toradex.com, max.krummenacher@toradex.com, uboot-imx@nxp.com Subject: [U-Boot] [PATCH] apalis_imx6: fix broken fsl_esdhc_imx conversion X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Commit e37ac717d796 ("Convert to use fsl_esdhc_imx for i.MX platforms") converted FSL_ESDHC to FSL_ESDHC_IMX, but the config check for apalis_imx6 wasn't updated accordantly. Signed-off-by: Ricardo Salveti Reviewed-by: Peng Fan Acked-by: Max Krummenacher --- board/toradex/apalis_imx6/apalis_imx6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index ef668fcedc..89680da53f 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -93,7 +93,7 @@ iomux_v3_cfg_t const uart1_pads_dte[] = { 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) /* Apalis MMC1 */ iomux_v3_cfg_t const usdhc1_pads[] = { MX6_PAD_SD1_CLK__SD1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), @@ -290,7 +290,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, MMC1, SD1 */ struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = { {USDHC3_BASE_ADDR},