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 BCA1EC433FE for ; Wed, 12 Jan 2022 13:54:26 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5AB8583214; Wed, 12 Jan 2022 14:54:21 +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="VnoNljL5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1B27D8328D; Wed, 12 Jan 2022 14:54:19 +0100 (CET) Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (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 7697F83278 for ; Wed, 12 Jan 2022 14:54:16 +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=aford173@gmail.com Received: by mail-il1-x136.google.com with SMTP id i14so2371963ila.11 for ; Wed, 12 Jan 2022 05:54:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nvFq7sdLWrZ3jUtXkgjKoCF0Hok38eD3O7AuSQn9emc=; b=VnoNljL5zUdNFoz4+pgjxm1WLTsZv6hPWy8UXQ82SnTifSKLFzN1DVhzxqnMBA/E6x F2xs6QihWDwR8RZ/Tu3odWWQ3Vqw1MuVYaJiJxv82LvFQZTyuPl7Zjconq00GDrBSMDw zuKIx+J/IfIiPbcjyakQl7nwQYeA6ErN3l3jFCnULHC4lu/7d8LAc19jIoUqvdW7M9TL xjBLGZRt9Ux0YzsUSQbch1pkfCsMTpOJLNBPISvjtzl02He2Wx5FDH3UEfs6rGzh7TKJ Kh/yB5QJP95mHb1QL2SLB34TLu7pKOqq+KWde2VzfCVmDyb1nkyw5h+keqFYbVQbX8uI cY7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nvFq7sdLWrZ3jUtXkgjKoCF0Hok38eD3O7AuSQn9emc=; b=HXsBShQ8F+lhju+7SVRylhJK3HX4kVwdp6OcBWQ4c8WWp+Qj8VQ6KcPDN2Z7AQ1Xbc yslHp3BQFWevHVbkpueqP3+nYdkC+tcyrbKDYJfO/jCFsvzdQEeuToUp5sbszEqF5gw5 KZHTLkyzMIU6TWZyT3fZFKNC83pXqeUiO61lww1PkvNN0TGwIDHmGfMOSvoVldvCEbVB 10UG4FlOSu5fjEkJBGBjLe82usK/tonVv31ixxFKfKmEBY+4Dxo/vOkSfUcyexZwRqlX XkSJo0hIcqggmz94neCcqcNnKQYJSiFA8PwCB1kx7EDXFgeCxtZOz6BqN5VE8vTTuKWH o7aA== X-Gm-Message-State: AOAM531zXdNMi1QpIgx0EjUpFFAyM28lR4URuDFzW+Ysx7S0q+SQ1fXg 1vcXdHFPFbbmQFM3GPpRHlEdWAnwi6MT+g== X-Google-Smtp-Source: ABdhPJwBXZvgP88TtIgnm57de3NY38EmoG8JNew+d+v+9354FaCIuAssScFzmC4gfZMuu3EatgtLag== X-Received: by 2002:a05:6e02:1541:: with SMTP id j1mr5089472ilu.7.1641995654766; Wed, 12 Jan 2022 05:54:14 -0800 (PST) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:e0c6:f60a:66d5:e5f1]) by smtp.gmail.com with ESMTPSA id k13sm7967144iow.45.2022.01.12.05.54.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 05:54:14 -0800 (PST) From: Adam Ford To: u-boot@lists.denx.de Cc: peng.fan@nxp.com, haibo.chen@nxp.com, andrey.zhizhikin@leica-geosystems.com, tharvey@gateworks.com, estevam@gmail.com, sbabic@denx.de, aford@beaconembedded.com, Adam Ford , Fabio Estevam Subject: [PATCH 2/2] mmc: fsl_esdhc_imx: Use esdhc_soc_data flags to set host caps Date: Wed, 12 Jan 2022 07:53:56 -0600 Message-Id: <20220112135356.322069-3-aford173@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220112135356.322069-1-aford173@gmail.com> References: <20220112135356.322069-1-aford173@gmail.com> 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.2 at phobos.denx.de X-Virus-Status: Clean The Linux driver automatically can detect and enable UHS, HS200, HS400 and HS400_ES automatically without extra flags being placed into the device tree. Right now, for U-Boot to use UHS, HS200 or HS400, the extra flags are needed in the device tree. Instead, go through the esdhc_soc_data flags and enable the host caps where applicable to automatically enable higher speeds. Suggested-by: Fabio Estevam Signed-off-by: Adam Ford diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index e5814232a2..5088e78bb6 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -1305,8 +1305,29 @@ static int fsl_esdhc_init(struct fsl_esdhc_priv *priv, val |= ESDHC_TUNING_CMD_CRC_CHECK_DISABLE; esdhc_write32(®s->tuning_ctrl, val); } - } + /* + * UHS doesn't have explicit ESDHC flags, so if it's + * not supported, disable it in config. + */ + if (CONFIG_IS_ENABLED(MMC_UHS_SUPPORT)) + cfg->host_caps |= UHS_CAPS; + + if (CONFIG_IS_ENABLED(MMC_HS200_SUPPORT)) { + if (priv->flags & ESDHC_FLAG_HS200) + cfg->host_caps |= MMC_CAP(MMC_HS_200); + } + + if (CONFIG_IS_ENABLED(MMC_HS400_SUPPORT)) { + if (priv->flags & ESDHC_FLAG_HS400) + cfg->host_caps |= MMC_CAP(MMC_HS_400); + } + + if (CONFIG_IS_ENABLED(MMC_HS400_ES_SUPPORT)) { + if (priv->flags & ESDHC_FLAG_HS400_ES) + cfg->host_caps |= MMC_CAP(MMC_HS_400_ES); + } + } return 0; } -- 2.32.0