From patchwork Tue Mar 31 06:08:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rayagonda Kokatanur X-Patchwork-Id: 1264540 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=XR0X5U75; 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 RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48rzRY45RQz9sRN for ; Tue, 31 Mar 2020 17:08:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AED8981901; Tue, 31 Mar 2020 08:08:54 +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="XR0X5U75"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C496E81902; Tue, 31 Mar 2020 08:08: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.2 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-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) (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 3845A811FC for ; Tue, 31 Mar 2020 08:08:51 +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-x444.google.com with SMTP id p10so24367662wrt.6 for ; Mon, 30 Mar 2020 23:08:51 -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=CvnlN5TCnLMbvH6B12h1zulkUi5vGW4UP4uguvfRQEE=; b=XR0X5U75bViNIc5gcBlukQrkeUQ1loSqbugkrR+0aa1jYSBeY5sWzCKi+ngBciwmyW 6vAutzYKqvcbqNFZ+CbzdL9Ei3Xn6BHihOYWfD4ciNDUAH6V6DEPm66XHwNrRgPe3FoT xbep1BxACj7QRkislGFeciM00vMBymTbrPgl8= 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=CvnlN5TCnLMbvH6B12h1zulkUi5vGW4UP4uguvfRQEE=; b=sFPAMwktomN8eTvTwVrWY5SfOr7xyMZOnCPaL3MpbR4kYeVHqXnuIbAXC35+0iNPzh OyFQHml2/LBHyLs0Z8zdw0EHd78NG7joBZdC6eqezDweTkG5pa0yRZH3S8mJyyGH6++Q VjiWaUeDhW2F60UOAY15yg9NZbRpu+dLvTUykiwz1s5zb1xY81qb7C85X83+N6gEdprK qBQb4mESRJLQHzc/HGJxZczBof2BBBZ+w0nvw6xMC9B2xSehPLyoAJQE2dsc+NASuwqU rLBtNqjRKjmdXYz5Judq+Dc0CL7nAtKURgmGVj2/oDe9syfOKlCx+jQiaPAhNCYivaQE kmQQ== X-Gm-Message-State: ANhLgQ0EaSHmhh9ttnPhSRMuhxLmXxrr7pvX8VPkYlz0MxPymfVL2WVW PLrXmQMM/5atkn1toZ28iOwvgmemZ42f2/S7S+0yldin3I8DvCEat3WG+hmvq+wx4sAk4AsWssp ++iZQfgd7Xw14ouyKpi9DDMfQKX/u42M42IfsH6UlOj6im3rcFUDog23J3Vsv1HKzL2LId7IlNt bCi2NgoQ== X-Google-Smtp-Source: ADFU+vsWOULbKkRmZVSI5pTQgNUH6wgRnxGEnxjMqRO3RdYXzdZFgpd0EgPTR6ZWPVOxVGEVP2VNyw== X-Received: by 2002:adf:a55b:: with SMTP id j27mr18365475wrb.418.1585634930361; Mon, 30 Mar 2020 23:08:50 -0700 (PDT) Received: from rayagonda.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id u13sm2356321wmm.32.2020.03.30.23.08.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2020 23:08:49 -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 Cc: Rayagonda Kokatanur Subject: [PATCH v1 1/1] driver: watchdog: get timeout and clock from dt file Date: Tue, 31 Mar 2020 11:38:38 +0530 Message-Id: <20200331060838.24374-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 default timeout value and clock from the DTS file Signed-off-by: Bharat Kumar Reddy Gooty Signed-off-by: Rayagonda Kokatanur --- drivers/watchdog/sp805_wdt.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c index ca3ccbe76c..e8f54d6804 100644 --- a/drivers/watchdog/sp805_wdt.c +++ b/drivers/watchdog/sp805_wdt.c @@ -34,8 +34,31 @@ DECLARE_GLOBAL_DATA_PTR; struct sp805_wdt_priv { void __iomem *reg; + u32 timeout_msec; + u32 clk_mhz; }; +static u32 msec_to_ticks(struct udevice *dev) +{ + u32 timeout_msec; + u32 msec; + struct sp805_wdt_priv *priv = dev_get_priv(dev); + + timeout_msec = env_get_ulong("wdt_timeout_msec", 10, 0); + if (timeout_msec) { + dev_dbg(dev, "Overriding timeout :%u\n", timeout_msec); + msec = timeout_msec; + } else { + msec = priv->timeout_msec; + } + + timeout_msec = (msec / 2) * (priv->clk_mhz / 1000); + + dev_dbg(dev, "ticks :%u\n", timeout_msec); + + return timeout_msec; +} + static int sp805_wdt_reset(struct udevice *dev) { struct sp805_wdt_priv *priv = dev_get_priv(dev); @@ -63,8 +86,11 @@ 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 = msec_to_ticks(dev); writel(UNLOCK, priv->reg + WDTLOCK); writel(load_value, priv->reg + WDTLOAD); @@ -110,6 +136,12 @@ 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, "timeout-msec", &priv->timeout_msec)) + return -ENODATA; + + if (dev_read_u32(dev, "clk-mhz", &priv->clk_mhz)) + return -ENODATA; + return 0; }