From patchwork Sat Feb 10 14:12:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13552248 Received: from ahti.lucaweiss.eu (ahti.lucaweiss.eu [128.199.32.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DADA32EAF9; Sat, 10 Feb 2024 14:13:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=128.199.32.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707574409; cv=none; b=mOe8YsWOhFr9/5F4AxKOEb2FOsAlmH+LnkP10OCmheZY889iFhT07ux7Ux6BsXm3wbA+XS3tO2MhYuacfFIIuu2HYv65TNYut5z4fFEWcIcHgnvXTnVTEcjXySs4M4mB/HDrnazKNxl8W4XhAmPhZ9JAqNIONB/cGF0tLEt8wKs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707574409; c=relaxed/simple; bh=SOuiAaTminz1gLPKRkeSmkVX3LceNMBXyHg/izx49aA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kQDfWenSys18vnNsi9OPSIVf//OJrIRhfNrGFeIeSCEnWXsH4DV4h6x5C37e978G5CMj5+PBVmyfyLnHAhNsThrK1QzIsVoDmfayhSNqUk78fsaBiShFAFVAConAAR/Ioea7QE+F+oGyUNeBDnZC/+/gh52RngiuXFBTAWD0HRA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=z3ntu.xyz; spf=pass smtp.mailfrom=z3ntu.xyz; dkim=pass (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b=tprhgBs2; arc=none smtp.client-ip=128.199.32.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=z3ntu.xyz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=z3ntu.xyz Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b="tprhgBs2" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=z3ntu.xyz; s=s1; t=1707574399; bh=SOuiAaTminz1gLPKRkeSmkVX3LceNMBXyHg/izx49aA=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=tprhgBs2u875B9RG4aWfatvOHD5uY4851Ks4f7LKiPW+EeOthQRShpLVsF9k/0v3Z +sr+pequBXGuxdr+jM8axRUPbviBvlUSQgCrTfuhp1VhjE3qPinjcyxc6X/n4csbmH k3j/7PjESI91bokDAxGaFHGQbmmKjehw1iTX+Qog= From: Luca Weiss Date: Sat, 10 Feb 2024 15:12:55 +0100 Subject: [PATCH 1/3] dt-bindings: power: rpmpd: Add MSM8974 power domains Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240210-msm8974-rpmpd-v1-1-de9355e6842a@z3ntu.xyz> References: <20240210-msm8974-rpmpd-v1-0-de9355e6842a@z3ntu.xyz> In-Reply-To: <20240210-msm8974-rpmpd-v1-0-de9355e6842a@z3ntu.xyz> To: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Ulf Hansson , Stephan Gerhold , =?utf-8?q?Matti_Lehtim=C3=A4ki?= Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Luca Weiss X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=1597; i=luca@z3ntu.xyz; h=from:subject:message-id; bh=SOuiAaTminz1gLPKRkeSmkVX3LceNMBXyHg/izx49aA=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBlx4R7sRlAuPvwy1H9+FS8pkYR0uNizYT9Ju7TL 2zRmmpZoCCJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZceEewAKCRBy2EO4nU3X VmhHEADHZiRtUwwhiEbpZqGJsra9PNWBLJloSI74eKv7q4eoZbNUgj3aI3xmYh2LWVvw+naxSiO 6arYiOvNTS2YRMkOV9gATOOUKqdvp791JzUEESHE3aXWi0DOu2022Y7i44ayvjw2ytUadwhr5Kp ipUU81CRyHiIrVwHQekr5YBPo+YOlw2GkPCBn70GmmA0apm1iAR6cpUzj7NQW5zeXtrM5RdKuST 67Z/8PhSNlGuCsqT3M5/PdEAP1CLqRVTaL8EWYYCp8TVW9GNR7qMN9HkguNd+MqmFU0cwNGPrbE xQOeiwR+ud7YXgv3mJfehxCAvpIW4prXi/ZnJG1/iTPKtJfP2gov5HK4Aln9Ze8X5jCm8OeKEVl erZ1L0jEaYSCTsmIZSrrRWpKcINFiOAsVj8PhmPkOZMMOXwdDwXmvfX5pNvyoilkF4qYuPelqoe FMM7zomHTFr/+sbsehNx2dNVbscw9Dw95CJUNDVto91A3cZFLE8Bigz+Pbs1Z8tdsZTwWoRZDQF FqxhiyHR+gI6g9b2w5aCP4eKdHnuyyDVlznpnU8KeNNDAHwhyInqsOXdq3sC9vxCODRPR2W42w9 Cm0u0Zd3fuqB8033chY4a8BVuYerjZ4SdpmvXCTdcHukmhCNoi5NurxpKgSDAw1H/9+cSLxZTRP y/jF7jHrh7uT16A== X-Developer-Key: i=luca@z3ntu.xyz; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD Add the compatibles and indexes for the rpmpd in MSM8974, both with the standard PM8841+PM8941 PMICs but also devices found with PMA8084. Signed-off-by: Luca Weiss --- Documentation/devicetree/bindings/power/qcom,rpmpd.yaml | 2 ++ include/dt-bindings/power/qcom-rpmpd.h | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml index 2ff246cf8b81..929b7ef9c1bc 100644 --- a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml +++ b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml @@ -24,6 +24,8 @@ properties: - qcom,msm8917-rpmpd - qcom,msm8939-rpmpd - qcom,msm8953-rpmpd + - qcom,msm8974-rpmpd + - qcom,msm8974pro-pma8084-rpmpd - qcom,msm8976-rpmpd - qcom,msm8994-rpmpd - qcom,msm8996-rpmpd diff --git a/include/dt-bindings/power/qcom-rpmpd.h b/include/dt-bindings/power/qcom-rpmpd.h index 7f4e2983a4c5..9f0fe60ba745 100644 --- a/include/dt-bindings/power/qcom-rpmpd.h +++ b/include/dt-bindings/power/qcom-rpmpd.h @@ -308,6 +308,14 @@ #define MSM8953_VDDMX 5 #define MSM8953_VDDMX_AO 6 +/* MSM8974 Power Domain Indexes */ +#define MSM8974_VDDCX 0 +#define MSM8974_VDDCX_AO 1 +#define MSM8974_VDDCX_VFC 2 +#define MSM8974_VDDGFX 3 +#define MSM8974_VDDGFX_AO 4 +#define MSM8974_VDDGFX_VFC 5 + /* MSM8976 Power Domain Indexes */ #define MSM8976_VDDCX 0 #define MSM8976_VDDCX_AO 1 From patchwork Sat Feb 10 14:12:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13552249 Received: from ahti.lucaweiss.eu (ahti.lucaweiss.eu [128.199.32.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 26F8D53E0E; Sat, 10 Feb 2024 14:13:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=128.199.32.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707574409; cv=none; b=tctnYE8pqNXgp+FQI1UYf+O8lt3gegkw3lNfIPea0VE8JhAsppFqSag1y/zfocABYf4oDwU8wiCD8y799huuZoqmx3BFrFh/hSs1MWyPNmnS+u5Wh3nr8cGyeJDX4z24UbLAhF++5bl3y4AdKvHa1j1Tdxj9WOx3y7GJJnHhvzM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707574409; c=relaxed/simple; bh=wz9Hx+L8dYOlOuz76qShV9ngNnFo+4/s9GVAgaEKMWo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=W7212qISVoDO/51vWRF6TGLg/5VhcS8+n5nWRs8awIuMN3aoUUV1f2eV7Mh1kAbygs9ys/yUqogMD/LXgajH7u3xmJuClHt1ALIse7GbBlBOtSOCDi3CEGEul9GQANQ/scA5QiQpRx2z5aBo3Awb37AJEbFbvdW9zlT9cImL9Oc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=z3ntu.xyz; spf=pass smtp.mailfrom=z3ntu.xyz; dkim=pass (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b=VZeo3wao; arc=none smtp.client-ip=128.199.32.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=z3ntu.xyz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=z3ntu.xyz Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b="VZeo3wao" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=z3ntu.xyz; s=s1; t=1707574399; bh=wz9Hx+L8dYOlOuz76qShV9ngNnFo+4/s9GVAgaEKMWo=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=VZeo3waor+yHZ57u4x/f+55T44jKYLUEf6eQ5yli+6xgCfrqiKhzMTnFnJCJvOpO4 +kjREj1a+9YS6xdm7/eOyZNXFBAGx8wu52NC0QbL2ESs4DZtuum9La00cToYE4NIr4 NVaS5SrAi98PhFeGqPyCO9t/3+Xs7MBdftVpHMIM= From: Luca Weiss Date: Sat, 10 Feb 2024 15:12:56 +0100 Subject: [PATCH 2/3] pmdomain: qcom: rpmpd: Add MSM8974+PM8841 power domains Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240210-msm8974-rpmpd-v1-2-de9355e6842a@z3ntu.xyz> References: <20240210-msm8974-rpmpd-v1-0-de9355e6842a@z3ntu.xyz> In-Reply-To: <20240210-msm8974-rpmpd-v1-0-de9355e6842a@z3ntu.xyz> To: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Ulf Hansson , Stephan Gerhold , =?utf-8?q?Matti_Lehtim=C3=A4ki?= Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Luca Weiss X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=3192; i=luca@z3ntu.xyz; h=from:subject:message-id; bh=wz9Hx+L8dYOlOuz76qShV9ngNnFo+4/s9GVAgaEKMWo=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBlx4R8zEFH8BbXvaPGHckFlMfDx9LVuBztodvmO IUb8j50zHaJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZceEfAAKCRBy2EO4nU3X VlS4D/wKkK5qZXJPqUaMGSU8qcdyFRX1oj9HhIIYHmGeuydJbIMB9dZgFqbTgIFW/sVxgpYUnSt Gx0srIl/H+zXy/A3FX7dCRLg5/tQO4tOa6aA3nUWBYTydGg0okQmxzhzJ0WzcwNiWM9RBvHue6j kH4mmny5mv9gChV7cERESZ4GtD3iEj/wtklHPVPB+BRVL3olmJLtTKD4DvJG6SBALa0pXBLHldq HrZpVFfazuidFnl6spvWijXA79KnNPIFyd8oCXIVDn00eodS6xBrPKHpQD5iw4hYE2nkAExBmjE uLy5Ex145ogO7Z96wAtac5H4C4GtivRg72gUKHqn86eMtn4RdlKjLd79pqylkrb576fz6jCCqUw rKPCLakNG/LveeBH17aoHICT9ts9uo0AUq8eTnoljCKBwWZ/OkfoDgUKpDP4V2913HzQ/1tHkdo QQcxSiO71fdxB/AqXwuKbN9sHI7mJt1sJ2432aWqvpwKJM8+zS9blNLTVxEAvgzQ7Pfmks26luQ ZI8fEFiCiD0V9/ucgkrrkrsYy3M+2KgLOieVOm0iyTZyDtOSOvl8OSIbAcU1TxHyLO7nKNFvs4i IJqBolyhBv2Rzu/K7LISsabYJ91AM8WX+RJBvdexAN40P0/kpmqsTJHkUWjQurGZ3HpkYo8VSPd dQ/xLJhJW108o7Q== X-Developer-Key: i=luca@z3ntu.xyz; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD Add the power domains CX & GFX found on devices with MSM8974 and PM8841. Signed-off-by: Luca Weiss --- drivers/pmdomain/qcom/rpmpd.c | 66 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/drivers/pmdomain/qcom/rpmpd.c b/drivers/pmdomain/qcom/rpmpd.c index 7796d65f96e8..bb28a7319bed 100644 --- a/drivers/pmdomain/qcom/rpmpd.c +++ b/drivers/pmdomain/qcom/rpmpd.c @@ -226,6 +226,31 @@ static struct rpmpd cx_s3a_vfl = { .key = KEY_FLOOR_LEVEL, }; +static struct rpmpd cx_s2b_corner_ao; +static struct rpmpd cx_s2b_corner = { + .pd = { .name = "cx", }, + .peer = &cx_s2b_corner_ao, + .res_type = RPMPD_SMPB, + .res_id = 2, + .key = KEY_CORNER, +}; + +static struct rpmpd cx_s2b_corner_ao = { + .pd = { .name = "cx_ao", }, + .peer = &cx_s2b_corner, + .active_only = true, + .res_type = RPMPD_SMPB, + .res_id = 2, + .key = KEY_CORNER, +}; + +static struct rpmpd cx_s2b_vfc = { + .pd = { .name = "cx_vfc", }, + .res_type = RPMPD_SMPB, + .res_id = 2, + .key = KEY_FLOOR_CORNER, +}; + /* G(F)X */ static struct rpmpd gfx_s2b_corner = { .pd = { .name = "gfx", }, @@ -241,6 +266,31 @@ static struct rpmpd gfx_s2b_vfc = { .key = KEY_FLOOR_CORNER, }; +static struct rpmpd gfx_s4b_corner_ao; +static struct rpmpd gfx_s4b_corner = { + .pd = { .name = "gfx", }, + .peer = &gfx_s4b_corner_ao, + .res_type = RPMPD_SMPB, + .res_id = 4, + .key = KEY_CORNER, +}; + +static struct rpmpd gfx_s4b_corner_ao = { + .pd = { .name = "gfx_ao", }, + .peer = &gfx_s4b_corner, + .active_only = true, + .res_type = RPMPD_SMPB, + .res_id = 4, + .key = KEY_CORNER, +}; + +static struct rpmpd gfx_s4b_vfc = { + .pd = { .name = "gfx_vfc", }, + .res_type = RPMPD_SMPB, + .res_id = 4, + .key = KEY_FLOOR_CORNER, +}; + static struct rpmpd mx_rwmx0_lvl; static struct rpmpd gx_rwgx0_lvl_ao; static struct rpmpd gx_rwgx0_lvl = { @@ -663,6 +713,21 @@ static const struct rpmpd_desc msm8953_desc = { .max_state = RPM_SMD_LEVEL_TURBO, }; +static struct rpmpd *msm8974_rpmpds[] = { + [MSM8974_VDDCX] = &cx_s2b_corner, + [MSM8974_VDDCX_AO] = &cx_s2b_corner_ao, + [MSM8974_VDDCX_VFC] = &cx_s2b_vfc, + [MSM8974_VDDGFX] = &gfx_s4b_corner, + [MSM8974_VDDGFX_AO] = &gfx_s4b_corner_ao, + [MSM8974_VDDGFX_VFC] = &gfx_s4b_vfc, +}; + +static const struct rpmpd_desc msm8974_desc = { + .rpmpds = msm8974_rpmpds, + .num_pds = ARRAY_SIZE(msm8974_rpmpds), + .max_state = MAX_CORNER_RPMPD_STATE, +}; + static struct rpmpd *msm8976_rpmpds[] = { [MSM8976_VDDCX] = &cx_s2a_lvl, [MSM8976_VDDCX_AO] = &cx_s2a_lvl_ao, @@ -856,6 +921,7 @@ static const struct of_device_id rpmpd_match_table[] = { { .compatible = "qcom,msm8917-rpmpd", .data = &msm8917_desc }, { .compatible = "qcom,msm8939-rpmpd", .data = &msm8939_desc }, { .compatible = "qcom,msm8953-rpmpd", .data = &msm8953_desc }, + { .compatible = "qcom,msm8974-rpmpd", .data = &msm8974_desc }, { .compatible = "qcom,msm8976-rpmpd", .data = &msm8976_desc }, { .compatible = "qcom,msm8994-rpmpd", .data = &msm8994_desc }, { .compatible = "qcom,msm8996-rpmpd", .data = &msm8996_desc }, From patchwork Sat Feb 10 14:12:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13552250 Received: from ahti.lucaweiss.eu (ahti.lucaweiss.eu [128.199.32.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 26F4B53E0D; Sat, 10 Feb 2024 14:13:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=128.199.32.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707574409; cv=none; b=l8VjquMWK98bGnX6ek7SdO2Qy043aAkU9PVCtOdiZm7f2ggLeALqNImNhqwBFo6VKTZd6XUNFSTj1/HcDPbRhOUyR5d3LNCrfJ9zM6lFhQNBeV0+GHvbu/+nsNWouiH0FHozJieavq3SvjrBJ5N/ClGG6BxQtcme6zJG+77iF3k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707574409; c=relaxed/simple; bh=pEbjMkaG6aytDHCPfPUMYKbhop5aoAakU84obp67bv8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Pcgr3T0O9nAjCE7IA45cCvO96W1T+EkQF+I4CpbDRCQw/xCdxqEgSAkqQqHTmCgpnju+6g5qlZxDWz51VYoxR8V9bzUrG+nwdD/MeOVgpgDvQOO+w2YKrAOM/FGnbD0ZdpEwhRKkNlUa6/3Hro3ZLUKqak1sa7uJzDfQ9RyNHmQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=z3ntu.xyz; spf=pass smtp.mailfrom=z3ntu.xyz; dkim=pass (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b=7eEW7knG; arc=none smtp.client-ip=128.199.32.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=z3ntu.xyz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=z3ntu.xyz Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=z3ntu.xyz header.i=@z3ntu.xyz header.b="7eEW7knG" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=z3ntu.xyz; s=s1; t=1707574399; bh=pEbjMkaG6aytDHCPfPUMYKbhop5aoAakU84obp67bv8=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=7eEW7knG3Kt1XQZsTi0b2jkYMBHrEzKaJa5SRfZoehy1mNBUxZPOXS2y+ARlkUB50 zxa56jZICMKwcoO4qms09bGrpCwezCoEXgMXvZIiCsiup3xnhgDtFnu4M4+S9mfFDa X81E0fyxtYOa+8w8XTyfeerK9utVDGoMjfAXOHDA= From: Luca Weiss Date: Sat, 10 Feb 2024 15:12:57 +0100 Subject: [PATCH 3/3] pmdomain: qcom: rpmpd: Add MSM8974PRO+PMA8084 power domains Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240210-msm8974-rpmpd-v1-3-de9355e6842a@z3ntu.xyz> References: <20240210-msm8974-rpmpd-v1-0-de9355e6842a@z3ntu.xyz> In-Reply-To: <20240210-msm8974-rpmpd-v1-0-de9355e6842a@z3ntu.xyz> To: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Ulf Hansson , Stephan Gerhold , =?utf-8?q?Matti_Lehtim=C3=A4ki?= Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Luca Weiss X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=2540; i=luca@z3ntu.xyz; h=from:subject:message-id; bh=pEbjMkaG6aytDHCPfPUMYKbhop5aoAakU84obp67bv8=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBlx4R9DAmzORdeYJsmHQwKQRAjHJYEVq2+bwQ/T nGIpX0bUZeJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZceEfQAKCRBy2EO4nU3X Voi6D/95TvGZpv+6L56HIuBJv4E50X1zBarD4qhAMgxdQdh/qkeBRwI68dhKWRIa7IK4CS4Vmi/ QZXdFFxCIb6vtX4pWAceyaTVarcPpLW69+PUAws93WTtyeVTvNbs+ujsTZdslfVcjE+7uJPQZah gzSMg2QGBG2AmvgScPsyNCaP4hIFWrnfUf7KMKS5hRJx71YMLO+9L7rMUO8/yfgFnI722wJMf2r yoT4OE0KpdyfIFVOP7e5maYVEAUFYmm+oo0ZFKPBlPlIadOjhCbVtk2JHz30Jb1j9WbOrSh76Jr iegovPxfvv6tbZpOZFNCcNxXcblzFbLdULy5FACgUdoYbu/sZrjwMEBq+U2ogQSrfZFgGCfFVbl 3Ah4sYELgzB/OKtTmNvdP8aH/8swUJ84AQfWPeMzt2mdOzex7n+I6NTg9Q+zYRxfzi5EbK7uU0H 1Ndy0iw0Alhyrnw43/BzDRD+14PuRZ4nM4sYUZHcyH5kHbfAyULikJCTySkJoFkAwrmwA3T9RPf cXmHKTbR90Z5AFuvNxV2fF8fddYR6ywpnQrnBB5XPQGLthJqrqjGq/PPRAv9TxK8AZENJarDYT7 VWtRFF6OHV0K+LWpvdr0FyHU4ejz41NyPMvEnp28UKLqg08CZNv6AO9sIcD2V0hssYGbHRw+FI7 o7hvExQLT0/jX3g== X-Developer-Key: i=luca@z3ntu.xyz; a=openpgp; fpr=BD04DA24C971B8D587B2B8D7FAF69CF6CD2D02CD Add the power domains CX & GFX found on MSM8974 devices that use PMA8084 instead of the standard PM8841+PM8941 combo. Signed-off-by: Luca Weiss --- drivers/pmdomain/qcom/rpmpd.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/drivers/pmdomain/qcom/rpmpd.c b/drivers/pmdomain/qcom/rpmpd.c index bb28a7319bed..3cd0d1ad6188 100644 --- a/drivers/pmdomain/qcom/rpmpd.c +++ b/drivers/pmdomain/qcom/rpmpd.c @@ -252,6 +252,31 @@ static struct rpmpd cx_s2b_vfc = { }; /* G(F)X */ +static struct rpmpd gfx_s7a_corner_ao; +static struct rpmpd gfx_s7a_corner = { + .pd = { .name = "gfx", }, + .peer = &gfx_s7a_corner_ao, + .res_type = RPMPD_SMPA, + .res_id = 7, + .key = KEY_CORNER, +}; + +static struct rpmpd gfx_s7a_corner_ao = { + .pd = { .name = "gfx_ao", }, + .peer = &gfx_s7a_corner, + .active_only = true, + .res_type = RPMPD_SMPA, + .res_id = 7, + .key = KEY_CORNER, +}; + +static struct rpmpd gfx_s7a_vfc = { + .pd = { .name = "gfx_vfc", }, + .res_type = RPMPD_SMPA, + .res_id = 7, + .key = KEY_FLOOR_CORNER, +}; + static struct rpmpd gfx_s2b_corner = { .pd = { .name = "gfx", }, .res_type = RPMPD_SMPB, @@ -728,6 +753,21 @@ static const struct rpmpd_desc msm8974_desc = { .max_state = MAX_CORNER_RPMPD_STATE, }; +static struct rpmpd *msm8974pro_pma8084_rpmpds[] = { + [MSM8974_VDDCX] = &cx_s2a_corner, + [MSM8974_VDDCX_AO] = &cx_s2a_corner_ao, + [MSM8974_VDDCX_VFC] = &cx_s2a_vfc, + [MSM8974_VDDGFX] = &gfx_s7a_corner, + [MSM8974_VDDGFX_AO] = &gfx_s7a_corner_ao, + [MSM8974_VDDGFX_VFC] = &gfx_s7a_vfc, +}; + +static const struct rpmpd_desc msm8974pro_pma8084_desc = { + .rpmpds = msm8974pro_pma8084_rpmpds, + .num_pds = ARRAY_SIZE(msm8974pro_pma8084_rpmpds), + .max_state = MAX_CORNER_RPMPD_STATE, +}; + static struct rpmpd *msm8976_rpmpds[] = { [MSM8976_VDDCX] = &cx_s2a_lvl, [MSM8976_VDDCX_AO] = &cx_s2a_lvl_ao, @@ -922,6 +962,7 @@ static const struct of_device_id rpmpd_match_table[] = { { .compatible = "qcom,msm8939-rpmpd", .data = &msm8939_desc }, { .compatible = "qcom,msm8953-rpmpd", .data = &msm8953_desc }, { .compatible = "qcom,msm8974-rpmpd", .data = &msm8974_desc }, + { .compatible = "qcom,msm8974pro-pma8084-rpmpd", .data = &msm8974pro_pma8084_desc }, { .compatible = "qcom,msm8976-rpmpd", .data = &msm8976_desc }, { .compatible = "qcom,msm8994-rpmpd", .data = &msm8994_desc }, { .compatible = "qcom,msm8996-rpmpd", .data = &msm8996_desc },