From patchwork Mon Apr 6 07:59:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rayagonda Kokatanur X-Patchwork-Id: 1266701 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=bbeTXOP4; 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 48wjdG0jhDz9sP7 for ; Mon, 6 Apr 2020 18:00:18 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5E157800DF; Mon, 6 Apr 2020 10:00:11 +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="bbeTXOP4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7907D804EC; Mon, 6 Apr 2020 10:00:09 +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-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (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 D535F800A9 for ; Mon, 6 Apr 2020 10:00:05 +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-wm1-x341.google.com with SMTP id g21so1099000wmh.0 for ; Mon, 06 Apr 2020 01:00:05 -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=ZcBsz2UA7aWv4ZuH3Sr7zwzkOHylH80KxeZX0W508dE=; b=bbeTXOP4QmOW/TkdwmbvZsdcriT7g9tejdlVWVWpm6BdK3Kei+n6xThk2Qava5p21F 59fQGzp4sIRCVDRIYJCaPtqT6nzXMM3O0knaZBD8BO1qPRR0OsWqSJTfUWQPy+y9okf7 Ooo7yQe11OTmokRw8fNu8e7bDAjnXbavVBqUM= 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=ZcBsz2UA7aWv4ZuH3Sr7zwzkOHylH80KxeZX0W508dE=; b=SaQMtRPhbh/cAVKSi0lpoTQWUm9JcY2U7J0v644DRJ/A5ci7zatjibBDOKSzmVr7BQ 3vk3ODJu3iqyFODk9S1gJJr05RMCt7XBF8+iASB9WxWdeSuPEiYmsuq5Bahz8UEkJOxg aIwXkFCc5Vd5nMqoivE3x4LbUWlYcY1ZAMUoxoggTsrfHZsUYI81JWm9pYdZw44JEGUH mTZ9lisaTwHcpXrInVsCNaDt+E1hw3kHbLqaSWpeAaJDTPIWe6BwWWFOhMhc3RW5agLX eAw/FBty9RhOVlsTIiEs6ZFrdxIQ2BtsjcdDigccz+rbMBTat30sxZtMEcnLV7zcxKpp PjMw== X-Gm-Message-State: AGi0PubnHg7mA2Gki6CEMKfeQbQPKIznwmkleEdirGMppYvz9QUzJphf 5WUBeu/NRsHNrCnnnUKmKwUAzreVpnG8MJNhWm30k5plTeyM4s61Uiqt2fiw5bugW2HvdQU6a/y YJN3Xb2OxXGWt9NP8Cpi8O/LMWxxQ/o+Vngl+fRWugpj78zTHHhILZ7cEYSEHIXjAchbiNDACEp CN3c1y7Q== X-Google-Smtp-Source: APiQypKsH9y2e9cu0NBFrXwKHrwSjBUdjYo/VHhwO0I1YmY4wLqrBleDLpShIz7yZF8AkORS3+jDzw== X-Received: by 2002:a7b:ca46:: with SMTP id m6mr17966809wml.102.1586160004879; Mon, 06 Apr 2020 01:00:04 -0700 (PDT) Received: from rayagonda.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id j31sm18015057wre.36.2020.04.06.01.00.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 01:00:04 -0700 (PDT) From: Rayagonda Kokatanur To: u-boot@lists.denx.de, Stefan Roese , Qiang Zhao , Thomas Schaefer , Simon Glass , Bharat Kumar Reddy Gooty , vladimir.olovyannikov@broadcom.com Cc: Rayagonda Kokatanur Subject: [PATCH v4 1/1] driver: watchdog: get platform clock from dt file Date: Mon, 6 Apr 2020 13:29:52 +0530 Message-Id: <20200406075952.525-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 Get the watchdog platform clock from the DTS file using clk subsystem and use the same for calculating ticks in msec. Signed-off-by: Rayagonda Kokatanur Signed-off-by: Bharat Kumar Reddy Gooty Reviewed-by: Stefan Roese --- Changes from v3: -Address review comments from Stefan Roese, Don't return error if clk_get_by_index() fails becasue all platform may not have clock support. Changes from v2: -Address review comments from Stefan Roese, Use clk subsystem to get the base frequency of device instead of dt parameter "clk_mhz". 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 | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c index ca3ccbe76c..65fd2384f1 100644 --- a/drivers/watchdog/sp805_wdt.c +++ b/drivers/watchdog/sp805_wdt.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -34,6 +35,7 @@ DECLARE_GLOBAL_DATA_PTR; struct sp805_wdt_priv { void __iomem *reg; + unsigned long clk_rate; }; static int sp805_wdt_reset(struct udevice *dev) @@ -63,8 +65,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_rate / 1000); + } writel(UNLOCK, priv->reg + WDTLOCK); writel(load_value, priv->reg + WDTLOAD); @@ -105,11 +112,15 @@ static int sp805_wdt_probe(struct udevice *dev) static int sp805_wdt_ofdata_to_platdata(struct udevice *dev) { struct sp805_wdt_priv *priv = dev_get_priv(dev); + struct clk clk; priv->reg = (void __iomem *)dev_read_addr(dev); if (IS_ERR(priv->reg)) return PTR_ERR(priv->reg); + if (!clk_get_by_index(dev, 0, &clk)) + priv->clk_rate = clk_get_rate(&clk); + return 0; }