Message ID | 20230204002619.938387-39-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=ENAPZFPE; 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 4P7tz26GBCz23hh for <incoming@patchwork.ozlabs.org>; Sat, 4 Feb 2023 11:42:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1866885F8A; Sat, 4 Feb 2023 01:41:47 +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="ENAPZFPE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7DAFD860AD; Sat, 4 Feb 2023 01:30:27 +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-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (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 2FA178601B for <u-boot@lists.denx.de>; Sat, 4 Feb 2023 01:28:50 +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-xd34.google.com with SMTP id e204so2612738iof.1 for <u-boot@lists.denx.de>; Fri, 03 Feb 2023 16:28:50 -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=ENAPZFPERutiEk3kNK1An3Aci3nYJ1HNfEl29yfp9s4yNe6OxUwZuUu6lDT1mKDGSH /NKHYjYCK8XkFfyc2pj7TyItAaq3YAwu3Cy8GcHNcf+V0K5/BJxyWcOLR8n7nnXVpQe3 FLf0dLJrGqQNPYqek4rpjigQBNeT9LxnSvq7g= 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=glWTDiI0qoa5xfYejW8DVT0PvWRiOt6BOk5rxD+NUCjUqBhNX+K6TeX9Cj43tqrc0H DHrxHoBQ1AA+q+bBHOovguam6LzN02f6jnhh7JbZu/ipeKgrQtjSHfaoUON3O3KpyIW0 ot01ZMTOttXKkJXSI8Nz3PA0ynHLU6Dzh+03qJBnGGxRyyNirX41QbUlqGv8UqT8xTcY VSimzLIlSm9jPcYGtl9bq2lG7TQyUi81T8LblBm37R+H029y8r3dZMO/2v6+pe4lv/gr s0+Q9uiJatypcB9frK19eJ/kr/+FA6EG9eM82ZcZjgb/7/aLVXf6jBZ/uyg0zWzMpvd9 jRRQ== X-Gm-Message-State: AO0yUKUgAiiC+9yjorlLWUzjKn/euGnxqyKvVu5aF6Cozhjjn0lYIBAY edaPOjw3kooTQSzkEErkQPCXV11SBfUnbGtb X-Google-Smtp-Source: AK7set8dYiqn6wgIOimHaNDfoimKRBUqTpSOL3WIFdZfrFC8I7qZys5jyF7uIkFwzyyKviDkVTrFXQ== X-Received: by 2002:a05:6602:150b:b0:722:827d:e6ac with SMTP id g11-20020a056602150b00b00722827de6acmr12157345iow.6.1675470512200; Fri, 03 Feb 2023 16:28:32 -0800 (PST) Received: from kea.bld.corp.google.com ([2620:15c:183:200:5b65:12f1:51b7:8157]) by smtp.gmail.com with ESMTPSA id j12-20020a02cc6c000000b003adab954c5asm1270255jaq.153.2023.02.03.16.28.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Feb 2023 16:28:31 -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: [RFC PATCH v2 38/56] freescale: Fix odd use of ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE Date: Fri, 3 Feb 2023 17:26:01 -0700 Message-Id: <20230204002619.938387-39-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230204002619.938387-1-sjg@chromium.org> References: <20230204002619.938387-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 |
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(-)