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);