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 0BCBFC43334 for ; Wed, 15 Jun 2022 16:04:40 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C047C84502; Wed, 15 Jun 2022 18:04:13 +0200 (CEST) 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="hA/z7rK8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 53F6A84512; Wed, 15 Jun 2022 18:04:07 +0200 (CEST) Received: from mail-qv1-xf2c.google.com (mail-qv1-xf2c.google.com [IPv6:2607:f8b0:4864:20::f2c]) (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 2A9868450D for ; Wed, 15 Jun 2022 18:04:01 +0200 (CEST) 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-qv1-xf2c.google.com with SMTP id ea7so9098836qvb.12 for ; Wed, 15 Jun 2022 09:04:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JKk/129Nq4a8b4REu9fNiu8sox2y0wr9JVnjudIDpoY=; b=hA/z7rK8JJayIo9/WPiDuNbGKhlasSm2c5PEzRqR0hq5Dp7MjUCLEwDcR/RActd1/K N3ekj2I+owmjyutYhZVV3J/T48aV/9ZGUogMt11lUv66gvFnjIrka53Y8VsPD5C4HQld DHLZcdVf9ojUBEmPuO2Qm+PzpcLzjWOhydiCk= 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=JKk/129Nq4a8b4REu9fNiu8sox2y0wr9JVnjudIDpoY=; b=NyvvTQ11TyhZOMG+GDLYgL2MZP0QuKb+piJgIM4E4IwY9ZYQl5MC8lpX/lT5NiZJLm 5MVjZkUEmOMIpwJUSFP3VOVF8PEiwMExZBahs8TkpZ32cssoWh36FXUKr9GrObe/3/9d hR4n5Mxm3+UqYv+PlSLL2AAoxO42v66vexezvzbZHMIeL5s+8EomkV6GN5kX7sxp7FWq a/7CZMSFvi6PXGpbetHGhNQymZlS3wlQFNJjLGlEahvSmAdudmYcwf+D5CTG3/08q3K6 oxIbn0dP9wGOgct9mhFZ+YS9BYCk/66HhUR7qNTDZPKuwR6FFY29E72RpjtrqTymm/J9 Ou3A== X-Gm-Message-State: AJIora/i+WIcfEILvkQEFOnAZ66ZWbst6DJHGjhFshy1qJIq0+3BGd7s pA0uDW2Pcc+yi7eOeqBtIyVJ2fQdr5jtQw== X-Google-Smtp-Source: AGRyM1sjNYBGM/j1Yh8QgoLhN3Nlji5r5Ldrt7yB02JqXrSwMmvzCjfpcXqIADMN80H2AO4m/HauJw== X-Received: by 2002:a05:6214:20e6:b0:46e:32e0:67e with SMTP id 6-20020a05621420e600b0046e32e0067emr324656qvk.48.1655309039512; Wed, 15 Jun 2022 09:03:59 -0700 (PDT) Received: from bill-the-cat.lan (cpe-65-184-195-139.ec.res.rr.com. [65.184.195.139]) by smtp.gmail.com with ESMTPSA id h9-20020a05620a284900b006a6d365e9b1sm12240069qkp.57.2022.06.15.09.03.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 09:03:59 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Chee Tien Fong , Chin-Liang See , Dinh Nguyen , Holger Brunck , Ley Foon Tan , Marek Vasut , Siew Chin Lim , Stefan Roese , hee Hong Ang Subject: [PATCH 04/13] watchdog: designware: Make this depend on WDT Date: Wed, 15 Jun 2022 12:03:46 -0400 Message-Id: <20220615160355.1519592-4-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220615160355.1519592-1-trini@konsulko.com> References: <20220615160355.1519592-1-trini@konsulko.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.5 at phobos.denx.de X-Virus-Status: Clean As this driver can dynamically determine the values set in CONFIG_DW_WDT_BASE when using WDT, so make this depend on WDT rather than migrate CONFIG_DW_WDT_BASE to Kconfig. Cc: Chee Tien Fong Cc: Chin-Liang See Cc: Dinh Nguyen Cc: Holger Brunck Cc: Ley Foon Tan Cc: Marek Vasut Cc: Siew Chin Lim Cc: Stefan Roese Cc: hee Hong Ang Signed-off-by: Tom Rini --- drivers/watchdog/Kconfig | 4 ++-- drivers/watchdog/designware_wdt.c | 21 --------------------- include/configs/socfpga_common.h | 1 - include/configs/socfpga_soc64_common.h | 1 - 4 files changed, 2 insertions(+), 25 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index c3eb8a8aec1b..532ada89c1b2 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -64,8 +64,8 @@ config ULP_WATCHDOG config DESIGNWARE_WATCHDOG bool "Designware watchdog timer support" - select HW_WATCHDOG if !WDT - default y if WDT && ROCKCHIP_RK3399 + depends on WDT + default y if ROCKCHIP_RK3399 help Enable this to support Designware Watchdog Timer IP, present e.g. on Altera SoCFPGA SoCs. diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index cfec29bd158c..cad756aeaf20 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -60,26 +60,6 @@ static void designware_wdt_reset_common(void __iomem *base) writel(DW_WDT_CRR_RESTART_VAL, base + DW_WDT_CRR); } -#if !CONFIG_IS_ENABLED(WDT) -void hw_watchdog_reset(void) -{ - designware_wdt_reset_common((void __iomem *)CONFIG_DW_WDT_BASE); -} - -void hw_watchdog_init(void) -{ - /* reset to disable the watchdog */ - hw_watchdog_reset(); - /* set timer in miliseconds */ - designware_wdt_settimeout((void __iomem *)CONFIG_DW_WDT_BASE, - CONFIG_DW_WDT_CLOCK_KHZ, - CONFIG_WATCHDOG_TIMEOUT_MSECS); - /* enable the watchdog */ - designware_wdt_enable((void __iomem *)CONFIG_DW_WDT_BASE); - /* reset the watchdog */ - hw_watchdog_reset(); -} -#else static int designware_wdt_reset(struct udevice *dev) { struct designware_wdt_priv *priv = dev_get_priv(dev); @@ -195,4 +175,3 @@ U_BOOT_DRIVER(designware_wdt) = { .ops = &designware_wdt_ops, .flags = DM_FLAG_PRE_RELOC, }; -#endif diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index d1efba29fc40..4a7da76e51e6 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -66,7 +66,6 @@ /* * L4 Watchdog */ -#define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS #define CONFIG_DW_WDT_CLOCK_KHZ 25000 /* diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index c1037ab595fa..a3e8d5492919 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -92,7 +92,6 @@ /* * L4 Watchdog */ -#define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS #ifdef CONFIG_TARGET_SOCFPGA_STRATIX10 #ifndef __ASSEMBLY__ unsigned int cm_get_l4_sys_free_clk_hz(void); -- 2.25.1