Message ID | 20230206190550.1692420-61-sjg@chromium.org |
---|---|
State | RFC |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=RKba+LCc; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P9bjK6KNTz23r8 for <incoming@patchwork.ozlabs.org>; Tue, 7 Feb 2023 06:21:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E39E58612E; Mon, 6 Feb 2023 20:13:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="RKba+LCc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0FE6885C2E; Mon, 6 Feb 2023 20:10:41 +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=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (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 48A2D85C8A for <u-boot@lists.denx.de>; Mon, 6 Feb 2023 20:10:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd33.google.com with SMTP id e2so4810707iot.11 for <u-boot@lists.denx.de>; Mon, 06 Feb 2023 11:10:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aLE0PyTS3RzMfAG3wxWTAxexiMcygrG/DuUKWliz+PE=; b=RKba+LCcxB8vsb0NIS6vKYMJB7MZkW+VxgTH1oV+2Sybw5zGA7awsDgxyGmo6VUAem lENWVFaOeRsVLrtXXy9ubtzGri3LHvjQNlk+0RstmqDVoVh6txHyQYsMfZsS6RaPkKiZ XvF7U4SVEfD5iYHFiWcZh91p34PnxOw5DIlvE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aLE0PyTS3RzMfAG3wxWTAxexiMcygrG/DuUKWliz+PE=; b=a8R91bLn17n6vY27ainWPqWz3wqgiHbJr8bAjy2iFvDuHu5wygbOm4sMCyH2XVyrrq fRArqt05remntbaasaCZZJWojsxMSmTDWZTsiTcwvS+UJ70HuP0GH93dvLb+Lce8inK8 tLHzSlpkdh12oZ+8QBELVP0W+jk2EXTXqP+6m9SdVQhxQy3I3dYYUEEt9zCdoGRodH7c 25ZY6nqLrHLWgiNGAfkOmu9Vqkg1aVyPbO42iGTwm/pPmyGqHXmFmZRsgRAoL3nZ8L/k Q/VnEfP7l/fh12jg+21SKgMFPMWhB8zQ18qx2VJswFH9+pZn8Nlw2A4YLMXEMFTEhP5L iiVw== X-Gm-Message-State: AO0yUKXN0twZTZ3hpgjF0QPPyisY0apikyQ3x7UKEkpU2BzSX/ckUlww pZJtqicva046ztxH0iVZmn32XVARnlsokDCr X-Google-Smtp-Source: AK7set+rK3nT7+rQ1fZiQMQw6auUfVKnPgoJ7A2+oErisQ2vekNb2qYVguDdsmiKiO3jFQt/meduJA== X-Received: by 2002:a05:6602:199:b0:719:fd3a:395 with SMTP id m25-20020a056602019900b00719fd3a0395mr136202ioo.12.1675710578530; Mon, 06 Feb 2023 11:09:38 -0800 (PST) Received: from kea.bld.corp.google.com ([2620:15c:183:200:34e9:6977:1cac:fd32]) by smtp.gmail.com with ESMTPSA id t24-20020a028798000000b00375a885f908sm749878jai.36.2023.02.06.11.09.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Feb 2023 11:09:38 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org> Subject: [PATCH v3 60/81] freescale: Fix odd use of ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE Date: Mon, 6 Feb 2023 12:05:28 -0700 Message-Id: <20230206190550.1692420-61-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230206190550.1692420-1-sjg@chromium.org> References: <20230206190550.1692420-1-sjg@chromium.org> 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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
RFC: Migrate to split config
|
expand
|
diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index d5066666698..7215f61f468 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -325,8 +325,9 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, (timeout == 4 || timeout == 8 || timeout == 12)) timeout++; - if (IS_ENABLED(ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE)) - timeout = 0xE; +#ifdef ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE + timeout = 0xE; +#endif esdhc_clrsetbits32(®s->sysctl, SYSCTL_TIMEOUT_MASK, timeout << 16);
This is not a CONFIG option so we should not be using IS_ENABLED() on it, particularly not when it is not defined to anything, so shows up as calling IS_ENABLED() with no arguments. Just check it normally. This fixes a build error with split config on T2080QDS. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) drivers/mmc/fsl_esdhc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)