From patchwork Sat Aug 12 11:24:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Skladowski X-Patchwork-Id: 13351818 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 1F1F0C41513 for ; Sat, 12 Aug 2023 11:27:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231307AbjHLL1G (ORCPT ); Sat, 12 Aug 2023 07:27:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237153AbjHLL1F (ORCPT ); Sat, 12 Aug 2023 07:27:05 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47260110; Sat, 12 Aug 2023 04:27:08 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-4fe0d5f719dso4595001e87.2; Sat, 12 Aug 2023 04:27:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691839626; x=1692444426; 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=e+h1oifnrpXqv9m5WYHz5k9vtsNuiSUipLXcMaDZpWw=; b=fQuxhl31bCPGN4jJYbNx7qNvVlgI9X+s8aV+Adtt5l1oRsyHUeeTQ2TBN4Rx56myVp qTd1c+k6WYXf3vQAOK6sromsNMKyKqOJltr+2vdRkvQSsO01gxoVRsrJRwQuL3neGVZq JSm9wJ63t+yhYg3xWk3a0qy+qo9z/KWzHRrx+43IR/n0gOgGwuu3EO3V8fy/qvlBXjVU dgA8UAD7q26+JpdjsCk97kPt4qnr3/ZqroKhwYop8z71mTZtZueyHjj+LjQes6kL/DfL +ARbqoZQpVA6nqUnTLZjEL5Nk5kM+lI4j51RFJYl5+FXESgSCeTcAbkRz4gNo5LQ+Hb2 0GXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691839626; x=1692444426; 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=e+h1oifnrpXqv9m5WYHz5k9vtsNuiSUipLXcMaDZpWw=; b=mCRIY/p+V87nMD0ygZZ+SeUANlibHW4P3YNQtzD8cTHOSww5q5L6sL6+XcxVQXnQtu 7fADXyzoe3kpLYchOE5zi4D+sS/IgzXkXB2QHoZuclZ5/jegQCduWQqIIsdxw1xqt6s6 A1jClj2BBOKdndUiG4R1Fv6RCH2I1qwbSv41qOGZWmXpfBl2RAH2mN7odITnySsluvn2 VVy6pBKBIixitAScmNl4mM5px7DTKT+UVHoKYoT7foZx+R+7ui0HSY2QfwneMYGugYJh GB+5zIKm1xhaMWjFAk+xSEUhCLyP7WwX/md6Rnhs/VLII8+9kFvfJdckdEuT9B+YcR/j czVg== X-Gm-Message-State: AOJu0YyylcsrWkD7Hh5A65cRTVKMq8OiQnTQ2EjNN/EPm1DajSi0cckZ Wq1V3jKdNzh+ScTC1F0CtDn2xTEZV9mcvQ== X-Google-Smtp-Source: AGHT+IEHbH2+QdFr+G+1njj4ev/NPxCkrOjv2quq8rE4nGIb/Z/gHR/4Rz5DfQgyjwCDyolHnB07Hg== X-Received: by 2002:a05:6512:12c3:b0:4fb:8bcd:acd4 with SMTP id p3-20020a05651212c300b004fb8bcdacd4mr3859532lfg.37.1691839626236; Sat, 12 Aug 2023 04:27:06 -0700 (PDT) Received: from localhost.localdomain (bzd150.neoplus.adsl.tpnet.pl. [83.30.49.150]) by smtp.gmail.com with ESMTPSA id w3-20020ac24423000000b004fe2f085d5csm1087289lfl.299.2023.08.12.04.27.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Aug 2023 04:27:05 -0700 (PDT) From: Adam Skladowski Cc: phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Adam Skladowski , Andy Gross , Bjorn Andersson , 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, Dmitry Baryshkov Subject: [PATCH v3 1/7] drivers: genpd: qcom: rpmpd: Fix MSM8976 power domains setup Date: Sat, 12 Aug 2023 13:24:44 +0200 Message-Id: <20230812112534.8610-2-a39.skl@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230812112534.8610-1-a39.skl@gmail.com> References: <20230812112534.8610-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 Downstream kernel parses resource names based on pm8950-rpm-regulator.dtsi in such file qcom,resource-name takes three values: smpa,ldoa and clk0. First appearance of RWSC/RWSM point to msm-4.4 kernel which is way newer than what this platform was shipped with (msm-3.10). For the max_state downstream code limit value to TURBO inside dts with only one turbo_high being placed in msm-thermal bindings. One of effects of requesting TURBO_HIGH vote is rebooting of device which happens during voting inside WCNSS/IRIS, this behavior was observed on LeEco S2 smartphone. Fix regulator setup and drop unused resources. Fixes: b1d522443b4b ("soc: qcom: rpmpd: Add rpm power domains for msm8976") Signed-off-by: Adam Skladowski Reviewed-by: Dmitry Baryshkov --- drivers/genpd/qcom/rpmpd.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/drivers/genpd/qcom/rpmpd.c b/drivers/genpd/qcom/rpmpd.c index 3135dd1dafe0..59caa4e7b99a 100644 --- a/drivers/genpd/qcom/rpmpd.c +++ b/drivers/genpd/qcom/rpmpd.c @@ -166,13 +166,6 @@ static struct rpmpd cx_rwcx0_vfl = { .key = KEY_FLOOR_LEVEL, }; -static struct rpmpd cx_rwsc2_vfl = { - .pd = { .name = "cx_vfl", }, - .res_type = RPMPD_RWSC, - .res_id = 2, - .key = KEY_FLOOR_LEVEL, -}; - static struct rpmpd cx_s1a_vfc = { .pd = { .name = "cx_vfc", }, .res_type = RPMPD_SMPA, @@ -329,6 +322,13 @@ static struct rpmpd mx_s6a_lvl_ao = { .key = KEY_LEVEL, }; +static struct rpmpd mx_s6a_vfl = { + .pd = { .name = "mx_vfl", }, + .res_type = RPMPD_SMPA, + .res_id = 6, + .key = KEY_FLOOR_LEVEL, +}; + static struct rpmpd mx_s7a_lvl_ao; static struct rpmpd mx_s7a_lvl = { .pd = { .name = "mx", }, @@ -361,13 +361,6 @@ static struct rpmpd mx_rwmx0_vfl = { .key = KEY_FLOOR_LEVEL, }; -static struct rpmpd mx_rwsm6_vfl = { - .pd = { .name = "mx_vfl", }, - .res_type = RPMPD_RWSM, - .res_id = 6, - .key = KEY_FLOOR_LEVEL, -}; - /* MD */ static struct rpmpd md_s1a_corner_ao; static struct rpmpd md_s1a_corner = { @@ -591,16 +584,16 @@ static const struct rpmpd_desc msm8953_desc = { static struct rpmpd *msm8976_rpmpds[] = { [MSM8976_VDDCX] = &cx_s2a_lvl, [MSM8976_VDDCX_AO] = &cx_s2a_lvl_ao, - [MSM8976_VDDCX_VFL] = &cx_rwsc2_vfl, + [MSM8976_VDDCX_VFL] = &cx_s2a_vfl, [MSM8976_VDDMX] = &mx_s6a_lvl, [MSM8976_VDDMX_AO] = &mx_s6a_lvl_ao, - [MSM8976_VDDMX_VFL] = &mx_rwsm6_vfl, + [MSM8976_VDDMX_VFL] = &mx_s6a_vfl, }; static const struct rpmpd_desc msm8976_desc = { .rpmpds = msm8976_rpmpds, .num_pds = ARRAY_SIZE(msm8976_rpmpds), - .max_state = RPM_SMD_LEVEL_TURBO_HIGH, + .max_state = RPM_SMD_LEVEL_TURBO, }; static struct rpmpd *msm8994_rpmpds[] = { From patchwork Sat Aug 12 11:24:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Skladowski X-Patchwork-Id: 13351819 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 60B54C001DB for ; Sat, 12 Aug 2023 11:27:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237197AbjHLL1J (ORCPT ); Sat, 12 Aug 2023 07:27:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237172AbjHLL1G (ORCPT ); Sat, 12 Aug 2023 07:27:06 -0400 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 195AD110; Sat, 12 Aug 2023 04:27:10 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2b9bee2d320so43213491fa.1; Sat, 12 Aug 2023 04:27:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691839628; x=1692444428; 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=2FPYeGSM+ikrW2+6eEObHASzzNVFf8bno9y81D0RwTc=; b=KWE7bU/NXJYaOUFC2oPlr0cuQS/4m1pXxsmXzlDfDhwDmaYeO8U/t3X4no+pNpKdeY VBVKiAeA2aFdMP8b7/sqtk+In/KBV3S2Xd6d5A6jAIVIg/cOYhX4I+tqb/PqvBZBCk+o y8BLjpyEXyajnejD37zODFlHFaKZpgIUoDxIqWOw3BYx7T4TuPbM2WDXcsgQp2m3tY9z RJ5VrjFcBqi0rkOJyv0LGeLa3Z0A0uef7LitjaPft+adO457NFq1Bnx1jFt10ugXxhL2 SY/UPGE5W7aDzThlLQO127ZeseJk5X8nUwMtpydKTNXP6bTtT0jfwrSSAOqfwE2s/YaP dNeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691839628; x=1692444428; 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=2FPYeGSM+ikrW2+6eEObHASzzNVFf8bno9y81D0RwTc=; b=UKZW2Q73K4ey0a96BrcNl2a6LZBq8bq9/TB8yucVdBbFCFXQOK7B64p9hlfIkpzZpF tyC7wARSfg8sj/pEJSFT486rbk40GsLz4+ybksVA2RF9hotEq5aKxYvcuJIXkXwwHtHT Jpy91mu6tFIvHhCWwdDkzHsOOOw6GEBobqoYL3p8El4Kr1KhSpyqyhXADs55vbBgehPh rmLBfy9t9fG6CxQlsLcfe5Qrcnjvoijx3elkFiYCm0ltqRFiFwkOHjidgDCUWbsfrgLn Y1+GoUPp5Ri1h3gMdyEwnll2fzQFitOUerYVPKpRLo/nVt2Y0uC1/f+gL7c+39jf1FBt BVpg== X-Gm-Message-State: AOJu0Yx3h/PVJ87Y1XCqt5TiDR6whkkohs1jTK0/5MAwAEyfmiJoOLEa q0XAIhfZZvQIJHjKn8mcWt1WNveteyKvSQ== X-Google-Smtp-Source: AGHT+IHolk6Tl6KgfTt+xx3RzGEEs3IaARjsaeVRkCXRdcBUFuKR/MN3rWN9Jx8cIQEVXjUEWNbKjw== X-Received: by 2002:ac2:46ef:0:b0:4f8:680a:68f8 with SMTP id q15-20020ac246ef000000b004f8680a68f8mr2783052lfo.41.1691839628163; Sat, 12 Aug 2023 04:27:08 -0700 (PDT) Received: from localhost.localdomain (bzd150.neoplus.adsl.tpnet.pl. [83.30.49.150]) by smtp.gmail.com with ESMTPSA id w3-20020ac24423000000b004fe2f085d5csm1087289lfl.299.2023.08.12.04.27.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Aug 2023 04:27:07 -0700 (PDT) From: Adam Skladowski Cc: phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Adam Skladowski , Andy Gross , Bjorn Andersson , 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 v3 2/7] clk: qcom: clk-hfpll: Configure l_val in init when required Date: Sat, 12 Aug 2023 13:24:45 +0200 Message-Id: <20230812112534.8610-3-a39.skl@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230812112534.8610-1-a39.skl@gmail.com> References: <20230812112534.8610-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 Reviewed-by: Konrad Dybcio --- 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..705352aff067 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 Sat Aug 12 11:24:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Skladowski X-Patchwork-Id: 13351820 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 01E5DC41513 for ; Sat, 12 Aug 2023 11:27:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237206AbjHLL1K (ORCPT ); Sat, 12 Aug 2023 07:27:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237195AbjHLL1I (ORCPT ); Sat, 12 Aug 2023 07:27:08 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E126E10E4; Sat, 12 Aug 2023 04:27:11 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-4fe1b00fce2so4214968e87.3; Sat, 12 Aug 2023 04:27:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691839630; x=1692444430; 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=qSflrOPWbQDLwB1emYA5yoJ0n0sp2w9jvzs5T1YlFPQ=; b=ibpP2nY80Mj8Fs5HldBjw2e4+YbIgy4wq4kIOkM+Z7B82b/WW4vQLUQsZMLUvR5AyB GY9CfK2hK4QeMK4I5A8W2WVCBLSgc5YlHSJhYwiYGNZyVUA4MJvNViKjIjc8K7iws/Wl JB2NhM0x3hRTLmCs/N92Z0gQ8T9IBlGyvF51ZeoL33RfUAIlyi1QIztbEFVsrWDEA6lP knnIxdwS2+JV+pCFdm26onOVlaYdnY5oPb2WztzKvzgzca5xqHZ/vZvlIzbufsxKUEG0 moJV4l1tvUNOQ2XbdHr1kTQQr/CTU2646mIoSttux9Ebp4PLWK2Qo9LYbgipOqMqp/9V uOvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691839630; x=1692444430; 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=qSflrOPWbQDLwB1emYA5yoJ0n0sp2w9jvzs5T1YlFPQ=; b=ibH77IfIDlclyA4w+nQfkxWPzSj33Gnk+Irw8UoC7u/brbJliW9kqMRU5ApXYO1EyZ RHUzupe10BH80QVB/FSSxyH/mgHb0mvbtxGUnO8wY88ixx0azasPZjDY4awKSCsxGVYU eN/hm0D+7EucYOyk9dlCS+VLeHsqjTcqw6BjU8tYS4cXaTH1WYD9zgz4qvtMvo7s8ZjT fQtgVq5BgESQ8oSDATcnCkkwOb1VY7tK6ZrZMroGzeaFJjon0Gt+wyMkvIGFn/jVi8/t 5694uGg50zZYgfn3oP56CaQ91LZQgUZmrXAwXr2gH89TvebK6BKJXcKKMhwKn/q0YQXy sKLg== X-Gm-Message-State: AOJu0Yy0kAQO3kgYzWn+rK29M4gzlDnotUTLTt6YCxdewDBC8onZgilJ S/48vbR1fTR1I7VQprw2k24b7XSdbXb1ng== X-Google-Smtp-Source: AGHT+IH5w7/g9Ql+h8mmo6R8jOGUlk0TY+KU1oxp0GrTSv2IVZwPo1cTh/dV8ZuXM/w2i5FlVolHMg== X-Received: by 2002:ac2:4343:0:b0:4fe:f2e:6cfd with SMTP id o3-20020ac24343000000b004fe0f2e6cfdmr2850849lfl.62.1691839630075; Sat, 12 Aug 2023 04:27:10 -0700 (PDT) Received: from localhost.localdomain (bzd150.neoplus.adsl.tpnet.pl. [83.30.49.150]) by smtp.gmail.com with ESMTPSA id w3-20020ac24423000000b004fe2f085d5csm1087289lfl.299.2023.08.12.04.27.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Aug 2023 04:27:09 -0700 (PDT) From: Adam Skladowski Cc: phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Adam Skladowski , Andy Gross , Bjorn Andersson , 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 v3 3/7] clk: qcom: hfpll: Allow matching pdata Date: Sat, 12 Aug 2023 13:24:46 +0200 Message-Id: <20230812112534.8610-4-a39.skl@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230812112534.8610-1-a39.skl@gmail.com> References: <20230812112534.8610-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 HFPLL driver can be used to drive PLLs also on different SoCs like MSM8976 On MSM8976 each PLL gets it own different configuration, add matching pdata to driver to support multiple configurations. Signed-off-by: Adam Skladowski Reviewed-by: Konrad Dybcio --- drivers/clk/qcom/hfpll.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/clk/qcom/hfpll.c b/drivers/clk/qcom/hfpll.c index f4d78003d189..47325eb17f07 100644 --- a/drivers/clk/qcom/hfpll.c +++ b/drivers/clk/qcom/hfpll.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -32,7 +33,7 @@ static const struct hfpll_data hdata = { }; static const struct of_device_id qcom_hfpll_match_table[] = { - { .compatible = "qcom,hfpll" }, + { .compatible = "qcom,hfpll", .data = &hdata }, { } }; MODULE_DEVICE_TABLE(of, qcom_hfpll_match_table); @@ -83,7 +84,7 @@ static int qcom_hfpll_probe(struct platform_device *pdev) init.parent_data = &pdata; - h->d = &hdata; + h->d = of_device_get_match_data(&pdev->dev); h->clkr.hw.init = &init; spin_lock_init(&h->lock); From patchwork Sat Aug 12 11:24:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Skladowski X-Patchwork-Id: 13351821 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 9E044C001DB for ; Sat, 12 Aug 2023 11:27:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237216AbjHLL1N (ORCPT ); Sat, 12 Aug 2023 07:27:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237205AbjHLL1K (ORCPT ); Sat, 12 Aug 2023 07:27:10 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBD5F10C0; Sat, 12 Aug 2023 04:27:13 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-4fe44955decso3224244e87.1; Sat, 12 Aug 2023 04:27:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691839632; x=1692444432; 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=WU55BRi9jqkommNEXyQaNiy0A+qH53L90d7/C677RoI=; b=kbidcN+F6qMPvbd7FUAzY6AV74Q3DgkuPDtjtoLgxSJCrxTF5uqDwpowunBv9u1V9b teEN8m+GyYqUhIb6NGg34T5IK72TFptKIJhOoFlVNlAOwxbHmZMAeoj6ZS5eDjzRYi6f vYuKsoUeNUY56ew14RHH1zPRQeaYKgdm/HQVkHNCvw2ywMjCTkb7/+LX46znXkSm9kiM SD6uCoEeF/UcEpKel6cW4UcoNYoco3oTka9wnC8+QGM37uQnA0//Kcl6vF3H/+kRiAAF nXZGMvEpRPleZWji1k4ulpBmwJP3ZpEZQIUFFdDjA4s3JQ4nnBcpen6Y6A1VABoIPOqx 1mXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691839632; x=1692444432; 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=WU55BRi9jqkommNEXyQaNiy0A+qH53L90d7/C677RoI=; b=Ifkt0gq1b/2oK6Dc/+kPCGxR53s98L5HaWSbby9yCxDyaaPtfbmUw+rt7IO13X3KeT ozt2PvwzWyjAq04zWYobmAvQcbtQFC6pd+ko1OeDcassa2nSGR7iDj82z29B7qCzWL84 dCXEyrqub7w1tcVmWMFkd8wjTKXQSQHriNR8jVC3kn/dFteUnJM6tyUosxgEEZsNOm3M J5afAfHHAGd8UfKhQNAtRwU23tsQSO7UDZ5G17/eb/n/DA+cFzlBDgispPpTnWCzwnUP JyHAOUS3Ej3Sf6743AaM2u1B/e0M1TPzWg0pOd6SlwsjlOaxN9kvJM3PqgBKW/FofDp2 Z0yQ== X-Gm-Message-State: AOJu0Yz/x2Mg6nIXLowMvNyqTiycJ4GvZWogYQGE5qRvsq8tee+QgEpG 3DjUdw1HyR8VCNFSTiDg71uwH2f1WvQZ8Q== X-Google-Smtp-Source: AGHT+IHkUlAyw1EbQzTXAy0OSQppQrYg0ktAyVbdXb7k0R23U77+wAa9Q1IqiIIcHhdSvoHKJxg7OA== X-Received: by 2002:a05:6512:398d:b0:4f7:6404:4638 with SMTP id j13-20020a056512398d00b004f764044638mr1633448lfu.17.1691839631999; Sat, 12 Aug 2023 04:27:11 -0700 (PDT) Received: from localhost.localdomain (bzd150.neoplus.adsl.tpnet.pl. [83.30.49.150]) by smtp.gmail.com with ESMTPSA id w3-20020ac24423000000b004fe2f085d5csm1087289lfl.299.2023.08.12.04.27.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Aug 2023 04:27:11 -0700 (PDT) From: Adam Skladowski Cc: phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Adam Skladowski , Andy Gross , Bjorn Andersson , 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, Krzysztof Kozlowski Subject: [PATCH v3 4/7] dt-bindings: clock: qcom,hfpll: Document MSM8976 compatibles Date: Sat, 12 Aug 2023 13:24:47 +0200 Message-Id: <20230812112534.8610-5-a39.skl@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230812112534.8610-1-a39.skl@gmail.com> References: <20230812112534.8610-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 Document MSM8976 HFPLL compatibles. Signed-off-by: Adam Skladowski Acked-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/clock/qcom,hfpll.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/clock/qcom,hfpll.txt b/Documentation/devicetree/bindings/clock/qcom,hfpll.txt index ec02a024424c..5769cbbe76be 100644 --- a/Documentation/devicetree/bindings/clock/qcom,hfpll.txt +++ b/Documentation/devicetree/bindings/clock/qcom,hfpll.txt @@ -12,6 +12,9 @@ PROPERTIES "qcom,hfpll-apq8064", "qcom,hfpll" "qcom,hfpll-msm8974", "qcom,hfpll" "qcom,hfpll-msm8960", "qcom,hfpll" + "qcom,msm8976-hfpll-a53", "qcom,hfpll" + "qcom,msm8976-hfpll-a72", "qcom,hfpll" + "qcom,msm8976-hfpll-cci", "qcom,hfpll" - reg: Usage: required From patchwork Sat Aug 12 11:24:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Skladowski X-Patchwork-Id: 13351823 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 CA214C001DB for ; Sat, 12 Aug 2023 11:27:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237264AbjHLL1V (ORCPT ); Sat, 12 Aug 2023 07:27:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237214AbjHLL1N (ORCPT ); Sat, 12 Aug 2023 07:27:13 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B414A10C0; Sat, 12 Aug 2023 04:27:15 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-4fe28f92d8eso4445154e87.1; Sat, 12 Aug 2023 04:27:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691839634; x=1692444434; 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=WwpHu9R8DTJVzd3jTz3cmmUlW5j7I+iDCE8b7S1GNgo=; b=ZterrhBvNTcbo5vTgsIEPHluVgQxI93Cr4AZLx7ZQplXYIRvrP14XM/TOQCSmAizqq E3SNAxm5dqa+2odyUSjNgYxWGsakdKGxnZOICtkL75pa/lfBLIjWShkLdkVtLXmLkeDy OUNAEUxAQxAav6PawTckG5+z7UXdSvVihX39KGLGgn3C3Wb1U4GMrxrjKboQPN4LhXnM qgbbsai2oXu7TzwVOHrGb2d4o+Q4cSBFuUyLTHQDKBmSjIqdJU/vl5MUTQCtZB6bui3+ 63HpPw5uDrUQpKTNjV5UedRqAyZtQ1C0XEgx90C+mbadnhAeAt4JAFYUXrwNj6K8bWXz X7Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691839634; x=1692444434; 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=WwpHu9R8DTJVzd3jTz3cmmUlW5j7I+iDCE8b7S1GNgo=; b=QDz52MWFoO29qUbKRdiztM2TD1g84/FFq4EOYzYQNxwxwI/agD7LG2tZ84y7y21aVQ RkHKwg5PrAXThbbNhCQfjN7KmPMshxcNcp6+22xSY+zYX2DFevz0hE+yafv3VWiWNJmC XDaR3tIro0j1QkV1EJ4CzHS8atZmrBPIJpxdQ5F6g3ktu092evTJHlo8YexZsp2OZgLE vRn+sF/0hOAHsV1r7QnWQJgraLfCjhsjMr39EXGl89snMXOTxGvAx+XpIqdUi2avzxdk YadVqMCdnnu+F5eCXG359/rTsjgUlUlhiO8P7r1F8sch83hVSrZw2HW2Me8ldJoQyJjX D62w== X-Gm-Message-State: AOJu0Yzqu7IDPI9GQBV8eIHQPnN8AlQ3nCcptlg8duDugf831iqUdUjK 5UWG5z70qoxEbIpXNscSS2+ZGR7qVXiDgQ== X-Google-Smtp-Source: AGHT+IFW2prPcvUi/dV2CJcXU+kHq+qoCzniPey8w8UpYeRI+lSV2klVsceDKTYQfoCV3Dkx0eClqA== X-Received: by 2002:a05:6512:3d03:b0:4fd:c844:6a43 with SMTP id d3-20020a0565123d0300b004fdc8446a43mr3702600lfv.43.1691839633946; Sat, 12 Aug 2023 04:27:13 -0700 (PDT) Received: from localhost.localdomain (bzd150.neoplus.adsl.tpnet.pl. [83.30.49.150]) by smtp.gmail.com with ESMTPSA id w3-20020ac24423000000b004fe2f085d5csm1087289lfl.299.2023.08.12.04.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Aug 2023 04:27:13 -0700 (PDT) From: Adam Skladowski Cc: phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Adam Skladowski , Andy Gross , Bjorn Andersson , 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 v3 5/7] clk: qcom: hfpll: Add MSM8976 PLL data Date: Sat, 12 Aug 2023 13:24:48 +0200 Message-Id: <20230812112534.8610-6-a39.skl@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230812112534.8610-1-a39.skl@gmail.com> References: <20230812112534.8610-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 Reviewed-by: Konrad Dybcio --- 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 47325eb17f07..dac27e31ef60 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 = 2016000000UL, +}; + +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", .data = &hdata }, + { .compatible = "qcom,msm8976-hfpll-a53", .data = &msm8976_a53 }, + { .compatible = "qcom,msm8976-hfpll-a72", .data = &msm8976_a72 }, + { .compatible = "qcom,msm8976-hfpll-cci", .data = &msm8976_cci }, { } }; MODULE_DEVICE_TABLE(of, qcom_hfpll_match_table); From patchwork Sat Aug 12 11:24: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: 13351822 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 D8F24C001DB for ; Sat, 12 Aug 2023 11:27:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237195AbjHLL1R (ORCPT ); Sat, 12 Aug 2023 07:27:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237225AbjHLL1O (ORCPT ); Sat, 12 Aug 2023 07:27:14 -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 933F210EA; Sat, 12 Aug 2023 04:27:17 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-4fe934c4decso3361774e87.1; Sat, 12 Aug 2023 04:27:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691839636; x=1692444436; 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=ex9NYx+HBgu6/pZgoWgfrfu/p4scpVkTohOjt1lHg7M=; b=pN0llEAESY+It2U15Y27g05h//zrre0UROagBs08PTHBmQVn7iz7hKQTA8iYqK911V JWh1SpM0B7jC5dlbI94oBH4mOUINNh3TB1e0866l2gFlEfO3KCx1MQnmt6jlrZ57QjTC 59ISQUqJJKaVQIh6HPaE5I3Yw7lDvIs6DeMe0+bNXYVjed7gA9RZOfZqZku+Yc7sWP9c jdYLie8Hlcd0iG785ACdO5L5lNjxzfnsDqwgua+y9xbj6ha0TVoM/KYb3+Qwaoxlg789 NpVMPT9XG4Q6ha3ldAjqSno07vNXtdnvtSao5VbO6jQ0nADtu6nct4n+xiAjzVvoZ6SR ANcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691839636; x=1692444436; 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=ex9NYx+HBgu6/pZgoWgfrfu/p4scpVkTohOjt1lHg7M=; b=J4ucl14DHx+ENBc0ybfKqINGhQkBGudpQOKUAboHmapgNxMKfVQt0i/GgLrieuT3pd INfZlPOQKNBFsXKZo/moy051q+HjT7T+idQgx6+HlJ5CBMMO0BhJONS4ykaJBSbuTUgH Tl4CQ09FRZCw7qhKp+Wm1lJ5FM7EWctNGPPVoSTjqUHv+Onaoq/4jfWlpzi8J/uOF7cQ pCNi+MqNz6BUinXIUZPGLJS6lcpj5wjf+LGQiJ4GXyKucm2zGIcEtMp5+Cz4Irs1aZGY eMoJwihvtEMnxK/2+3cRbG2MKFMKz8QPvfOmJYZlUh/zb7fs8aMH9GZ2XwA32OejvFVU 0uVg== X-Gm-Message-State: AOJu0Yy3gPBnNxcTBwalmx3XAmpPWKBwWu1qEC5XH6wm+xiEhRNcj5yf lgDWweJegbKCYGub98Nef7MRJaJ2Q1SIIQ== X-Google-Smtp-Source: AGHT+IFbDsASJNCFwp84ZNhTaP1sLD8LG7+215PJRDtwi7gQrCokadl/uEB4gHwruL3aHoM2nyEQgA== X-Received: by 2002:a05:6512:2213:b0:4fc:6e21:ff50 with SMTP id h19-20020a056512221300b004fc6e21ff50mr3809526lfu.55.1691839635833; Sat, 12 Aug 2023 04:27:15 -0700 (PDT) Received: from localhost.localdomain (bzd150.neoplus.adsl.tpnet.pl. [83.30.49.150]) by smtp.gmail.com with ESMTPSA id w3-20020ac24423000000b004fe2f085d5csm1087289lfl.299.2023.08.12.04.27.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Aug 2023 04:27:15 -0700 (PDT) From: Adam Skladowski Cc: phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Adam Skladowski , Andy Gross , Bjorn Andersson , 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 v3 6/7] arm64: dts: qcom: msm8976: Split lpass region Date: Sat, 12 Aug 2023 13:24:49 +0200 Message-Id: <20230812112534.8610-7-a39.skl@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230812112534.8610-1-a39.skl@gmail.com> References: <20230812112534.8610-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 MSM8976 downstream dts define reloc region which is used by pil-tz to load both wcnss and lpass, on mainline however we might not be able to do it and we need separate regions(also validating dts might get problematic if we had to put memory-region(rproc node) per device). Luckily it seems size and entry points in firmware headers appears to be static across multiple devices including Sony Loire platform and Xiaomi Redmi Note 3 Pro this should let us fit in first ~17MB Split lpass region(reloc on downstream) into two separate regions. 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; }; From patchwork Sat Aug 12 11:24:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Skladowski X-Patchwork-Id: 13351824 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 2B82AC04A94 for ; Sat, 12 Aug 2023 11:27:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236888AbjHLL12 (ORCPT ); Sat, 12 Aug 2023 07:27:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237238AbjHLL1S (ORCPT ); Sat, 12 Aug 2023 07:27:18 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A931E7E; Sat, 12 Aug 2023 04:27:19 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-4fe7e67cc77so4536033e87.2; Sat, 12 Aug 2023 04:27:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691839638; x=1692444438; 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=YF7IV/t2RnprYmLwfCnYmyCQpWT6QNpR/xfog5JcW0k=; b=mrSilgtXyIjVgz3RGl4U1tDbBtEZ15EsoDGG//y24OaFWUFe+uOnVqBlF9G06W/h2j CL7boTuFOG/3vLcN+OiGWEVjwodaeWNOUQ+evLNqXQn+wBHU403KhbCxhp9YDfNWhinz p8hdLQoE6pDLPS3ZGe+2dorr3T2zVpTgCOYs8z7XoErSvsToN/KAy+w7TM0cgrBcRChd de9U9Ti4A+5kO4KAR+jZtiRF4ML2PZhPLvOLZcv1kp9QIPwQWjrPINZ6gkYzlM8F67yj QeldAXeBHTaEQT9y0hBe8nOFCtF8YsiehYD8Fr74UXaft5qoyqox0nrXtkRejii63bm/ rIOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691839638; x=1692444438; 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=YF7IV/t2RnprYmLwfCnYmyCQpWT6QNpR/xfog5JcW0k=; b=f+jfDcq7lCfhbzs/kkbiXAPrC4YXqoSCBHS5M8DF8A1MgKVlTGckyq2r7dMc7e/P8n yIFvhjJYfaXAGMt+HEqv47M5aMVLjkbRckTrhPeA/EAgnFE8fP6Ec2QD7ryEYR/dMsVM CmsqTf9u5qU/w2VGdCnGkGM8XC6dp/k8ti8QtsK5O6pre8rkyCoFYO0hFdG/yxdMDGz0 IW5C6UGwCP/xUte5eU/F5Q8P7ram+0gCGacccLrD7JN3RV8nagACplkQKPMHY/ZTivxD pIuVQjHOlvGySw2elR0W1j7UgpDCnBeyaJJRvSRllRPmIZK2p2Rp35srLaUy5o2wTyvC OcXw== X-Gm-Message-State: AOJu0YylwQG7DM6ZWFqIg6R1k8sOBjSiDbg88FSfOW2A1o0Agv2uQYMz lE2yhJaoMDypuWCyrccJd5o/v/643pTsVw== X-Google-Smtp-Source: AGHT+IEyIrZJpbCI0kGvUIiGJg9EDT8jtoIJfftz9EptJb9uUSUdEItjjsJFcnd5+yGtZ0Zlp5scZQ== X-Received: by 2002:a05:6512:2814:b0:4fe:d0f:b4f7 with SMTP id cf20-20020a056512281400b004fe0d0fb4f7mr3915409lfb.65.1691839637721; Sat, 12 Aug 2023 04:27:17 -0700 (PDT) Received: from localhost.localdomain (bzd150.neoplus.adsl.tpnet.pl. [83.30.49.150]) by smtp.gmail.com with ESMTPSA id w3-20020ac24423000000b004fe2f085d5csm1087289lfl.299.2023.08.12.04.27.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Aug 2023 04:27:17 -0700 (PDT) From: Adam Skladowski Cc: phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Adam Skladowski , Andy Gross , Bjorn Andersson , 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 v3 7/7] arm64: dts: qcom: msm8976: Fix ipc bit shifts Date: Sat, 12 Aug 2023 13:24:50 +0200 Message-Id: <20230812112534.8610-8-a39.skl@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230812112534.8610-1-a39.skl@gmail.com> References: <20230812112534.8610-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 Update bits to match downstream irq-bitmask values. Fixes: 0484d3ce0902 ("arm64: dts: qcom: Add DTS for MSM8976 and MSM8956 SoCs") Signed-off-by: Adam Skladowski --- arch/arm64/boot/dts/qcom/msm8976.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8976.dtsi b/arch/arm64/boot/dts/qcom/msm8976.dtsi index 7385d5edec04..ab6d3834e436 100644 --- a/arch/arm64/boot/dts/qcom/msm8976.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8976.dtsi @@ -384,7 +384,7 @@ adsp_smp2p_in: slave-kernel { smp2p-modem { compatible = "qcom,smp2p"; interrupts = ; - qcom,ipc = <&apcs 8 13>; + qcom,ipc = <&apcs 8 14>; qcom,local-pid = <0>; qcom,remote-pid = <1>; @@ -407,7 +407,7 @@ modem_smp2p_in: slave-kernel { smp2p-wcnss { compatible = "qcom,smp2p"; interrupts = ; - qcom,ipc = <&apcs 8 17>; + qcom,ipc = <&apcs 8 18>; qcom,local-pid = <0>; qcom,remote-pid = <4>; @@ -433,9 +433,9 @@ smsm { #address-cells = <1>; #size-cells = <0>; - qcom,ipc-1 = <&apcs 8 12>; + qcom,ipc-1 = <&apcs 8 13>; qcom,ipc-2 = <&apcs 8 9>; - qcom,ipc-3 = <&apcs 8 18>; + qcom,ipc-3 = <&apcs 8 19>; apps_smsm: apps@0 { reg = <0>;