From patchwork Sun Jul 23 14:06:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Skladowski X-Patchwork-Id: 705624 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C16A8C04FE2 for ; Sun, 23 Jul 2023 14:07:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229669AbjGWOHi (ORCPT ); Sun, 23 Jul 2023 10:07:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229572AbjGWOHh (ORCPT ); Sun, 23 Jul 2023 10:07:37 -0400 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5748C12B; Sun, 23 Jul 2023 07:07:36 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2b702319893so49832651fa.3; Sun, 23 Jul 2023 07:07:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690121254; x=1690726054; 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=2e37AKpgfP+e3Di/jLJSpwPHf9AXaevgDCuq32UDQMM=; b=FcY390jOKSaNXZwkPSv+wO1hS+/Tp7MxfdUOeciW1O3PaLj7RfzR8HbrijWzUb5r8m FiPj8WkL59dDDDAPii0Zn6ifbR0kZox7/GF4e42M+VaUPumxOtxRYXqzcYQg0GPofVba AbA+KWxQiolUOOdRPSe1DYqHCvTTdvNoq1pNa4lRvUq9ECy7jQDRJF29w/094QsTImFT nOZlTJH2An9kXFA7s7omCodoF9lWNFNpMiaspZ5RINq/6DJiWWHyfJyW2nBd591LXbB2 w3eMOUVx1ZzLIj5aTNDlj7AtcWQ2LLVu1Mcm4KRRFCV8CaJYxbHTmBueD2iWRgloVjyW gp8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690121254; x=1690726054; 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=2e37AKpgfP+e3Di/jLJSpwPHf9AXaevgDCuq32UDQMM=; b=UcihShg5lY7x+1T53OFpwVKr5IFp1vTj2i4F6+IBULATZx6NImAC6QBEvtnApzZGGS mDaZ1rBIleemrM3bE5isD3vy9a8khrjPvxIyTxHDIxcUNQMnKbe9hJrfaASzzTcfPyLc kruEqzveAFJttUkzpjzuNjkFdxkIDcJHbnydBh/JD7bz07dW9dcixsdEkrDNJvttLOkU pva8D1oVDtet+sYAg/tIk5ynd9bSyL5j2xZBCwveVFHeO3KirrD2CoMfdAPVVHiX6jGl 4prGe0+RrVk2ZroihQWcojANOGz0CeQqb04XN6a27onUwj17QCRhxA2m/eKfesrPSiNG 1Z/w== X-Gm-Message-State: ABy/qLar74mn+I52UoeW0FSMQXhSTqCfG3ZO4s6RqpZVZjyX2eYPeEyY vSbPUos/cswiL1+GMYlWyQzP+Mqyq/sZ4A== X-Google-Smtp-Source: APBJJlHerg5IKyx/Lu59KC3K59oQGSyuPInnsgujv5/4msaMJQYOc8LKvHnbMrhnXNXu+1t5nI1Pew== X-Received: by 2002:a05:6512:3b8a:b0:4fd:cdc6:3519 with SMTP id g10-20020a0565123b8a00b004fdcdc63519mr4108459lfv.44.1690121254508; Sun, 23 Jul 2023 07:07:34 -0700 (PDT) Received: from localhost.localdomain (ccx116.neoplus.adsl.tpnet.pl. [83.30.147.116]) by smtp.gmail.com with ESMTPSA id o2-20020a05651238a200b004fbcd542888sm1688366lft.60.2023.07.23.07.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jul 2023 07:07:34 -0700 (PDT) From: Adam Skladowski Cc: phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Adam Skladowski , Bjorn Andersson , Andy Gross , Konrad Dybcio , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , AngeloGioacchino Del Regno , Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/7] clk: qcom: clk-hfpll: Configure l_val in init when required Date: Sun, 23 Jul 2023 16:06:49 +0200 Message-Id: <20230723140712.9438-3-a39.skl@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230723140712.9438-1-a39.skl@gmail.com> References: <20230723140712.9438-1-a39.skl@gmail.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add support for pre-configuring default frequency multiplier, this appears to be required on some platforms like MSM8976. Without configuring L_VAL device reboots when trying to bring PLL up. Signed-off-by: Adam Skladowski --- drivers/clk/qcom/clk-hfpll.c | 4 ++++ drivers/clk/qcom/clk-hfpll.h | 1 + 2 files changed, 5 insertions(+) diff --git a/drivers/clk/qcom/clk-hfpll.c b/drivers/clk/qcom/clk-hfpll.c index 86f728dc69e5..a93b1493c882 100644 --- a/drivers/clk/qcom/clk-hfpll.c +++ b/drivers/clk/qcom/clk-hfpll.c @@ -44,6 +44,10 @@ static void __clk_hfpll_init_once(struct clk_hw *hw) regmap_write(regmap, hd->user_reg, regval); } + /* Write L_VAL from conf if it exist */ + if (hd->l_val) + regmap_write(regmap, hd->l_reg, hd->l_val); + if (hd->droop_reg) regmap_write(regmap, hd->droop_reg, hd->droop_val); diff --git a/drivers/clk/qcom/clk-hfpll.h b/drivers/clk/qcom/clk-hfpll.h index 2a57b2fb2f2f..27b9effcb3fd 100644 --- a/drivers/clk/qcom/clk-hfpll.h +++ b/drivers/clk/qcom/clk-hfpll.h @@ -18,6 +18,7 @@ struct hfpll_data { u32 status_reg; u8 lock_bit; + u32 l_val; u32 droop_val; u32 config_val; u32 user_val; From patchwork Sun Jul 23 14:06:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Skladowski X-Patchwork-Id: 705623 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EEA0FC04FE0 for ; Sun, 23 Jul 2023 14:07:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229904AbjGWOHw (ORCPT ); Sun, 23 Jul 2023 10:07:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229804AbjGWOHs (ORCPT ); Sun, 23 Jul 2023 10:07:48 -0400 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D68D91B8; Sun, 23 Jul 2023 07:07:41 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-4fddd4e942eso4753759e87.3; Sun, 23 Jul 2023 07:07:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690121260; x=1690726060; 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=GnagQxwlD2BGmfp1Y+SwDf/PshNGhc6oxsdbzF1ORog=; b=nZuo0QmUECVkywcqjxDoSIprotwScO72FvSS7egFpQApX5HL4xU7FQMxGQoFW6C2ZJ H4+ErzP1Xq7+f00pZPHmSuAuJoHExElFgOAJI6uJ+Zo9LfRtkFOWzlFZkL3AX5EivqWb Jq8IgfnZ20x1iHCZA7ZGf6pdKGKECCpNvM9jM94jTlwGzoH8R2tEobFpcavnUZoph5DB yXGp62Z2D5DqoZidcxTal2sHgfnF1tNTPu3ALUnttBUpgDa60K1Q5FUaVhgHfrxK7FV7 cXoQghU2TLk3M45TQ/K/H3q6+eV01Q8aW4/3Uok2BPdcd8Fvbu7juinHolw2TftJL3Qf 2Iug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690121260; x=1690726060; 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=GnagQxwlD2BGmfp1Y+SwDf/PshNGhc6oxsdbzF1ORog=; b=WPKwa3MczK+lfAgxUKmV64JUXIcTaStYoPBg9xWQl/czx2uuw7Abtqokg91v5BKGWZ CnuHqj/T149ob3T4sOB1sQRrq6JDQt1hhyA2uvmZje3iJwAnWEtHzUTo1I44jEE9fVeP vMtbIWnXE7gz8ucSncuvPotLM3HIvRZZ3BAXgr9RwnFVoYsfZgudbBEHGaT+019dL54m x7mBadQkHSQe8MnSX4RIJLgfea7o9215y0ZhXPPSGRhHKUqSFEW48r+lqj11iB9Uiyei VrKE8nPYKtHOMToFlCEhH1mJ2ueg344f4CjFvMECVNcoa8G+TNnpSvFfmiDXwE/Xtwym nZpA== X-Gm-Message-State: ABy/qLZLSAEXHRV/PLNMcmDUYCLLi0U4+9J+eAkvq69YNaA1UUkd3P5T f9Ke4/LkfvAvxLVqEIy+r8eOjqhSqXKhxA== X-Google-Smtp-Source: APBJJlFj+EYJEQ21PIOegYg0bGgHBZXNghyGxBKofLLed9bm3ysz2uLJPzAcS6QqDFCpXwgBx3QO4A== X-Received: by 2002:a05:6512:3410:b0:4f8:4245:ed57 with SMTP id i16-20020a056512341000b004f84245ed57mr4399826lfr.35.1690121259947; Sun, 23 Jul 2023 07:07:39 -0700 (PDT) Received: from localhost.localdomain (ccx116.neoplus.adsl.tpnet.pl. [83.30.147.116]) by smtp.gmail.com with ESMTPSA id o2-20020a05651238a200b004fbcd542888sm1688366lft.60.2023.07.23.07.07.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jul 2023 07:07:39 -0700 (PDT) From: Adam Skladowski Cc: phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Adam Skladowski , Bjorn Andersson , Andy Gross , Konrad Dybcio , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , AngeloGioacchino Del Regno , Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/7] clk: qcom: hfpll: Add MSM8976 PLL data Date: Sun, 23 Jul 2023 16:06:52 +0200 Message-Id: <20230723140712.9438-6-a39.skl@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230723140712.9438-1-a39.skl@gmail.com> References: <20230723140712.9438-1-a39.skl@gmail.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add PLL configuration for MSM8976 SoC, this SoC offers 3 HFPLL. Small cluster offers two presets for 652-902Mhz range and 902Mhz-1.47Ghz. For simplicity only add second range as smaller frequencies can be obtained via apcs divider or safe parent this also saves us a hassle of reconfiguring VCO bit and config_val. A72 and CCI cluster only use single frequency range with their outputs/post_dividers/vco_bits being static. Signed-off-by: Adam Skladowski --- drivers/clk/qcom/hfpll.c | 54 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/drivers/clk/qcom/hfpll.c b/drivers/clk/qcom/hfpll.c index ec18bc8f0089..a9c4c77e0f50 100644 --- a/drivers/clk/qcom/hfpll.c +++ b/drivers/clk/qcom/hfpll.c @@ -32,8 +32,62 @@ static const struct hfpll_data hdata = { .max_rate = 2900000000UL, }; +static const struct hfpll_data msm8976_a53 = { + .mode_reg = 0x00, + .l_reg = 0x04, + .m_reg = 0x08, + .n_reg = 0x0c, + .user_reg = 0x10, + .config_reg = 0x14, + .config_val = 0x341600, + .status_reg = 0x1c, + .lock_bit = 16, + + .l_val = 0x35, + .user_val = 0x109, + .min_rate = 902400000UL, + .max_rate = 1478400000UL, +}; + +static const struct hfpll_data msm8976_a72 = { + .mode_reg = 0x00, + .l_reg = 0x04, + .m_reg = 0x08, + .n_reg = 0x0c, + .user_reg = 0x10, + .config_reg = 0x14, + .config_val = 0x4e0405d, + .status_reg = 0x1c, + .lock_bit = 16, + + .l_val = 0x3e, + .user_val = 0x100109, + .min_rate = 940800000UL, + .max_rate = 1843200000UL, +}; + +static const struct hfpll_data msm8976_cci = { + .mode_reg = 0x00, + .l_reg = 0x04, + .m_reg = 0x08, + .n_reg = 0x0c, + .user_reg = 0x10, + .config_reg = 0x14, + .config_val = 0x141400, + .status_reg = 0x1c, + .lock_bit = 16, + + .l_val = 0x20, + .user_val = 0x100109, + .min_rate = 556800000UL, + .max_rate = 902400000UL, +}; + static const struct of_device_id qcom_hfpll_match_table[] = { { .compatible = "qcom,hfpll", &hdata }, + { .compatible = "qcom,hfpll-msm8976-a53", &msm8976_a53 }, + { .compatible = "qcom,hfpll-msm8976-a72", &msm8976_a72 }, + { .compatible = "qcom,hfpll-msm8976-cci", &msm8976_cci }, { } }; MODULE_DEVICE_TABLE(of, qcom_hfpll_match_table); From patchwork Sun Jul 23 14:06:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Skladowski X-Patchwork-Id: 705622 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13CE0C07E8B for ; Sun, 23 Jul 2023 14:07:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229925AbjGWOHx (ORCPT ); Sun, 23 Jul 2023 10:07:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229877AbjGWOHu (ORCPT ); Sun, 23 Jul 2023 10:07:50 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2491C1709; Sun, 23 Jul 2023 07:07:44 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-4fb863edcb6so5160318e87.0; Sun, 23 Jul 2023 07:07:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690121262; x=1690726062; 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=ZnquK1Bf+NrtIkuj5n5WuqzSN63Lf7C6vpkZFjzFEOU=; b=qjJQFC/pyIzq5bIHb2/d1EwWRDADxVHwsIYltrDhEDjdIyYiSo6jp8z0KqroqYON3F +iJq+JNhOv4SsBqXGKmIDOuFqmR/jHOY896lHtjmewuG2iScImOi+Qudmz/aPmtiIvKY Q1mAtUVquvtaY2jW4t9x2jKlwn63GW8mKSX+Y/2K7gqQDl32czJ4If0HQttiGh+vptod kDz+O0HEDckL4Dt31oMpO3mpD9j2LwCvcSNxIpBYgl40IR3glQoysydHVP93uuPLmoUO wxxeAnk+/5n344l2/I0R7CrRMY+kV/jhziVc2O0RT7kEq6sHokBmVKqJtd+j3XwNTojO 8vnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690121262; x=1690726062; 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=ZnquK1Bf+NrtIkuj5n5WuqzSN63Lf7C6vpkZFjzFEOU=; b=L59nxJJcaI3w7IRb+ey1eXa5hNAXoIqUjAOvjXLw+VfGF3XXWUgUGKmHrKqz2im+Qj h/0I14HUmujJ2VSFM5OoVD6/XrtOkChCXUFq+0ufCBQlzS0Pt8qXVGiCVsjqIdjwsdGB YmYKef9T/L3BlYEQnQTNSjUEd2TfEEutZ/lYAAJ5TiK0izlZKSF1vraz8LTdj04bYf+I V7+48JQtsbFt98ndjR35equgDs1tf3djgtdROJ8MOiecVqfdTYMbCu0A9iXh9F3hkQ1z t/r3R4P3FpW26tm05su7i7CpJPOYhy5FcijuXdjYWvE9Ldh4Q65/J8Dzno5dgGTByicx 8edw== X-Gm-Message-State: ABy/qLZLbFXow9+HM5+JFaNWbvQTQE34efoXW761pmetoQWkz0OCT0/y qqgrurKQrwg4ek0GiCDmlGSGaBpUnEYrvA== X-Google-Smtp-Source: APBJJlGdrL+NcR7PEBtWtKnxNv23eTE7INMr6IX5Sn2CahykbJMH6xT9aE11pXbRN/YLaBOfBDM4Lw== X-Received: by 2002:a19:7508:0:b0:4ed:cc6d:61fe with SMTP id y8-20020a197508000000b004edcc6d61femr3856837lfe.24.1690121261699; Sun, 23 Jul 2023 07:07:41 -0700 (PDT) Received: from localhost.localdomain (ccx116.neoplus.adsl.tpnet.pl. [83.30.147.116]) by smtp.gmail.com with ESMTPSA id o2-20020a05651238a200b004fbcd542888sm1688366lft.60.2023.07.23.07.07.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jul 2023 07:07:41 -0700 (PDT) From: Adam Skladowski Cc: phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Adam Skladowski , Bjorn Andersson , Andy Gross , Konrad Dybcio , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , AngeloGioacchino Del Regno , Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/7] arm64: dts: qcom: msm8976: Split lpass region Date: Sun, 23 Jul 2023 16:06:53 +0200 Message-Id: <20230723140712.9438-7-a39.skl@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230723140712.9438-1-a39.skl@gmail.com> References: <20230723140712.9438-1-a39.skl@gmail.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Some devices like Sony Loire uses Broadcom module over sdc3 however others utilize qcom WCNSS, split shared region based on downstream pil-tz loader. Signed-off-by: Adam Skladowski --- arch/arm64/boot/dts/qcom/msm8976.dtsi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/msm8976.dtsi b/arch/arm64/boot/dts/qcom/msm8976.dtsi index ab76806317a7..7385d5edec04 100644 --- a/arch/arm64/boot/dts/qcom/msm8976.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8976.dtsi @@ -338,7 +338,12 @@ mpss_mem: mpss@86c00000 { }; lpass_mem: lpass@8c200000 { - reg = <0x0 0x8c200000 0x0 0x1800000>; + reg = <0x0 0x8c200000 0x0 0x1000000>; + no-map; + }; + + wcnss_fw_mem: wcnss@8d200000 { + reg = <0x0 0x8d200000 0x0 0x800000>; no-map; };