From patchwork Tue Jan 10 16:19:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1724175 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=cMgp1Z7h; 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 4Nrx2M0p2Lz23gB for ; Wed, 11 Jan 2023 03:23:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4B61D855B9; Tue, 10 Jan 2023 17:21:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com 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=konsulko.com header.i=@konsulko.com header.b="cMgp1Z7h"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C648085527; Tue, 10 Jan 2023 17:20:32 +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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-vs1-xe2f.google.com (mail-vs1-xe2f.google.com [IPv6:2607:f8b0:4864:20::e2f]) (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 E713C854B1 for ; Tue, 10 Jan 2023 17:20:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-vs1-xe2f.google.com with SMTP id d66so357545vsd.9 for ; Tue, 10 Jan 2023 08:20:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; 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=drT+grfgyFZrVxx1zwK1j1ti2K0sJozDH1x3/igujNc=; b=cMgp1Z7h/dGXTn2/+O/eGXvrOBsVY/K6N0NmNwr7nHHB39Q3C1XzqeO9jZS/e4TczN 0Qf6XtwcHOXicIiG7HilmWsyw92wL9ZEFQpofi7GTP7cP1SpDmtLUpsGY4o6CVGakM9H I6k+1jM0GMOk4ZwylgXNexr+0bAyATUIBOJBg= 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=drT+grfgyFZrVxx1zwK1j1ti2K0sJozDH1x3/igujNc=; b=psvaHWHH1DVOthGLBK0x5BbH5MIYUAlILS56doO8NBgVx2svQ+3MYDQZebEnlnsgWP oHio8sMVCdnosX+2cO/uFLsY4gtlPbEqKlXupmMJo1hY2aJtH6YOXbixYR37erRSDy9c Q6CFiJufKnyofW4F9K+y9mOO54iIvVAzpsowtar/YexuNkmgtu9eazF7KvsC8g8Iuvjq s+SmnnX+JjsnI9LVRjV7w7oMXgLuKcx/45xycKNLcre7Xg4fkA1drS1fO25u9UefFEDM EPueGd2p53+hPmPNgIHGmVayIzFa4WODna9oPIrZ/2Xy5VKmJx+p3jS4fDp89dOEko1l ECMQ== X-Gm-Message-State: AFqh2krMQMMpWreaGWZKO6kBYNdET3SEtKfaAOMsjT7OZbcvSdp1SjYr MnsaQuphzT/lpW/1IXmbLFtzu2Rfx0SKqZ/bz1k= X-Google-Smtp-Source: AMrXdXux4s8LYB/P0yf6HZEcYwwvnkRmo/R/jeyj/OrpI5Xg62Uf/j8193ukSCyzaYrjUAcd/JfXGg== X-Received: by 2002:a05:6102:3548:b0:3d0:a805:e6af with SMTP id e8-20020a056102354800b003d0a805e6afmr3892602vss.15.1673367601597; Tue, 10 Jan 2023 08:20:01 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-2c2f-ce0f-8dee-7136.res6.spectrum.com. [2603:6081:7b00:6400:2c2f:ce0f:8dee:7136]) by smtp.gmail.com with ESMTPSA id d12-20020a05620a240c00b006fcc3858044sm7557110qkn.86.2023.01.10.08.20.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 08:20:01 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Stefan Roese , Stefano Babic , Peng Fan Subject: [PATCH 17/19] watchdog: Clean up defaults for imx_watchdog / ulp_wdog Date: Tue, 10 Jan 2023 11:19:44 -0500 Message-Id: <20230110161946.3816866-17-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230110161946.3816866-1-trini@konsulko.com> References: <20230110161946.3816866-1-trini@konsulko.com> MIME-Version: 1.0 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.6 at phobos.denx.de X-Virus-Status: Clean In imx_watchdog, clean up the comment to just note the range now, as we do not need to set the default here as Kconfig does this for us. For ulp_wdog, set the default value via Kconfig instead. Cc: Stefan Roese Cc: Stefano Babic Cc: Peng Fan Signed-off-by: Tom Rini Reviewed-by: Stefan Roese --- drivers/watchdog/Kconfig | 1 + drivers/watchdog/imx_watchdog.c | 7 +------ drivers/watchdog/ulp_wdog.c | 4 ---- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index f1b1cf63ca3a..b5ac8f7f50dc 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -30,6 +30,7 @@ config WATCHDOG_TIMEOUT_MSECS default 128000 if ARCH_MX7 || ARCH_VF610 default 30000 if ARCH_SOCFPGA default 16000 if ARCH_SUNXI + default 5376 if ULP_WATCHDOG default 60000 help Watchdog timeout in msec diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c index 3586246fbfbc..894158b304a7 100644 --- a/drivers/watchdog/imx_watchdog.c +++ b/drivers/watchdog/imx_watchdog.c @@ -68,13 +68,8 @@ static void imx_watchdog_init(struct watchdog_regs *wdog, bool ext_reset, /* * The timer watchdog can be set between - * 0.5 and 128 Seconds. If not defined - * in configuration file, sets 128 Seconds + * 0.5 and 128 Seconds. */ -#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 128000 -#endif - timeout = max_t(u64, timeout, TIMEOUT_MIN); timeout = min_t(u64, timeout, TIMEOUT_MAX); timeout = lldiv(timeout, 500) - 1; diff --git a/drivers/watchdog/ulp_wdog.c b/drivers/watchdog/ulp_wdog.c index e08105430485..c21aa3af55fa 100644 --- a/drivers/watchdog/ulp_wdog.c +++ b/drivers/watchdog/ulp_wdog.c @@ -25,10 +25,6 @@ struct ulp_wdt_priv { u32 clk_rate; }; -#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 0x1500 -#endif - #define REFRESH_WORD0 0xA602 /* 1st refresh word */ #define REFRESH_WORD1 0xB480 /* 2nd refresh word */