From patchwork Wed Apr 1 12:31:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rayagonda Kokatanur X-Patchwork-Id: 1265173 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=broadcom.com header.i=@broadcom.com header.a=rsa-sha256 header.s=google header.b=bBs2dBT6; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48slvD2H1Mz9sT6 for ; Wed, 1 Apr 2020 23:32:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B4554800BA; Wed, 1 Apr 2020 14:31:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=broadcom.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=broadcom.com header.i=@broadcom.com header.b="bBs2dBT6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6EDFF80117; Wed, 1 Apr 2020 14:31:53 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) (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 1206B8006D for ; Wed, 1 Apr 2020 14:31:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rayagonda.kokatanur@broadcom.com Received: by mail-wr1-x441.google.com with SMTP id a25so30391284wrd.0 for ; Wed, 01 Apr 2020 05:31:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id; bh=4vIf8ITm9spMvrfnETyncqNJ1eeWml04OWeppOzfro8=; b=bBs2dBT6osw4DAaXiNK1klO1gEupzyLQTL/f5TNKhUx17NSi/DHCAYJYmGBDITDqfO QXuYi/CY9DdTHGXFY5ecQdVumNagQwH5n0uBlwDkVBjZ9nUTZ1HiqnXop9JTMN/E8udI vQ7du51aWNBvDJ0/vZmGCOwGgixNQndkFmpts= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=4vIf8ITm9spMvrfnETyncqNJ1eeWml04OWeppOzfro8=; b=eeAR/EZm+lEd8TSuE8Sh9evvsCuliucrUjFnD74VWNJe/+N39kBhBQKJ16wLq9xzdf suuAUxq32JoAaAdzVYNMjJxsLhGpwl63aDkirJ4mPtO8f+KJHFYSnpFiUQaxQCdZHX8M u/Gygdpr2i1zDuFlmdRksU34nPgEloKhBMJwQ6Cqno1aLOJkZUI7VJyNlA/EmV12fGEx qa5PVV1Sv+JV27BK2I6jVj8ljH0ipjYFTdQ1odx6poAvs6PJByM+78LH4JfLWUXgKFQb A7HgJQBg/Z3Y2hXIhX1F3pIaRXFnY2AoWc2w/nNxnNeRfep/rROMLi1su+YU2aWJH2YL gQSw== X-Gm-Message-State: ANhLgQ0laJMV3bymH/GljEro6qFGYq52LtVzEmVPIZK7l0iMBiZDdoUl mlDvL6FCkPHrnnstX302HFWBm7aigmEHF2anwN/QD8rgkBWegvQVfX/acNNAvLXo9tcxHKBFYGK cJKjeNUAyAT/yxDewuroSeBR0v+J03IdeMeJLFKgcQ/zIXVZ46CNOX59f9OhB1diAQ5TIHT3h+X V9F7mHWQ== X-Google-Smtp-Source: ADFU+vurGhut7DmIFqeZgSGLrI0nJyYpcyoCLZNUjwFkBpaFP0DmcTNzXfSxm1M0qQHpG8GxCmd7Og== X-Received: by 2002:a5d:498b:: with SMTP id r11mr25791479wrq.368.1585744301745; Wed, 01 Apr 2020 05:31:41 -0700 (PDT) Received: from rayagonda.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id 9sm2407563wmm.6.2020.04.01.05.31.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2020 05:31:40 -0700 (PDT) From: Rayagonda Kokatanur To: u-boot@lists.denx.de, Qiang Zhao , Thomas Schaefer , Simon Glass , Bharat Kumar Reddy Gooty , vladimir.olovyannikov@broadcom.com, Stefan Roese Cc: Rayagonda Kokatanur Subject: [PATCH v2 1/1] driver: watchdog: get platform clock from dt file Date: Wed, 1 Apr 2020 18:01:28 +0530 Message-Id: <20200401123128.1547-1-rayagonda.kokatanur@broadcom.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.102.2 at phobos.denx.de X-Virus-Status: Clean From: Bharat Kumar Reddy Gooty Get the watchdog platform clock from the DTS file and use the same for calculating ticks in msec. Signed-off-by: Bharat Kumar Reddy Gooty Signed-off-by: Rayagonda Kokatanur --- Changes from v1: -Address review comments from Stefan Roese, Remove default timeout reading in probe() as it is read in include/wdt.h. Add paranthesis on multi-line statements. drivers/watchdog/sp805_wdt.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c index ca3ccbe76c..b9e4aee7a5 100644 --- a/drivers/watchdog/sp805_wdt.c +++ b/drivers/watchdog/sp805_wdt.c @@ -34,6 +34,7 @@ DECLARE_GLOBAL_DATA_PTR; struct sp805_wdt_priv { void __iomem *reg; + u32 clk_mhz; }; static int sp805_wdt_reset(struct udevice *dev) @@ -63,8 +64,13 @@ static int sp805_wdt_start(struct udevice *dev, u64 timeout, ulong flags) * set 120s, the gd->bus_clk is less than 1145MHz, the load_value will * not overflow. */ - load_value = (gd->bus_clk) / - (2 * 1000 * SYS_FSL_WDT_CLK_DIV) * load_time; + if (gd->bus_clk) { + load_value = (gd->bus_clk) / + (2 * 1000 * SYS_FSL_WDT_CLK_DIV) * load_time; + } else { + /* platform provide clk */ + load_value = (timeout / 2) * (priv->clk_mhz / 1000); + } writel(UNLOCK, priv->reg + WDTLOCK); writel(load_value, priv->reg + WDTLOAD); @@ -110,6 +116,9 @@ static int sp805_wdt_ofdata_to_platdata(struct udevice *dev) if (IS_ERR(priv->reg)) return PTR_ERR(priv->reg); + if (dev_read_u32(dev, "clk-mhz", &priv->clk_mhz)) + return -ENODATA; + return 0; }