From patchwork Fri Aug 7 15:03:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1342307 X-Patchwork-Delegate: marek.vasut@gmail.com 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=rqy+putb; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BNTCz4cJMz9sPB for ; Sat, 8 Aug 2020 01:04:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E694C821DD; Fri, 7 Aug 2020 17:04:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rqy+putb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 329EE821D9; Fri, 7 Aug 2020 17:04:25 +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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) (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 824A8821AF for ; Fri, 7 Aug 2020 17:04:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qk1-x742.google.com with SMTP id d14so1943311qke.13 for ; Fri, 07 Aug 2020 08:04:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PNrP2j65ozm760oAYMe36Iqn378SC9RN4l6nWBUh1q4=; b=rqy+putbpjHYfrGnLd+SPiXUBm0iCZ173+kgRyCtQWb+L4ITw1HA/q4+8B3h7ouTrT 5rxPZK5kQBecoDklgcvg2FweppNoQAvVwx6UTRx/jSR2wmVQHqeyrcMwK8T5SF0RRcMa Ha/4c7d4FN45Xpkdn9oxFhaW+9pLAjsiagvj2Kmo9yd3SP2NS9ONplTJoRm12rzKhO0D E0lCEPqNFgCDBzwJ8lTtp/1GtLYwcsDzhRXP4Rmtvy6gidMKLnLyQNRyaPCJ/PsG3vVA bSSuGaVA86xkyb8jmTYd8fOVUhe88VgipWXVN7gwWSJKIk526ypMWsA/9cBvVav5HbJ6 gSBw== 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:mime-version :content-transfer-encoding; bh=PNrP2j65ozm760oAYMe36Iqn378SC9RN4l6nWBUh1q4=; b=ot6Zr1PWyK5EJsFSpzfK8EyhHDTaLr9Ng+TQM7fVvFLLYeVlhrgTvXdWnNhiJwKxNM U00Xb/00GN/caEFe/XAp4SyHVGReENJ9/k5mulknyQ8SU/AQ60iQgm2QH6M1m2Qv9Ufq l1frBW/V7E71ru+eXGrwkSgpXT5zyvdynM35RfhmSNHt2R3+EwcFCVhdIv1IfNRPUXv5 hbLgDnq3os5RyZo3UUv0qsl9Gd+74LFmoGE2UOkAUo+Wk/x1uJU9y9GYPCGAQkieqU9N QoyfLNEODHhRrIFprOInlg3VC3Qtlk5H0EFjdgoO7tsOMmRpvkz0GcNz9H3e7YTp29EI 1ODw== X-Gm-Message-State: AOAM530usMHFrJYsqf370H9pVdIm1Y7cCUZRlXx3vWeQFwRZoEa22nKz M3sm7tTXG9+OIJRhMLXLlZ69F61Xn+gmMA== X-Google-Smtp-Source: ABdhPJyYWSNB85trSzDTcwyA/JowcgNGb2nqCAzcQA9So4/BeJVoEQXo/pfO8CSK5s4D/E/wHJkbwQ== X-Received: by 2002:a05:620a:4d9:: with SMTP id 25mr13958077qks.411.1596812661148; Fri, 07 Aug 2020 08:04:21 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id d20sm6681550qkl.36.2020.08.07.08.04.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2020 08:04:20 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Marek Vasut , Simon Glass , Jagan Teki , Bin Meng , Sean Anderson Subject: [PATCH v2 1/7] wdt: dw: Switch to using fls for log2 Date: Fri, 7 Aug 2020 11:03:48 -0400 Message-Id: <20200807150355.287181-1-seanga2@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.3 at phobos.denx.de X-Virus-Status: Clean log_2_n_round_up is only found in arm. fls performs the same job and is generic. Signed-off-by: Sean Anderson --- Changes in v2: - Fix fls being off-by-one when compared to log_2_n_round_up drivers/watchdog/designware_wdt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index 12f09a7a39..f25c8d9ab3 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #define DW_WDT_CR 0x00 @@ -35,7 +34,7 @@ static int designware_wdt_settimeout(void __iomem *base, unsigned int clk_khz, signed int i; /* calculate the timeout range value */ - i = log_2_n_round_up(timeout * clk_khz) - 16; + i = fls(timeout * clk_khz - 1) - 16; i = clamp(i, 0, 15); writel(i | (i << 4), base + DW_WDT_TORR); From patchwork Fri Aug 7 15:03:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1342308 X-Patchwork-Delegate: marek.vasut@gmail.com 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Ys1WWxeP; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BNTD92Wf3z9sPB for ; Sat, 8 Aug 2020 01:04:41 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B946E821F3; Fri, 7 Aug 2020 17:04:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ys1WWxeP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5E782821EA; Fri, 7 Aug 2020 17:04:26 +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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) (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 859B6821D0 for ; Fri, 7 Aug 2020 17:04:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qt1-x843.google.com with SMTP id t23so1487301qto.3 for ; Fri, 07 Aug 2020 08:04:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cenf7uGWY+dDk2Jni9wC9YeD0xZiaCaFFu81rkZhx1g=; b=Ys1WWxePoofDTzkwzWB8vvDd+xvowfnABqli2un6iV/LUtHp+XxWWISxKbxraxCXq3 xr71/FihbQe9rIcBKvMWnuraQC9yP/LMBlGjnhFYcm9gWttxAcp53TSLXp6o7oOEp8Ks joR/Oc44H2cB5Sf1GHjOoBKBVQylwGKHLOoQYZcyhPiISeu+5DfvQfIiRGLdWCxJSZd2 MBF++86s3B4xTpVguZYQzvuI9/q+WLoJtLHDHeaqzQVEIPIpkmVDHJjprw7suZnzFAj6 lTRQHquRYBeJUjw0PE5lwVdPrFXKaXaRKLUM1YQbtMWW9E4aSww50nGV3UBYNKAlstgK BK5Q== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=cenf7uGWY+dDk2Jni9wC9YeD0xZiaCaFFu81rkZhx1g=; b=OeL+FfUzCeFqkEpm/ecCWGYh96QNTDHxd2IwCKkj69S6kl0KVneNMJ0XvXJDWiKLm2 4kvgFSnCK/DpbuIozbGc9lR6YAkoHf8a4tpyKsu4nDB9sXDbGo/Qmwcj7Kr8+4pJ5Ias EpMermDfwsQCh12GqjbyyIxItc109D65T2caOqSxr7PHuyqSnb5g3DRzIu0lz9sXRmGS SDhe0TvOxJfgqVnagqEP7YNRsieZ3lY10i93Ipi9wTDG+5J13YM0yWpB7a2Vv1q6lRX8 6ERRU1euUh+msr6F9UYC5Du0iySLI4yrJ8pCB2OUdNGcp18TBiabSz/uONXG5XWErVPy DpDw== X-Gm-Message-State: AOAM531zutK6IhbOg2j/zpDE6FXsg/ZHiRjwgu1IKJK2/yFIfFYyvF/P 70SJuWKgxp3dDzaiCN/N4poOyzlGwN+hOw== X-Google-Smtp-Source: ABdhPJzAq4NWGOHiv+N+ZGA5n+LIondUrEgGuooosbhNVx9gPtIs7A0In44bho4hVW72Vupo/95bTg== X-Received: by 2002:ac8:729a:: with SMTP id v26mr14739160qto.362.1596812662114; Fri, 07 Aug 2020 08:04:22 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id d20sm6681550qkl.36.2020.08.07.08.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2020 08:04:21 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Marek Vasut , Simon Glass , Jagan Teki , Bin Meng , Sean Anderson Subject: [PATCH v2 2/7] wdt: dw: Switch to if(CONFIG()) instead of using #if Date: Fri, 7 Aug 2020 11:03:49 -0400 Message-Id: <20200807150355.287181-2-seanga2@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200807150355.287181-1-seanga2@gmail.com> References: <20200807150355.287181-1-seanga2@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.3 at phobos.denx.de X-Virus-Status: Clean This is preferred over #if because the compiler can check syntax even if the feature is disabled. This cannot be used for CONFIG_CLK because CONFIG_DW_WDT_CLOCK_KHZ is not defined on all platforms. Signed-off-by: Sean Anderson Reviewed-by: Heinrich Schuchardt --- (no changes since v1) drivers/watchdog/designware_wdt.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index f25c8d9ab3..49cf861d46 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -136,17 +136,17 @@ static int designware_wdt_probe(struct udevice *dev) priv->clk_khz = CONFIG_DW_WDT_CLOCK_KHZ; #endif -#if CONFIG_IS_ENABLED(DM_RESET) - struct reset_ctl_bulk resets; + if (CONFIG_IS_ENABLED(DM_RESET)) { + struct reset_ctl_bulk resets; - ret = reset_get_bulk(dev, &resets); - if (ret) - return ret; + ret = reset_get_bulk(dev, &resets); + if (ret) + return ret; - ret = reset_deassert_bulk(&resets); - if (ret) - return ret; -#endif + ret = reset_deassert_bulk(&resets); + if (ret) + return ret; + } /* reset to disable the watchdog */ return designware_wdt_stop(dev); From patchwork Fri Aug 7 15:03:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1342309 X-Patchwork-Delegate: marek.vasut@gmail.com 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=VxblpMfn; 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 4BNTDN2lCrz9sPB for ; Sat, 8 Aug 2020 01:04:52 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D927D8221A; Fri, 7 Aug 2020 17:04:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VxblpMfn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5CF49821F1; Fri, 7 Aug 2020 17:04:28 +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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) (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 8ED99821D3 for ; Fri, 7 Aug 2020 17:04:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qt1-x844.google.com with SMTP id 6so1499889qtt.0 for ; Fri, 07 Aug 2020 08:04:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=w9OR766NAsbZFyFa9VEvDnr+YNiA4L3zZmk3hQ121OE=; b=VxblpMfnrnYk/UC86qKePkbTrjrg9Mk/5i5+3BtD0PsH56gGYt3M/fsD0Q9u6TGFNO xXMd7cI1SfbqKR37i6DqmyGvJ1okh9iooNQmZeFBXoAxxsYczrH40TnEZ0gLyowRrZca KqygIbOApn32pM+edWj4+gWY4gVBOcciYVn7W+CtD+7qiv15mGj/huWOR2VlaW4KeKie a9dOLUTzSiUqoYgByPuCBk2rA0gJfaxnr+MLrR1gwVAp6at4wU9JTPaV7oNlxaQ7ULk+ fh2RnciH6M1SkNNn4fi+V791PLXs8o7lZoNuA/qfRNVOJmsnlZ1kUMDOpTsze0P2Frm2 yH+w== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=w9OR766NAsbZFyFa9VEvDnr+YNiA4L3zZmk3hQ121OE=; b=mFG7J15DM3tVukml+pUTNFmZn3+p52BF5drw6JrHWGzemXCAVJo09W/z1os2cAFm2c 20zth8vCtOjmiUarfTvJmXEwYT/9aaW2yLK8F0Gwcbwcm//LHNbhin3fLHs96tGyalVG dbdqrIxV5snQ10avwbf14QvjXvV/5PShvBxPz4FYDgCrVYKZ88i4YjFrOQ9w8RuwZi3u cXF7vR6a7jNw8jnxf2VZr4fcQwSHRhKP5kC7FP62b286HI2m/OzXbw72ziedlQIh7R0K WT225taTnXjgxehgqcXJyfGdFuuZNOIGuS+DTsK84uBr0mG9XCfrxn5GcjFbIrxTEaWM QlDQ== X-Gm-Message-State: AOAM530MN0X5kgzSqU5qbc23UN402Av26tt5mCQ+Hk1ZQ43zeW3vJV53 QKdae2TB81IRKfG5ux2zDn2l1DtksaCa0g== X-Google-Smtp-Source: ABdhPJyOX0bUjAHXtWeBU6MJBafNHB9C5QirYKN7XZvB/grf7u3RHMQX8q0yh01Hvm/nFv9In+rbWg== X-Received: by 2002:ac8:6682:: with SMTP id d2mr14274930qtp.342.1596812663298; Fri, 07 Aug 2020 08:04:23 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id d20sm6681550qkl.36.2020.08.07.08.04.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2020 08:04:22 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Marek Vasut , Simon Glass , Jagan Teki , Bin Meng , Sean Anderson Subject: [PATCH v2 3/7] wdt: dw: Fix clock rate being off by 1000 Date: Fri, 7 Aug 2020 11:03:50 -0400 Message-Id: <20200807150355.287181-3-seanga2@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200807150355.287181-1-seanga2@gmail.com> References: <20200807150355.287181-1-seanga2@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.3 at phobos.denx.de X-Virus-Status: Clean The clock subsystem returns clock rates in Hz. We need to divide by 1000 so the rate is in kHz. Fixes: cf89ef8d10f240554541c20b2e1bdcdd58d1d7e6 Signed-off-by: Sean Anderson --- (no changes since v1) drivers/watchdog/designware_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index 49cf861d46..41866fa01b 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -129,7 +129,7 @@ static int designware_wdt_probe(struct udevice *dev) if (ret) return ret; - priv->clk_khz = clk_get_rate(&clk); + priv->clk_khz = clk_get_rate(&clk) / 1000; if (!priv->clk_khz) return -EINVAL; #else From patchwork Fri Aug 7 15:03:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1342310 X-Patchwork-Delegate: marek.vasut@gmail.com 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=nAZMxdic; 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 4BNTDc0gcPz9sPB for ; Sat, 8 Aug 2020 01:05:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 08C47821ED; Fri, 7 Aug 2020 17:04:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nAZMxdic"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3A0CA821D9; Fri, 7 Aug 2020 17:04:29 +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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) (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 DDBAE821D9 for ; Fri, 7 Aug 2020 17:04:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qt1-x844.google.com with SMTP id s16so1469911qtn.7 for ; Fri, 07 Aug 2020 08:04:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XnKc9iGq7TgQaGjKxGgHBeDaCdNMiPAx/WRHyrOMrRU=; b=nAZMxdicfp2Nud2kBkwnv/YpybSjy7lRxw8IkxC+6uJGCmJ/wyZvps8+uvCFFQlFbz vntNaRnVxRbfF5QnnQ9sVSSjiX5cQVDpPyg3z/311iwTwTL5sTi48cpmx5VJWOmEtcfV CAwYLF6Op2giRF1sElrO/pEkRDtNfLtqVYjJ2pkHO3I1jpuJq5bBikzVH8VImEj1p2QD jMWlJg2o98sR11BeRDq3HxadGM3yKiHSS2Hxa/G55Sd+2C35vw+0UTL1mADK70nRmcTc Ow8VF9KHBu9/bo9/RpurXUkeBQj86ZtV4exTngaqr+dirArd5Fytj/t5lklQmfkyEPa8 kkPw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=XnKc9iGq7TgQaGjKxGgHBeDaCdNMiPAx/WRHyrOMrRU=; b=T2NLPFkdm3YrA6zYjJLStiIrH/wBIWUdRYajqVcaEEqvjrZpaiDYpqz0aToKlrAM6S P+hqq6IF86GEjgiqf9+67JphcwPjxh/igTk2xzNM+trtF9N2XHBm3tU8K0Zl6WnOVc7y IPkbN16h6pV5T3mcvlHZAsgw4k8UD6kbDs9tdvqjqpleTTsRstAiOr2K1OIJ0Ge5doCB ezy1PBoRHzRnIfFu/ww8G1JKNh+pj7utn85zmdrjITyzz0llJ9y+G/V3arMgbqrFs0FA gQIT5EmnhioNzWTX5u5kornWFY/j38oM+esVFXbcB0lbpHU3QhQLOTLZFUlo/GQy4CZd IRJA== X-Gm-Message-State: AOAM532yM+txJtuWVHLx59LfGRPoQCkXdNMN6T+jbnq9yMdynADK8e0v JCwBt9NHihsQxoWLPHvapwqtR9L6X3FWLg== X-Google-Smtp-Source: ABdhPJwbxkEscjchai4n3/yHWR+Bb1yRd/ac1kgIFljanMlZEAWlKW08jNLvRcst3oXOE41f/H6ddQ== X-Received: by 2002:ac8:4643:: with SMTP id f3mr14691297qto.128.1596812664650; Fri, 07 Aug 2020 08:04:24 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id d20sm6681550qkl.36.2020.08.07.08.04.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2020 08:04:23 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Marek Vasut , Simon Glass , Jagan Teki , Bin Meng , Sean Anderson Subject: [PATCH v2 4/7] wdt: dw: Enable the clock before using it Date: Fri, 7 Aug 2020 11:03:51 -0400 Message-Id: <20200807150355.287181-4-seanga2@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200807150355.287181-1-seanga2@gmail.com> References: <20200807150355.287181-1-seanga2@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.3 at phobos.denx.de X-Virus-Status: Clean The watchdog won't work if the clock isn't enabled. Fixes: cf89ef8d10f240554541c20b2e1bdcdd58d1d7e6 Signed-off-by: Sean Anderson --- (no changes since v1) drivers/watchdog/designware_wdt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index 41866fa01b..e6f5437056 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -129,6 +129,10 @@ static int designware_wdt_probe(struct udevice *dev) if (ret) return ret; + ret = clk_enable(&clk); + if (ret) + return ret; + priv->clk_khz = clk_get_rate(&clk) / 1000; if (!priv->clk_khz) return -EINVAL; From patchwork Fri Aug 7 15:03:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1342312 X-Patchwork-Delegate: marek.vasut@gmail.com 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=o+9wPWfl; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BNTDr5mmnz9sTN for ; Sat, 8 Aug 2020 01:05:16 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 57B3882222; Fri, 7 Aug 2020 17:04:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="o+9wPWfl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C6EA9821EA; Fri, 7 Aug 2020 17:04:30 +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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) (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 16A0C821D0 for ; Fri, 7 Aug 2020 17:04:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qk1-x741.google.com with SMTP id m7so1946421qki.12 for ; Fri, 07 Aug 2020 08:04:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y4EFTetyxP9P79QqOsXytqYCG9cpFEOWEah6qYk4Rns=; b=o+9wPWflBhkK1BKKyFcJncHsI/DJwAt6U0Dq8MpDZ49vBUQhZb6zFiIDrkhjs2wGyz tke6hWC3VSyh8bXsE9dOZ0OCP1bkxmmFRqXhWmtoGm0ehrqlkiKQMVlY+O1cgdQJXVrb nxq6rGp7tLbnsZzA17orkWIePeHsuE9lF3t+Fjmh9sor5ubxCYAGKQNwD4SnynnQyH7a K8xw9hVBD+HUFGFb1qXD/T5dYFtM4NEbnKMhMRYMg/DrpaE1s3yfDromA+UC6da55aoJ 2fWXLAF5ziXIyOJxFSz2lgoMrlqF8M5Zhd1nIGq+xRC4dSNdTuTl43UCVa9CvFTtL1f/ oqbw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y4EFTetyxP9P79QqOsXytqYCG9cpFEOWEah6qYk4Rns=; b=j1K1/Rh1jqKHE6Ezdyxi2J1bdTGcmMEAhCIizUfpdY4Xfbe9JMRUdJd7IWmTINZN6m g8cEEazaAK0EU8gmUF6XpOjt1/5OZAJENYKz0ctBYOkrL0y9JHQK0ItqAwHFAqzYdYzC xaDXbZHg8bKl9KDGfnZZ4Syp0lxh3W5nQefU1hGgtqpYwQkz+vRkj/QwL2mrD7OGccBp xZUGZAl0ViGSV8/Y9zNo71OHJaxQ81ZJCw2IpTf/qfGQJfgLfLazBxjKBTc1K5uVjJHa 9jWKyTs1kBPuZoCy3xwB2IhQgCXw8CI3WuKCcFJWXzMf2Ss2k9gMVP3qjx7Ccb38Kn/o b7kA== X-Gm-Message-State: AOAM531JR7Npf8nDQ50ZDwLFEgEZOW9opFdnck3rcPqlW8beRMao0uBO ecu0NmHyR1sztotDjSI8HG3shNJRqr5MxQ== X-Google-Smtp-Source: ABdhPJzC/r6jh2incLkOdwlNFxcfRPe+w3O67OqLneN8lV5S7UxaPP2Fcnilc/i8HkjmelxsicVSlQ== X-Received: by 2002:a37:556:: with SMTP id 83mr14112642qkf.208.1596812665706; Fri, 07 Aug 2020 08:04:25 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id d20sm6681550qkl.36.2020.08.07.08.04.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2020 08:04:25 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Marek Vasut , Simon Glass , Jagan Teki , Bin Meng , Sean Anderson Subject: [PATCH v2 5/7] wdt: dw: Free the clock on error Date: Fri, 7 Aug 2020 11:03:52 -0400 Message-Id: <20200807150355.287181-5-seanga2@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200807150355.287181-1-seanga2@gmail.com> References: <20200807150355.287181-1-seanga2@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.3 at phobos.denx.de X-Virus-Status: Clean The clock subsystem requires that clk_free be called on clocks obtained via clk_get_*. Signed-off-by: Sean Anderson --- (no changes since v1) drivers/watchdog/designware_wdt.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index e6f5437056..189d555f29 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -131,11 +131,13 @@ static int designware_wdt_probe(struct udevice *dev) ret = clk_enable(&clk); if (ret) - return ret; + goto err; priv->clk_khz = clk_get_rate(&clk) / 1000; - if (!priv->clk_khz) - return -EINVAL; + if (!priv->clk_khz) { + ret = -EINVAL; + goto err; + } #else priv->clk_khz = CONFIG_DW_WDT_CLOCK_KHZ; #endif @@ -145,15 +147,20 @@ static int designware_wdt_probe(struct udevice *dev) ret = reset_get_bulk(dev, &resets); if (ret) - return ret; + goto err; ret = reset_deassert_bulk(&resets); if (ret) - return ret; + goto err; } /* reset to disable the watchdog */ return designware_wdt_stop(dev); + +err: + if (CONFIG_IS_ENABLED(CLK)) + clk_free(&clk); + return ret; } static const struct wdt_ops designware_wdt_ops = { From patchwork Fri Aug 7 15:03:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1342313 X-Patchwork-Delegate: uboot@andestech.com 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=B1ug7tAO; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BNTF55BqBz9sPB for ; Sat, 8 Aug 2020 01:05:29 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 020608222A; Fri, 7 Aug 2020 17:04:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="B1ug7tAO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 57D57821EA; Fri, 7 Aug 2020 17:04:31 +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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) (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 2AE30821ED for ; Fri, 7 Aug 2020 17:04:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qk1-x742.google.com with SMTP id b14so1980591qkn.4 for ; Fri, 07 Aug 2020 08:04:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7EW8RVN5xOzdJlOYdL58OQ0ORPVYOJn4NFPKkUEM8ew=; b=B1ug7tAOplzAu7aINnS9gUlLBJyBZwlb9oWQnuh2hlc0lE71oShDdzZH/is646kCfp y4cjLMSKoGD+YEFdulCJkfo6h4/Jk5Is//bP5y0pGXITA3GUGnj4xYCzKrsltCKocQ4i NUY+OizVttgyEk+ChPkUY2027t5ULUhoaQlCTAGmEkVSxcTTFv3zdyMyHfUK+YqBRmvY K6oQxoomciYitif/a48tk+56XE95ZQd+Icm7XeeoS6wRAwYb9KIj5hDUoVLUS0jtAmq7 jvxoUwUbAytc7eLHfT1HTfS/rN8QKQp7B0eIR0QJBlIcFP6y0X5WEHwu2Sl4Xo+ff4Hi 6+qQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=7EW8RVN5xOzdJlOYdL58OQ0ORPVYOJn4NFPKkUEM8ew=; b=BbNxEXnOLJT6TnQlQdQQwaTo7QSf1MT8SOXEtTYRZxIySVhPN+pApM0l5JRm0zkcrY /DktEztUQV4KWOC6Td2XbHtztr5geSJidRG5WVoI4wqQel63E3p0TpGAGjEGrSA8HyyP ck3yIuMOI8I9jJmSqHAXLC110C89LyQr46J8/1z+AVgP77d7zAqqiaHaqwfIEAg/rJgp EbWA8qwNKdxbE4pav5yHHdY3xzNWt+B5PeD1gyZLLzCqMTSJuPUZ1CQSI1zE0WYe6bql lr3JvjIafadTxJeQV0nv7HsGhAymQUaRAPejdKXsV4FvmDROrXEJh8K1+dVWLMRxAb59 edfg== X-Gm-Message-State: AOAM532CStJiZDSaZisFCJLXFfsbzkYphNYl1j6uM34UqGEqKNVWi9XH ZdFam8Z/CyFiSc9+O7tvMbYpDZ48zgkO9Q== X-Google-Smtp-Source: ABdhPJw+xyx+xBiUTMMYFUjyJ4I/3B18z7p04SISazSiBw66/8N0Wi34ZFGRHE98NiUbQ6yEHZKcLg== X-Received: by 2002:ae9:ebd0:: with SMTP id b199mr13433681qkg.294.1596812666936; Fri, 07 Aug 2020 08:04:26 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id d20sm6681550qkl.36.2020.08.07.08.04.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2020 08:04:26 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Marek Vasut , Simon Glass , Jagan Teki , Bin Meng , Sean Anderson Subject: [PATCH v2 6/7] riscv: Add watchdog bindings for the k210 Date: Fri, 7 Aug 2020 11:03:53 -0400 Message-Id: <20200807150355.287181-6-seanga2@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200807150355.287181-1-seanga2@gmail.com> References: <20200807150355.287181-1-seanga2@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.3 at phobos.denx.de X-Virus-Status: Clean This adds the necessary bindings. Most of them are already there. Signed-off-by: Sean Anderson Acked-by: Rick Chen --- Changes in v2: - Move watchdog enable to k210.dtsi as it does not depend on anything board-specific. arch/riscv/dts/k210.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/riscv/dts/k210.dtsi b/arch/riscv/dts/k210.dtsi index 2546c7d4e0..f70318cb12 100644 --- a/arch/riscv/dts/k210.dtsi +++ b/arch/riscv/dts/k210.dtsi @@ -425,7 +425,6 @@ interrupts = <21>; clocks = <&sysclk K210_CLK_WDT0>; resets = <&sysrst K210_RST_WDT0>; - status = "disabled"; }; wdt1: watchdog@50410000 { From patchwork Fri Aug 7 15:03:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1342314 X-Patchwork-Delegate: uboot@andestech.com 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=k6ewBbV+; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BNTFK1PXzz9sPB for ; Sat, 8 Aug 2020 01:05:41 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F0E8782239; Fri, 7 Aug 2020 17:04:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="k6ewBbV+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3319E82209; Fri, 7 Aug 2020 17:04:33 +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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) (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 3F543821D3 for ; Fri, 7 Aug 2020 17:04:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qk1-x744.google.com with SMTP id l6so1977659qkc.6 for ; Fri, 07 Aug 2020 08:04:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W4x1/SNbRmamgV+WnnnURCbrLM4Fu8my5JH+oIsoBLM=; b=k6ewBbV+jfeAb2fYOuLFwf57UQR4S1Rwb/igK/JZ2OGMaGc0aYftBM12Sql8eluD7i OY/AqqvV0C0RdtbGTmD111JsOIWUtyyVYBji8NWSNeWkEB3LmTdzJAI0yPlfKcvqXJlJ uD99lj6fiLvfV5DZhI5wkpgXovayImKrjLi5+lSo4fotWD3/HigaYFhWLGCnZUNqFAoJ kMmMLOFD8t+6Ldpz6Qv/xAGWwtj3iLIMLHx1ameU2as2AhGIvA1pgSCYdxABxPCsKgi2 mYku+K1tX4TKceKx+zGxWfN+XeaDFCS8pNRkQSZyqSCPATjKxK1aetkZ8kVitUPoDyv9 A+4g== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=W4x1/SNbRmamgV+WnnnURCbrLM4Fu8my5JH+oIsoBLM=; b=iLjsn5h5G81MPZ8N4YGwmajf9X7WVjk8MXQjVlIQbHZvYOifHnv5BeFcfB9++olcMc N1SkeQPHqUOqn2xzh1DHr6uYOsSnnJ5QJh82iaVGWHDPXAUZZyBNRM0kf9lqB9Fpa5FJ T5r0iRuB23T+5nDzTKHzBFdINtge+HDBCE+MvQJdTuahCZa6ZnBd8HAcFDJDgRfrD+ub 4oOttkdPIBlv5Cgckf9fhMEZG1GhdHXlFsSpuunH2NyEdSdHk1ANXnneOiEf6FyzdXHd vc21otTtgea02hYia3CGxIIoDNsLbEyjAapyXpLBzV1u5bWcClW5DvHUqNgafjSQB3IQ 9YVA== X-Gm-Message-State: AOAM533aTLR5JCbKIeWHWgG+I/bykLp7R6U93bqlqKb8SWlRhD7AH3Qw pjuas1weNwZT4A66wiDeTe99sAFgKoRl7g== X-Google-Smtp-Source: ABdhPJxIIUl10EFLQzQ9hMxbn6KXGzcdKaO/ij0L5xzxc0Lct6q7fYDXjPjjSTOyDkj0dSs2J/AoKw== X-Received: by 2002:a37:bd46:: with SMTP id n67mr14522867qkf.190.1596812667916; Fri, 07 Aug 2020 08:04:27 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id d20sm6681550qkl.36.2020.08.07.08.04.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2020 08:04:27 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Marek Vasut , Simon Glass , Jagan Teki , Bin Meng , Sean Anderson Subject: [PATCH v2 7/7] riscv: Enable watchdog for the k210 Date: Fri, 7 Aug 2020 11:03:54 -0400 Message-Id: <20200807150355.287181-7-seanga2@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200807150355.287181-1-seanga2@gmail.com> References: <20200807150355.287181-1-seanga2@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.3 at phobos.denx.de X-Virus-Status: Clean This enables the necessary config options. Signed-off-by: Sean Anderson --- (no changes since v1) board/sipeed/maix/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/sipeed/maix/Kconfig b/board/sipeed/maix/Kconfig index 0cdcd32adc..b9dac5a64e 100644 --- a/board/sipeed/maix/Kconfig +++ b/board/sipeed/maix/Kconfig @@ -44,4 +44,6 @@ config BOARD_SPECIFIC_OPTIONS imply RESET_SYSCON imply SYSRESET imply SYSRESET_SYSCON + imply WDT + imply DESIGNWARE_WATCHDOG endif