From patchwork Wed Oct 11 18:48:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 13417795 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 80EAFCDB47D for ; Wed, 11 Oct 2023 18:50:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=g0mGqM9lwNOi9hgxeqKOPTgS9zCE13vusxknIqc9sdU=; b=1/z507gS+XueOq v7GWxp3s9VBmohQMCO5K3g7/dKbIajAMATzgYhbF1oTT77dEgsOX6UJjiRvcq04QG/cIK5nbkFJpn gzMPqZVeu31UBDxzKm8TExGFyRC5S/Vaen57Wzl6mGOCMfavu4OpPd91oFaN13vHYxk3JWu9FjDb/ 4W6mrfPxnTsElP2fCAkLVaglRaerHkKBzmgrwjQXqsXgAO6rMUGj07Z7LPQGHIKVfCHIUBzKxdLDo GxYCs/h13NNmWCCKm06LjyVPnktNq+kMaJ74Ue2efyi1KjEvQDZBmV/cD6uZcmJHj7Kk5PbBJxvvt qYbyGnJVvzV5QUgkGKUA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qqeHB-00GTFE-1u; Wed, 11 Oct 2023 18:49:45 +0000 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qqeGs-00GSzG-0J for linux-arm-kernel@lists.infradead.org; Wed, 11 Oct 2023 18:49:28 +0000 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-405524e6769so610595e9.1 for ; Wed, 11 Oct 2023 11:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697050164; x=1697654964; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yofb7s9KpXjYrtBhecTDWpMWHMMT9y1sYOj5t1WJR70=; b=bT3fcULXpKUh+N/LHiUx+1gfDYbKo3HBAdAqyC9tvmmtq+AC8Oh/aZMupONIJDTwSC bHMrR6UrTQuPUe0rS2zoeVLdGhnmKIwNxRpGPjUVDgaBKMm2CCcif0Z8K5NOz5c2yGEr R9EezHOJEjreBdBcX2JCeQrGjMtyV9ExkOqmU0UjXj9GHdZgr5yB/P0dr7IDjz0b4MCu AhIwIqWZZ+b2swjrgQYMJBMeGyuttEs+Q1v2fJ/SsNP88WOj0BXGb23MfWzouiudUMma 7zFH8wtPecCyNhF+ueBB5GZqy5QROVu5xvLFex71CX1y8kD1XY/HX6SVIR7+TRlks0/I Lq3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697050164; x=1697654964; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yofb7s9KpXjYrtBhecTDWpMWHMMT9y1sYOj5t1WJR70=; b=IoDj6AMVYwUCFtzCHx1AFnfOasgwG/HiYjFCcSaS8kW7iUR0nvyESMCMvqer9NunnW 8YwSlNTVoH3WRkVoADR5djm9JXIlYzWHR++LGXv2TyCVJ/Y1/Z5PyPyNTjBTv0IKGOUa MnErGF2X7tpe2jry+m8fG1uOodrqOlIlez+C4kHC6c2GvwkZmI3lrZDD0o5v80YBblZG 9GSVMeXQtD4cyYp4sjHlU2vZkEglWWrtq1E+r3FDU6TcXmOykhiKAlMfiMqx/vV4KkKY bM81zM4MksX3qOQvOCguWPZiODsba4Dtm0ZasNBQ0SoFuErUKj+UaLMKEA4VNdOJfs9L PpTA== X-Gm-Message-State: AOJu0YzQenkB8ByfjHZDnJFV8s+bWyexf2MH3dUYsHpCjVYrpzO0uV7s G/faV2GHwkQP7znUyP8pLrD6xQ== X-Google-Smtp-Source: AGHT+IGRf9EJmduCoWrPdacsOlAVwtKIk7xvt+R0abAHC3IS9G9FktwJ/XEdwmLlUD4wNHZenVMAsA== X-Received: by 2002:a05:600c:3657:b0:406:44fc:65c9 with SMTP id y23-20020a05600c365700b0040644fc65c9mr17722504wmq.8.1697050164013; Wed, 11 Oct 2023 11:49:24 -0700 (PDT) Received: from gpeter-l.lan (host-92-12-225-146.as13285.net. [92.12.225.146]) by smtp.gmail.com with ESMTPSA id v6-20020adff686000000b0031980294e9fsm16003875wrp.116.2023.10.11.11.49.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 11:49:23 -0700 (PDT) From: Peter Griffin To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, mturquette@baylibre.com, conor+dt@kernel.org, sboyd@kernel.org, tomasz.figa@gmail.com, s.nawrocki@samsung.com, linus.walleij@linaro.org, wim@linux-watchdog.org, linux@roeck-us.net, catalin.marinas@arm.com, will@kernel.org, arnd@arndb.de, olof@lixom.net, gregkh@linuxfoundation.org, cw00.choi@samsung.com Cc: peter.griffin@linaro.org, tudor.ambarus@linaro.org, andre.draszik@linaro.org, semen.protsenko@linaro.org, saravanak@google.com, willmcvicker@google.com, soc@kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-gpio@vger.kernel.org, linux-watchdog@vger.kernel.org, kernel-team@android.com, linux-serial@vger.kernel.org Subject: [PATCH v3 09/20] clk: samsung: clk-pll: Add support for pll_{0516,0517,518} Date: Wed, 11 Oct 2023 19:48:12 +0100 Message-ID: <20231011184823.443959-10-peter.griffin@linaro.org> X-Mailer: git-send-email 2.42.0.655.g421f12c284-goog In-Reply-To: <20231011184823.443959-1-peter.griffin@linaro.org> References: <20231011184823.443959-1-peter.griffin@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231011_114926_172703_8CB78E73 X-CRM114-Status: GOOD ( 15.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org These plls are found in the Tensor gs101 SoC found in the Pixel 6. pll0516x: Integer PLL with high frequency pll0517x: Integer PLL with middle frequency pll0518x: Integer PLL with low frequency PLL0516x FOUT = (MDIV * 2 * FIN)/PDIV * 2^SDIV) PLL0517x and PLL0518x FOUT = (MDIV * FIN)/PDIV*2^SDIV) The PLLs are similar enough to pll_0822x that the same code can handle both. The main difference is the change in the fout formula for the high frequency 0516 pll. Locktime for 516,517 & 518 is 150 the same as the pll_0822x lock factor. MDIV, SDIV PDIV masks and bit shifts are also the same as 0822x. When defining the PLL the "con" parameter should be set to CON3 register, like this PLL(pll_0517x, CLK_FOUT_SHARED0_PLL, "fout_shared0_pll", "oscclk", PLL_LOCKTIME_PLL_SHARED0, PLL_CON3_PLL_SHARED0, NULL), Signed-off-by: Peter Griffin Tested-by: Will McVicker Reviewed-by: Sam Protsenko Acked-by: Chanwoo Choi --- drivers/clk/samsung/clk-pll.c | 9 ++++++++- drivers/clk/samsung/clk-pll.h | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/clk/samsung/clk-pll.c b/drivers/clk/samsung/clk-pll.c index 74934c6182ce..4ef9fea2a425 100644 --- a/drivers/clk/samsung/clk-pll.c +++ b/drivers/clk/samsung/clk-pll.c @@ -442,7 +442,11 @@ static unsigned long samsung_pll0822x_recalc_rate(struct clk_hw *hw, pdiv = (pll_con3 >> PLL0822X_PDIV_SHIFT) & PLL0822X_PDIV_MASK; sdiv = (pll_con3 >> PLL0822X_SDIV_SHIFT) & PLL0822X_SDIV_MASK; - fvco *= mdiv; + if (pll->type == pll_0516x) + fvco = fvco * 2 * mdiv; + else + fvco *= mdiv; + do_div(fvco, (pdiv << sdiv)); return (unsigned long)fvco; @@ -1316,6 +1320,9 @@ static void __init _samsung_clk_register_pll(struct samsung_clk_provider *ctx, case pll_1417x: case pll_0818x: case pll_0822x: + case pll_0516x: + case pll_0517x: + case pll_0518x: pll->enable_offs = PLL0822X_ENABLE_SHIFT; pll->lock_offs = PLL0822X_LOCK_STAT_SHIFT; if (!pll->rate_table) diff --git a/drivers/clk/samsung/clk-pll.h b/drivers/clk/samsung/clk-pll.h index 0725d485c6ee..ffd3d52c0dec 100644 --- a/drivers/clk/samsung/clk-pll.h +++ b/drivers/clk/samsung/clk-pll.h @@ -38,6 +38,9 @@ enum samsung_pll_type { pll_0822x, pll_0831x, pll_142xx, + pll_0516x, + pll_0517x, + pll_0518x, }; #define PLL_RATE(_fin, _m, _p, _s, _k, _ks) \