From patchwork Sat Feb 10 16:38: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: 771736 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 B7AB82B9C8; Sat, 10 Feb 2024 16:39:09 +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=1707583151; cv=none; b=LFLaaWfwCZ24O+DVpOjDdS3ZV53bEvIlCQPpJa2Ws9zXjEX72ve6whjlzX8CfdKzi/ZYSkpEnVD4aGzvPLevcrZezbC6e4XUolx+dAY19ZGDugD9TJLevcKkhcooMdWs5Iv1mDCM6cjvSBz920YO8N05NKoRzvb9oBOZYlyBuJQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707583151; c=relaxed/simple; bh=Z0ejz2Z7KadDW8L5DtUsqa9+gFcYsfukyK6vqWCH2qU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kEE46Lp/Qa7dxU42KkJPIUMe7ZE5NeoJ/53g9afM3MqKfonuU0x5nyG1l9TVJR+/rDriw7lj0g2SQdH2cb1wgLyalUPVAc+7NPo2XNzhT0j487D/cJeC4LzuwBtkQiFpq6mLa4nmtsFoLNmFKUdttWuVolh2vswdfU0tx8/MTLQ= 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=AB17Nc0R; 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="AB17Nc0R" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=z3ntu.xyz; s=s1; t=1707583147; bh=Z0ejz2Z7KadDW8L5DtUsqa9+gFcYsfukyK6vqWCH2qU=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=AB17Nc0RmHj3klVKrj1IsNpUmIxZe1/kCy8J+9uD8jij3g8BrFptG/atwQ+YtT+13 TqPrzdhEchku2RKuqLBfNJ63eVeUD+DOxSNYhD3UJZf17PlsFB0YL9somQTfy3TQvW 57oBxNISDh0HURSA4V6p1aOrS4cgtcdp5QaR9huU= From: Luca Weiss Date: Sat, 10 Feb 2024 17:38:56 +0100 Subject: [PATCH v2 1/3] dt-bindings: power: rpmpd: Add MSM8974 power domains Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240210-msm8974-rpmpd-v2-1-595e2ff80ea1@z3ntu.xyz> References: <20240210-msm8974-rpmpd-v2-0-595e2ff80ea1@z3ntu.xyz> In-Reply-To: <20240210-msm8974-rpmpd-v2-0-595e2ff80ea1@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=1565; i=luca@z3ntu.xyz; h=from:subject:message-id; bh=Z0ejz2Z7KadDW8L5DtUsqa9+gFcYsfukyK6vqWCH2qU=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBlx6aoRiRisauepXEiWVHnu49b09eKAS1bnXrX7 jEvQCBqlRuJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZcemqAAKCRBy2EO4nU3X Vr46EACLtISs42mjjGJW4gCRA6r8/lZm3z/2tG+WrUKm9zBrVWLiXv1o+JEccOM4g1BPUv/fqyE +52k7YixnX5fG6yYrT+SbJVqcCahMqZEdVZlZ2zLhDOk6xIg/RXc1NCOzXaZuL3VraatW+63m5Y pNLeFrhGYsijhBNoFczuMOlQY7RfG78R06GZK221OWcXn7wUrEnoJVy8WvhNze9Gt9B3xRQ7kNE ffvZVRDvQJ++pEG9EwmHprPQcYsKlHfw7e/1GAgEl0r/vwzpJdcGc9sb6+0Ly0/43gJ/ru+1eJ2 ObFTS/a5fPAt82CthnAb4J9CgTr9G2pCzElf4n+noJGR00/2xrk2vRVSvlSSXk9VxjaZyXWyrio AyG2d4IipBbErgKEnkNjUzNh9XOM+kodStb5Eo1dHuVdUir2qY0ZY41euH+TRZV81XWKdBzlCJ3 15UYpjEVtJII5+3k/GW9MNSIjtzNmMGhW2MDraqzqavmysPqdxMuzEhX+SRmn59owTj/dm3UqC6 yzCGYWUqcPHW1Pb21D5WDk5YXw7DT5zi4UBe72eeAEwCp56edc6/x+ZW+c3+hIc3xCwNLV1dZqT drKZa/0PEzGW0Sx0IlI5npSpSEHxyoHTYlvq5ygn45FTAxt8wfgIQtPeT6+hyUMdLdrw1oCoOsC tyRDMnl0QwM9Pdw== 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 Acked-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/power/qcom,rpmpd.yaml | 2 ++ include/dt-bindings/power/qcom-rpmpd.h | 7 +++++++ 2 files changed, 9 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..608087fb9a3d 100644 --- a/include/dt-bindings/power/qcom-rpmpd.h +++ b/include/dt-bindings/power/qcom-rpmpd.h @@ -308,6 +308,13 @@ #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_VFC 4 + /* MSM8976 Power Domain Indexes */ #define MSM8976_VDDCX 0 #define MSM8976_VDDCX_AO 1 From patchwork Sat Feb 10 16:38: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: 771735 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 8A97C53815; Sat, 10 Feb 2024 16:39:10 +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=1707583152; cv=none; b=aSqMAflbNExa7MB9Z8muCTPaXKjUausSUeNiVsEJwzTgxbdIcAXMViMHGINdVQYDfg8RoTLr0aNSGDR3kPPfC+CH/ixNyWQ4d5IbolPFBpIPxyAFlTJ8AwvaaO4m8beBwIkahWoyGGsJYqF7OOILb89Z3R14pMTWbDLYR+WVeEQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707583152; c=relaxed/simple; bh=Bqe9nG5QIKCNWmQCfAYO31zIO0yKG5ihxkdZCTLqWYs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tdC4866uSZFCQarRpBhdGiOR9yy2rFm8bwHh1YoasKNwPECeQPhsaDfI5CXudOBgZ4SX8j5q/DVwXW1z8QeJBa1jMULbuOxXRV/DWsjMHZakLUF15feOabGdUcIhBGdVrvzZfVbo0UvWGRX3T9IwFBKBKqVU9u49+L2QG8cjW34= 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=UG9Ug/JA; 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="UG9Ug/JA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=z3ntu.xyz; s=s1; t=1707583148; bh=Bqe9nG5QIKCNWmQCfAYO31zIO0yKG5ihxkdZCTLqWYs=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=UG9Ug/JAnOhN5Ov4y323kq3XqF/g58hbJLSRxos6ZDplGYRlA2WDxtCT5M/APBPdF WM8LVQG4jiZS5xN3F75oaPn4G1AzZQQUmJaf7UjmLDJzmJavR2aN2R96rbVGn3S8gP 8wwvJVo9vPDuqXuG4PBrv3kAf/pQ1/GybOQVc/Ok= From: Luca Weiss Date: Sat, 10 Feb 2024 17:38:57 +0100 Subject: [PATCH v2 2/3] pmdomain: qcom: rpmpd: Add MSM8974+PM8841 power domains Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240210-msm8974-rpmpd-v2-2-595e2ff80ea1@z3ntu.xyz> References: <20240210-msm8974-rpmpd-v2-0-595e2ff80ea1@z3ntu.xyz> In-Reply-To: <20240210-msm8974-rpmpd-v2-0-595e2ff80ea1@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=2874; i=luca@z3ntu.xyz; h=from:subject:message-id; bh=Bqe9nG5QIKCNWmQCfAYO31zIO0yKG5ihxkdZCTLqWYs=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBlx6apKNOxSZtGrGubtN7TRkNBkuCcJ0dkuvwbF sw9uXC91aKJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZcemqQAKCRBy2EO4nU3X VlKPD/wP7/T6WcgMkLn0WtjB6eKyxmg7YHynQTAIEvChvqmTX3W5e8WQlZC3s8OBtOM/kXwkcJx NoV2gMltS/xBlW+dGknr4W8rGby86u1yR+xOZtYCP0nSNR+efA6A2gvcniAko9RehADl14FSpSK 7rrkpNlmpbXua1t9fbK70XnZjVNXNGzayYxNE1X4aVQz+MnT8WaG9RkhP3/KWV1aRGOsFEAmRsP I7b11vmdS/GR7kpBp6T1BnYp6NtGvHkwPUauHdSCrQZNaAq9WAIrhsgHrHJLUKJqnnI2zhfflA/ JTWtZhxIlERjhLjUfZInQUHNzVrC7AvY0GHHI9BHTM29JnZU2EED1ZI4O8VJPsBoop7flAkFqXm tsPWVkZfmk8uhj1dD5idBYCcyGDGhRL8maPuHGnUgpi48QeQ4xyFrPlSBaQlokKtxL/4XGJH+4x gob5vasz/6yL22Sb7lWBL0qEDulhZ27wD2UiN5ehX2yEHXIfF9FIxSdv+Xc5xtDmRNdgwqoss6N yiHtAwiGVZQc/jLgHW6/nMOuYkDnZdcx8kMxWcZdc2U+3Y7pJl6Nw9fDUd/aHxORDRrLjj173YP nL4iCwwvagJqtDmqW2tJKNrH2oHa7m55ATU8iQjNaUTw4ViM1/18n3D2UTK2H+K96Wz+blqhVnw b4FYXMVtsA2ptpQ== 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 | 54 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/drivers/pmdomain/qcom/rpmpd.c b/drivers/pmdomain/qcom/rpmpd.c index 7796d65f96e8..3fa6a0325fc0 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,20 @@ static struct rpmpd gfx_s2b_vfc = { .key = KEY_FLOOR_CORNER, }; +static struct rpmpd gfx_s4b_corner = { + .pd = { .name = "gfx", }, + .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 +702,20 @@ 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_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 +909,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 16:38:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 772216 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 D04785C5E2; Sat, 10 Feb 2024 16:39:10 +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=1707583152; cv=none; b=OcZVqeEqTRt0r8Ll4J0zPzxSborW6LG6h9+qidpC459ylqR31yn3pQkNbqBXkBffJr4nznoWGkydwKySyFql0jJoPqwUOGYfkVEsoKJi+o9jtNeejQ1/0qcUmYd5P3E6JkJOIhdHjEyMzxqQ2awixcutIps62PIRtr1Ozq2LUio= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707583152; c=relaxed/simple; bh=kgvAMPhT8w4j+/gc16d5E4a3wb/jg9/T4SXRJTUDi/w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Bq9X0pHZF48YLb18pm3J/png4c0E24nqTP7Lg5FBzcs2f4Jc95l1HlcdNgJzkwieXXmHAxk9kgunQ7KJocIYG2uZx93Pu8v3GmM4o0KJA3dNNMVt86BG1gV8j4yxx41rn5gJZcOGdpWIu08E334/gWfRdLGKGbKIzuCsK9skebs= 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=CgxKQ30o; 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="CgxKQ30o" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=z3ntu.xyz; s=s1; t=1707583149; bh=kgvAMPhT8w4j+/gc16d5E4a3wb/jg9/T4SXRJTUDi/w=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=CgxKQ30odRg8weEpgShVBLYP2myEEzO0LFQW8np5WbrvsfZPg0LsDVWmhvPjFLIey 2FFTyZRsFov5t+Y+qIO0R67gjt+AiweEB2utwcpK2kMvfxWDExKle8uaKsieuBERUg Xnf9QhC+9faQ+p/qylCSXkY/iMoCwxsALMk70TIo= From: Luca Weiss Date: Sat, 10 Feb 2024 17:38:58 +0100 Subject: [PATCH v2 3/3] pmdomain: qcom: rpmpd: Add MSM8974PRO+PMA8084 power domains Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240210-msm8974-rpmpd-v2-3-595e2ff80ea1@z3ntu.xyz> References: <20240210-msm8974-rpmpd-v2-0-595e2ff80ea1@z3ntu.xyz> In-Reply-To: <20240210-msm8974-rpmpd-v2-0-595e2ff80ea1@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=2210; i=luca@z3ntu.xyz; h=from:subject:message-id; bh=kgvAMPhT8w4j+/gc16d5E4a3wb/jg9/T4SXRJTUDi/w=; b=owEBbQKS/ZANAwAIAXLYQ7idTddWAcsmYgBlx6aphrHa+N0dggsH13/iZNAuwr08JNoIsdJ0+ MYyk3kOGuKJAjMEAAEIAB0WIQQ5utIvCCzakboVj/py2EO4nU3XVgUCZcemqQAKCRBy2EO4nU3X VsHvEACk8q50ApttO6yx3gj3K6363npqMfi182GoUl1z8hdZcNwDoc/gBRE5IHfFWKcg2eU2RW9 6pZG9058GoQ6D+sDdmVdMKLV3821H+GrkHSJ4KLxNw0Wxoz51vIpsDNmNzVNgcGQMVVbB+VXp04 9DMZCSFP5+GbRXWeKu8OsjgLNEe4HuZ+50HJ+7EZRYxzXF1E61h/HeGnd51QNdAGil2ve9GoAoc kYyhGsp28NIB1+gOAxIGt8gLlMFxKtHwb0/+wCjU2WbRXfbOrepFr5jK5bbtBckZGMqeMDP8zru 1Jt/umoD1up6rRIPZRvJuuLTu9WR3A0UKD+61LSfzHVnWgFWidBceC20KwMGvYs8PfVJLV/jAZK 3iuwkmXmdlybBS5MpEq5d2XxslU971o7FrPF6o8f47xcb8w4Q+I1lyWn0qRtCJ9HYY/2jwJDIeK ZhTsVzNsHXdYXfE3i+hcwp8Ku2sHLL5VpKlp4Cl8CXgyT7CEu57LqORHrW/8zjJAJU10N48hGg+ y07v/WsIO0q4eTwWsb1N+luHYKyW1vvra+/GFsPTPRLKYwNIT+nze6iSiXD3wb9auvi7MXInnnN ZxWb0Wf4ZNhoVNfMkN9hx86XFf2jwWnO5EsVTflccQEb2akEJkblePELsqNs3OOiWD2LN040IwX gkUXmLj5pt4joVw== 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 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/pmdomain/qcom/rpmpd.c b/drivers/pmdomain/qcom/rpmpd.c index 3fa6a0325fc0..2d47e3357f10 100644 --- a/drivers/pmdomain/qcom/rpmpd.c +++ b/drivers/pmdomain/qcom/rpmpd.c @@ -252,6 +252,20 @@ static struct rpmpd cx_s2b_vfc = { }; /* G(F)X */ +static struct rpmpd gfx_s7a_corner = { + .pd = { .name = "gfx", }, + .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, @@ -716,6 +730,20 @@ 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_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, @@ -910,6 +938,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 },