From patchwork Mon Oct 12 18:13:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1381071 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=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=eAvILhmj; 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C96LD4mTtz9sT6 for ; Tue, 13 Oct 2020 05:15:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3EEBD82524; Mon, 12 Oct 2020 20:15:15 +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="eAvILhmj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CE9268252B; Mon, 12 Oct 2020 20:15:12 +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-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 53308824B6 for ; Mon, 12 Oct 2020 20:15:10 +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 a23so18464872qkg.13 for ; Mon, 12 Oct 2020 11:15:10 -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=4a+Fp5+HKyrIN+zJLn/A8R6osnX9eZe3k6F/8jaW1YE=; b=eAvILhmjwuHoAdmCUMCRtVeZMcsC7m74uuuYPvqvvnw7yeh3dbVf09czzne05Xmh+s 1b47aML4HAr+CPBFroCDXU3BdrW9mrmItRIsJBGooBPJjw+IZtRlsWfrlEwkwwQ4WM4w WL9pjuLicqIJOIGBO0SY8AuMT84kST8mQCUVcfLA7xNlEGYK84t76e6+5JKpUE5Zzgda qzyLYznVXf0nuYR6Bm3qoCuXMn4Hmt8iLvc8xE5r5SIrTBBoMrHKUL7j7ArCQm0Pqj6a IsHYVQPanZgvdojYThcCgMG9w87nbwduwnu7qfOwKzDeviP0aX7YrxQmbaPUwdi9X4LM Ou/g== 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=4a+Fp5+HKyrIN+zJLn/A8R6osnX9eZe3k6F/8jaW1YE=; b=E5wdfBW1rUSkj1kIMZKh3+Jdu9SgXHvbtdnHF2dZVBtTFEER8xDdREKCfHJ7o11wT1 tVY4V0oqmrgHpv1FO2LHD588bCAZBZ2ozkuvlX5m/FTeY9NNJ8Pi4wrIBRlCzRCNh0tw YK7OyNZD7sbcHomwthHHpJNwmV+lYrdG22o9MSAI3FlMLO2R748Uggzv1Z3itTrD6oGt TLLyzByBMrjDpGMf5R95OjhKfar1G5VBogi2eqLQkJsIz6AJplL8U/QjgrB4NuC8SdfK Oep9j4z2bcfheQF1xgiyW6lFRKfueSmO6RYOR0kwq6WsH3YcvtBOYSBaKgYKUClFBUbN 19tA== X-Gm-Message-State: AOAM530jtOzFgJ0KHbaqC/gNK7SzQ4eupyE9ThzLawuck3ftzY8gg1e4 n8v+ndIxbejHXRzSJdxGnnb0TwmnTwzaTg== X-Google-Smtp-Source: ABdhPJwUjnr4n4+hpCrrHUXoHSEHS5TwJSsOR4uT+d8D9QFobuUzMpcYo5yjeRvq4aUerP/3ZF11SQ== X-Received: by 2002:a05:620a:15ac:: with SMTP id f12mr10934420qkk.19.1602526509083; Mon, 12 Oct 2020 11:15:09 -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 t3sm12968651qtq.24.2020.10.12.11.15.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 11:15:08 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Rick Chen , Bin Meng , Sean Anderson , Damien Le Moal , Lukasz Majewski Subject: [PATCH v2 02/16] clk: k210: Fix PLL enable always getting taken Date: Mon, 12 Oct 2020 14:13:31 -0400 Message-Id: <20201012181345.338661-3-seanga2@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012181345.338661-1-seanga2@gmail.com> References: <20201012181345.338661-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 conditional always evaluated as false, regardless of the value of reg. Fix it so that it properly tests the bits in the PLL register. Also test PLL_EN, now that we set it. Reported-by: Damien Le Moal Signed-off-by: Sean Anderson Reviewed-by: Rick Chen --- Changes in v2: - New drivers/clk/kendryte/pll.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/clk/kendryte/pll.c b/drivers/clk/kendryte/pll.c index f198920113..d46fd0ebbf 100644 --- a/drivers/clk/kendryte/pll.c +++ b/drivers/clk/kendryte/pll.c @@ -512,7 +512,8 @@ static int k210_pll_enable(struct clk *clk) struct k210_pll *pll = to_k210_pll(clk); u32 reg = readl(pll->reg); - if ((reg | K210_PLL_PWRD) && !(reg | K210_PLL_RESET)) + if ((reg & K210_PLL_PWRD) && (reg & K210_PLL_EN) && + !(reg & K210_PLL_RESET)) return 0; reg |= K210_PLL_PWRD;