From nobody Wed Feb 11 20:03:07 2026 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 31038C61DA4 for ; Mon, 13 Mar 2023 20:00:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229797AbjCMUAr (ORCPT ); Mon, 13 Mar 2023 16:00:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230083AbjCMUAS (ORCPT ); Mon, 13 Mar 2023 16:00:18 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7321E738B7 for ; Mon, 13 Mar 2023 13:00:14 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id r27so17184567lfe.10 for ; Mon, 13 Mar 2023 13:00:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678737613; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=wVLgoHd5JRg28f+yh6JSFUHtXvcJzOao7oRBs3X+6SI=; b=l7YZPug7DZS32EIX8jDfsfrfcQWaFlddBm25jm86BggG4JTA/lhqLY5RtdBVUD32vI H/utAVFetq9kFczvfx+B2EERVQdvqfSTm0ev/TBwtbp9n2z41sAuKe1T23qJeQlAc5l9 Q+ctTuVEBOOXUKPDXkSIT3Qs1VFKj4VVLVCg3AJj71IpNhSu2mv+IQ4Uc+dGj3iMz/L7 KCv7miHVRXUCLbgycEmSrDHY1k3YL/bzfo+YTm/SQHow4GNLYbc391gNrsiSjLBXJRHa ZTJG5k9lfFVDVR8b0P4QcsUWzMQpeTmYUKVBAU0+MDXYWj/H556G7FRoBroegf0U4p7E sCuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678737613; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wVLgoHd5JRg28f+yh6JSFUHtXvcJzOao7oRBs3X+6SI=; b=GDUhodcoBE9Muhs92ZqNEN9iU9ecvbHhAJQqT3iV9eX4R1Q76/Kx5OfE0x8Or00Ffl 2vUEyO4iqppGhHb8lwRY1/Aj6V2cTnzZaTJz/6NLxDSWftCTkhdV7mnSQvGVW9bk77FK KrncOxFbvAYoQ0YTGaNWmhpx6JYwmFosEQqm4MdBxIorDeRDpjIeoe6N9UW4imzb5LN6 3+PGtDpfqKkZwrV0iwS4DO3ppgAz0zDmq3brNOKmZAFDtueNbQARdfQATEARnDRob2ko NOCUMmGb3rxKbCkLhnR/YXTXQF5V0LgTJhwBlJS/5AFVkWdUyDNBRpYJhOVJPKNRVGNu n1Pg== X-Gm-Message-State: AO0yUKUmGZZYPdgwbw+Jt1rpuGkA6KnQxGj+yuR58n7HDygu3JNuHWVF vLZ0fXWOobSuUul1Ec8osqk51w== X-Google-Smtp-Source: AK7set+OoMy9xLLCnPpnHWGXg4+7/Q/drbXxcqbnv608WzvS4CChE0qV4mG9CqkUlYGqdn/eT05nZw== X-Received: by 2002:a05:6512:4c7:b0:4e8:20f6:83f4 with SMTP id w7-20020a05651204c700b004e820f683f4mr6278101lfq.21.1678737612734; Mon, 13 Mar 2023 13:00:12 -0700 (PDT) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id w3-20020ac254a3000000b004cc800b1f2csm75431lfk.238.2023.03.13.13.00.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 13:00:12 -0700 (PDT) From: Konrad Dybcio Date: Mon, 13 Mar 2023 21:00:04 +0100 Subject: [PATCH v3 06/10] soc: qcom: rpmpd: Improve the naming MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230313-topic-rpmpd-v3-6-06a4f448ff90@linaro.org> References: <20230313-topic-rpmpd-v3-0-06a4f448ff90@linaro.org> In-Reply-To: <20230313-topic-rpmpd-v3-0-06a4f448ff90@linaro.org> To: Andy Gross , Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1678737603; l=26373; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=YPgvOib1w7EbBNa6mq+JUfbfGLE9w0c535k+nwrzZfQ=; b=zIrMyrFOipy+67hbIVhZ+ZMAL4ZbhKVGhT1+w6ubDSDhscC8qHRLcBtZlEwOYTaZuD5PgheLNCqo u79UDmIBDdcE+i2nKenwpTzJylgTuLFTG57XcHr0Wr/m63ZTVIVt X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that we aren't bound by the preprocessor macros, improve the naming to be a bit less preprocessor-y and touch up some rpmpd.pd.name fields while at it. Signed-off-by: Konrad Dybcio --- drivers/soc/qcom/rpmpd.c | 432 +++++++++++++++++++++++--------------------= ---- 1 file changed, 216 insertions(+), 216 deletions(-) diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/soc/qcom/rpmpd.c index df4e0d8a2aa9..695b2fc56f40 100644 --- a/drivers/soc/qcom/rpmpd.c +++ b/drivers/soc/qcom/rpmpd.c @@ -68,132 +68,132 @@ struct rpmpd_desc { static DEFINE_MUTEX(rpmpd_lock); =20 /* CX */ -static struct rpmpd RWCX0_LEVEL_cx_ao; -static struct rpmpd RWCX0_LEVEL_cx =3D { +static struct rpmpd cx_rwcx0_lvl_ao; +static struct rpmpd cx_rwcx0_lvl =3D { .pd =3D { .name =3D "cx", }, - .peer =3D &RWCX0_LEVEL_cx_ao, + .peer =3D &cx_rwcx0_lvl_ao, .res_type =3D RPMPD_RWCX, .res_id =3D 0, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd RWCX0_LEVEL_cx_ao =3D { +static struct rpmpd cx_rwcx0_lvl_ao =3D { .pd =3D { .name =3D "cx_ao", }, - .peer =3D &RWCX0_LEVEL_cx, + .peer =3D &cx_rwcx0_lvl, .active_only =3D true, .res_type =3D RPMPD_RWCX, .res_id =3D 0, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd SMPA1_CORNER_cx_ao; -static struct rpmpd SMPA1_CORNER_cx =3D { +static struct rpmpd cx_s1a_corner_ao; +static struct rpmpd cx_s1a_corner =3D { .pd =3D { .name =3D "cx", }, - .peer =3D &SMPA1_CORNER_cx_ao, + .peer =3D &cx_s1a_corner_ao, .res_type =3D RPMPD_SMPA, .res_id =3D 1, .key =3D KEY_CORNER, }; =20 -static struct rpmpd SMPA1_CORNER_cx_ao =3D { +static struct rpmpd cx_s1a_corner_ao =3D { .pd =3D { .name =3D "cx_ao", }, - .peer =3D &SMPA1_CORNER_cx, + .peer =3D &cx_s1a_corner, .active_only =3D true, .res_type =3D RPMPD_SMPA, .res_id =3D 1, .key =3D KEY_CORNER, }; =20 -static struct rpmpd SMPA2_CORNER_cx_ao; -static struct rpmpd SMPA2_CORNER_cx =3D { +static struct rpmpd cx_s2a_corner_ao; +static struct rpmpd cx_s2a_corner =3D { .pd =3D { .name =3D "cx", }, - .peer =3D &SMPA2_CORNER_cx_ao, + .peer =3D &cx_s2a_corner_ao, .res_type =3D RPMPD_SMPA, .res_id =3D 2, .key =3D KEY_CORNER, }; =20 -static struct rpmpd SMPA2_CORNER_cx_ao =3D { +static struct rpmpd cx_s2a_corner_ao =3D { .pd =3D { .name =3D "cx_ao", }, - .peer =3D &SMPA2_CORNER_cx, + .peer =3D &cx_s2a_corner, .active_only =3D true, .res_type =3D RPMPD_SMPA, .res_id =3D 2, .key =3D KEY_CORNER, }; =20 -static struct rpmpd SMPA2_LEVEL_cx_ao; -static struct rpmpd SMPA2_LEVEL_cx =3D { +static struct rpmpd cx_s2a_lvl_ao; +static struct rpmpd cx_s2a_lvl =3D { .pd =3D { .name =3D "cx", }, - .peer =3D &SMPA2_LEVEL_cx_ao, + .peer =3D &cx_s2a_lvl_ao, .res_type =3D RPMPD_SMPA, .res_id =3D 2, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd SMPA2_LEVEL_cx_ao =3D { +static struct rpmpd cx_s2a_lvl_ao =3D { .pd =3D { .name =3D "cx_ao", }, - .peer =3D &SMPA2_LEVEL_cx, + .peer =3D &cx_s2a_lvl, .active_only =3D true, .res_type =3D RPMPD_SMPA, .res_id =3D 2, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd SMPA3_LEVEL_cx_ao; -static struct rpmpd SMPA3_LEVEL_cx =3D { +static struct rpmpd cx_s3a_lvl_ao; +static struct rpmpd cx_s3a_lvl =3D { .pd =3D { .name =3D "cx", }, - .peer =3D &SMPA3_LEVEL_cx_ao, + .peer =3D &cx_s3a_lvl_ao, .res_type =3D RPMPD_SMPA, .res_id =3D 3, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd SMPA3_LEVEL_cx_ao =3D { +static struct rpmpd cx_s3a_lvl_ao =3D { .pd =3D { .name =3D "cx_ao", }, - .peer =3D &SMPA3_LEVEL_cx, + .peer =3D &cx_s3a_lvl, .active_only =3D true, .res_type =3D RPMPD_SMPA, .res_id =3D 3, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd RWCX0_cx_vfl =3D { +static struct rpmpd cx_rwcx0_vfl =3D { .pd =3D { .name =3D "cx_vfl", }, .res_type =3D RPMPD_RWCX, .res_id =3D 0, .key =3D KEY_FLOOR_LEVEL, }; =20 -static struct rpmpd RWSC2_cx_vfl =3D { +static struct rpmpd cx_rwsc2_vfl =3D { .pd =3D { .name =3D "cx_vfl", }, .res_type =3D RPMPD_RWSC, .res_id =3D 2, .key =3D KEY_FLOOR_LEVEL, }; =20 -static struct rpmpd SMPA1_cx_vfc =3D { +static struct rpmpd cx_s1a_vfc =3D { .pd =3D { .name =3D "cx_vfc", }, .res_type =3D RPMPD_SMPA, .res_id =3D 1, .key =3D KEY_FLOOR_CORNER, }; =20 -static struct rpmpd SMPA2_cx_vfc =3D { +static struct rpmpd cx_s2a_vfc =3D { .pd =3D { .name =3D "cx_vfc", }, .res_type =3D RPMPD_SMPA, .res_id =3D 2, .key =3D KEY_FLOOR_CORNER, }; =20 -static struct rpmpd SMPA2_cx_vfl =3D { +static struct rpmpd cx_s2a_vfl =3D { .pd =3D { .name =3D "cx_vfl", }, .res_type =3D RPMPD_SMPA, .res_id =3D 2, .key =3D KEY_FLOOR_LEVEL, }; =20 -static struct rpmpd SMPA3_cx_vfl =3D { +static struct rpmpd cx_s3a_vfl =3D { .pd =3D { .name =3D "cx_vfl", }, .res_type =3D RPMPD_SMPA, .res_id =3D 3, @@ -201,32 +201,32 @@ static struct rpmpd SMPA3_cx_vfl =3D { }; =20 /* G(F)X */ -static struct rpmpd SMPB2_gfx_corner =3D { +static struct rpmpd gfx_s2b_corner =3D { .pd =3D { .name =3D "gfx", }, .res_type =3D RPMPD_SMPB, .res_id =3D 2, .key =3D KEY_CORNER, }; =20 -static struct rpmpd SMPB2_gfx_vfc =3D { +static struct rpmpd gfx_s2b_vfc =3D { .pd =3D { .name =3D "gfx_vfc", }, .res_type =3D RPMPD_SMPB, .res_id =3D 2, .key =3D KEY_FLOOR_CORNER, }; =20 -static struct rpmpd RWGX0_LEVEL_gx_ao; -static struct rpmpd RWGX0_LEVEL_gx =3D { +static struct rpmpd gx_rwgx0_lvl_ao; +static struct rpmpd gx_rwgx0_lvl =3D { .pd =3D { .name =3D "gx", }, - .peer =3D &RWGX0_LEVEL_gx_ao, + .peer =3D &gx_rwgx0_lvl_ao, .res_type =3D RPMPD_RWGX, .res_id =3D 0, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd RWGX0_LEVEL_gx_ao =3D { +static struct rpmpd gx_rwgx0_lvl_ao =3D { .pd =3D { .name =3D "gx_ao", }, - .peer =3D &RWGX0_LEVEL_gx, + .peer =3D &gx_rwgx0_lvl, .active_only =3D true, .res_type =3D RPMPD_RWGX, .res_id =3D 0, @@ -234,129 +234,129 @@ static struct rpmpd RWGX0_LEVEL_gx_ao =3D { }; =20 /* MX */ -static struct rpmpd LDOA3_CORNER_mx_ao; -static struct rpmpd LDOA3_CORNER_mx =3D { +static struct rpmpd mx_l3a_corner_ao; +static struct rpmpd mx_l3a_corner =3D { .pd =3D { .name =3D "mx", }, - .peer =3D &LDOA3_CORNER_mx_ao, + .peer =3D &mx_l3a_corner_ao, .res_type =3D RPMPD_LDOA, .res_id =3D 3, .key =3D KEY_CORNER, }; =20 -static struct rpmpd LDOA3_CORNER_mx_ao =3D { +static struct rpmpd mx_l3a_corner_ao =3D { .pd =3D { .name =3D "mx_ao", }, - .peer =3D &LDOA3_CORNER_mx, + .peer =3D &mx_l3a_corner, .active_only =3D true, .res_type =3D RPMPD_LDOA, .res_id =3D 3, .key =3D KEY_CORNER, }; =20 -static struct rpmpd LDOA12_LEVEL_mx_ao; -static struct rpmpd LDOA12_LEVEL_mx =3D { +static struct rpmpd mx_l12a_lvl_ao; +static struct rpmpd mx_l12a_lvl =3D { .pd =3D { .name =3D "mx", }, - .peer =3D &LDOA12_LEVEL_mx_ao, + .peer =3D &mx_l12a_lvl_ao, .res_type =3D RPMPD_LDOA, .res_id =3D 12, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd LDOA12_LEVEL_mx_ao =3D { +static struct rpmpd mx_l12a_lvl_ao =3D { .pd =3D { .name =3D "mx_ao", }, - .peer =3D &LDOA12_LEVEL_mx, + .peer =3D &mx_l12a_lvl, .active_only =3D true, .res_type =3D RPMPD_LDOA, .res_id =3D 12, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd SMPA2_CORNER_mx_ao; -static struct rpmpd SMPA2_CORNER_mx =3D { +static struct rpmpd mx_s2a_corner_ao; +static struct rpmpd mx_s2a_corner =3D { .pd =3D { .name =3D "mx", }, - .peer =3D &SMPA2_CORNER_mx_ao, + .peer =3D &mx_s2a_corner_ao, .res_type =3D RPMPD_SMPA, .res_id =3D 2, .key =3D KEY_CORNER, }; =20 -static struct rpmpd SMPA2_CORNER_mx_ao =3D { +static struct rpmpd mx_s2a_corner_ao =3D { .pd =3D { .name =3D "mx_ao", }, - .peer =3D &SMPA2_CORNER_mx, + .peer =3D &mx_s2a_corner, .active_only =3D true, .res_type =3D RPMPD_SMPA, .res_id =3D 2, .key =3D KEY_CORNER, }; =20 -static struct rpmpd RWMX0_LEVEL_mx_ao; -static struct rpmpd RWMX0_LEVEL_mx =3D { +static struct rpmpd mx_rwmx0_lvl_ao; +static struct rpmpd mx_rwmx0_lvl =3D { .pd =3D { .name =3D "mx", }, - .peer =3D &RWMX0_LEVEL_mx_ao, + .peer =3D &mx_rwmx0_lvl_ao, .res_type =3D RPMPD_RWMX, .res_id =3D 0, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd RWMX0_LEVEL_mx_ao =3D { +static struct rpmpd mx_rwmx0_lvl_ao =3D { .pd =3D { .name =3D "mx_ao", }, - .peer =3D &RWMX0_LEVEL_mx, + .peer =3D &mx_rwmx0_lvl, .active_only =3D true, .res_type =3D RPMPD_RWMX, .res_id =3D 0, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd SMPA6_LEVEL_mx_ao; -static struct rpmpd SMPA6_LEVEL_mx =3D { +static struct rpmpd mx_s6a_lvl_ao; +static struct rpmpd mx_s6a_lvl =3D { .pd =3D { .name =3D "mx", }, - .peer =3D &SMPA6_LEVEL_mx_ao, + .peer =3D &mx_s6a_lvl_ao, .res_type =3D RPMPD_SMPA, .res_id =3D 6, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd SMPA6_LEVEL_mx_ao =3D { +static struct rpmpd mx_s6a_lvl_ao =3D { .pd =3D { .name =3D "mx_ao", }, - .peer =3D &SMPA6_LEVEL_mx, + .peer =3D &mx_s6a_lvl, .active_only =3D true, .res_type =3D RPMPD_SMPA, .res_id =3D 6, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd SMPA7_LEVEL_mx_ao; -static struct rpmpd SMPA7_LEVEL_mx =3D { +static struct rpmpd mx_s7a_lvl_ao; +static struct rpmpd mx_s7a_lvl =3D { .pd =3D { .name =3D "mx", }, - .peer =3D &SMPA7_LEVEL_mx_ao, + .peer =3D &mx_s7a_lvl_ao, .res_type =3D RPMPD_SMPA, .res_id =3D 7, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd SMPA7_LEVEL_mx_ao =3D { +static struct rpmpd mx_s7a_lvl_ao =3D { .pd =3D { .name =3D "mx_ao", }, - .peer =3D &SMPA7_LEVEL_mx, + .peer =3D &mx_s7a_lvl, .active_only =3D true, .res_type =3D RPMPD_SMPA, .res_id =3D 7, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd LDOA12_mx_vfl =3D { +static struct rpmpd mx_l12a_vfl =3D { .pd =3D { .name =3D "mx_vfl", }, .res_type =3D RPMPD_LDOA, .res_id =3D 12, .key =3D KEY_FLOOR_LEVEL, }; =20 -static struct rpmpd RWMX0_mx_vfl =3D { +static struct rpmpd mx_rwmx0_vfl =3D { .pd =3D { .name =3D "mx_vfl", }, .res_type =3D RPMPD_RWMX, .res_id =3D 0, .key =3D KEY_FLOOR_LEVEL, }; =20 -static struct rpmpd RWSM6_mx_vfl =3D { +static struct rpmpd mx_rwsm6_vfl =3D { .pd =3D { .name =3D "mx_vfl", }, .res_type =3D RPMPD_RWSM, .res_id =3D 6, @@ -364,43 +364,43 @@ static struct rpmpd RWSM6_mx_vfl =3D { }; =20 /* MD */ -static struct rpmpd SMPA1_CORNER_md_ao; -static struct rpmpd SMPA1_CORNER_md =3D { +static struct rpmpd md_s1a_corner_ao; +static struct rpmpd md_s1a_corner =3D { .pd =3D { .name =3D "md", }, - .peer =3D &SMPA1_CORNER_md_ao, + .peer =3D &md_s1a_corner_ao, .res_type =3D RPMPD_SMPA, .res_id =3D 1, .key =3D KEY_CORNER, }; =20 -static struct rpmpd SMPA1_CORNER_md_ao =3D { +static struct rpmpd md_s1a_corner_ao =3D { .pd =3D { .name =3D "md_ao", }, - .peer =3D &SMPA1_CORNER_md, + .peer =3D &md_s1a_corner, .active_only =3D true, .res_type =3D RPMPD_SMPA, .res_id =3D 1, .key =3D KEY_CORNER, }; =20 -static struct rpmpd SMPA1_LEVEL_md_ao; -static struct rpmpd SMPA1_LEVEL_md =3D { +static struct rpmpd md_s1a_lvl_ao; +static struct rpmpd md_s1a_lvl =3D { .pd =3D { .name =3D "md", }, - .peer =3D &SMPA1_LEVEL_md_ao, + .peer =3D &md_s1a_lvl_ao, .res_type =3D RPMPD_SMPA, .res_id =3D 1, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd SMPA1_LEVEL_md_ao =3D { +static struct rpmpd md_s1a_lvl_ao =3D { .pd =3D { .name =3D "md_ao", }, - .peer =3D &SMPA1_LEVEL_md, + .peer =3D &md_s1a_lvl, .active_only =3D true, .res_type =3D RPMPD_SMPA, .res_id =3D 1, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd SMPA1_md_vfc =3D { +static struct rpmpd md_s1a_vfc =3D { .pd =3D { .name =3D "md_vfc", }, .res_type =3D RPMPD_SMPA, .res_id =3D 1, @@ -408,102 +408,102 @@ static struct rpmpd SMPA1_md_vfc =3D { }; =20 /* LPI_CX */ -static struct rpmpd RWLC0_lpi_cx_lvl =3D { +static struct rpmpd lpi_cx_rwlc0_lvl =3D { .pd =3D { .name =3D "lpi_cx", }, .res_type =3D RPMPD_RWLC, .res_id =3D 0, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd RWLC0_lpicx_vfl =3D { - .pd =3D { .name =3D "lpicx_vfl", }, +static struct rpmpd lpi_cx_rwlc0_vfl =3D { + .pd =3D { .name =3D "lpi_cx_vfl", }, .res_type =3D RPMPD_RWLC, .res_id =3D 0, .key =3D KEY_FLOOR_LEVEL, }; =20 /* LPI_MX */ -static struct rpmpd RWLM0_lpi_mx_lvl =3D { +static struct rpmpd lpi_mx_rwlm0_lvl =3D { .pd =3D { .name =3D "lpi_mx", }, .res_type =3D RPMPD_RWLM, .res_id =3D 0, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd RWLM0_lpimx_vfl =3D { - .pd =3D { .name =3D "lpimx_vfl", }, +static struct rpmpd lpi_mx_rwlm0_vfl =3D { + .pd =3D { .name =3D "lpi_mx_vfl", }, .res_type =3D RPMPD_RWLM, .res_id =3D 0, .key =3D KEY_FLOOR_LEVEL, }; =20 /* SSC_CX */ -static struct rpmpd LDOA26_sscx_corner =3D { - .pd =3D { .name =3D "sscx", }, +static struct rpmpd ssc_cx_l26a_corner =3D { + .pd =3D { .name =3D "ssc_cx", }, .res_type =3D RPMPD_LDOA, .res_id =3D 26, .key =3D KEY_CORNER, }; =20 -static struct rpmpd RWLC0_ssccx_lvl =3D { - .pd =3D { .name =3D "ssccx", }, +static struct rpmpd ssc_cx_rwlc0_lvl =3D { + .pd =3D { .name =3D "ssc_cx", }, .res_type =3D RPMPD_RWLC, .res_id =3D 0, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd RWSC0_ssccx_lvl =3D { - .pd =3D { .name =3D "ssccx", }, +static struct rpmpd ssc_cx_rwsc0_lvl =3D { + .pd =3D { .name =3D "ssc_cx", }, .res_type =3D RPMPD_RWSC, .res_id =3D 0, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd LDOA26_sscx_vfc =3D { - .pd =3D { .name =3D "sscx_vfc", }, +static struct rpmpd ssc_cx_l26a_vfc =3D { + .pd =3D { .name =3D "ssc_cx_vfc", }, .res_type =3D RPMPD_LDOA, .res_id =3D 26, .key =3D KEY_FLOOR_CORNER, }; =20 -static struct rpmpd RWLC0_ssccx_vfl =3D { - .pd =3D { .name =3D "ssccx_vfl", }, +static struct rpmpd ssc_cx_rwlc0_vfl =3D { + .pd =3D { .name =3D "ssc_cx_vfl", }, .res_type =3D RPMPD_RWLC, .res_id =3D 0, .key =3D KEY_FLOOR_LEVEL, }; =20 -static struct rpmpd RWSC0_ssccx_vfl =3D { - .pd =3D { .name =3D "ssccx_vfl", }, +static struct rpmpd ssc_cx_rwsc0_vfl =3D { + .pd =3D { .name =3D "ssc_cx_vfl", }, .res_type =3D RPMPD_RWSC, .res_id =3D 0, .key =3D KEY_FLOOR_LEVEL, }; =20 /* SSC_MX */ -static struct rpmpd RWLM0_sscmx_lvl =3D { - .pd =3D { .name =3D "sscmx", }, +static struct rpmpd ssc_mx_rwlm0_lvl =3D { + .pd =3D { .name =3D "ssc_mx", }, .res_type =3D RPMPD_RWLM, .res_id =3D 0, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd RWSM0_sscmx_lvl =3D { - .pd =3D { .name =3D "sscmx", }, +static struct rpmpd ssc_mx_rwsm0_lvl =3D { + .pd =3D { .name =3D "ssc_mx", }, .res_type =3D RPMPD_RWSM, .res_id =3D 0, .key =3D KEY_LEVEL, }; =20 -static struct rpmpd RWLM0_sscmx_vfl =3D { - .pd =3D { .name =3D "sscmx_vfl", }, +static struct rpmpd ssc_mx_rwlm0_vfl =3D { + .pd =3D { .name =3D "ssc_mx_vfl", }, .res_type =3D RPMPD_RWLM, .res_id =3D 0, .key =3D KEY_FLOOR_LEVEL, }; =20 -static struct rpmpd RWSM0_sscmx_vfl =3D { - .pd =3D { .name =3D "sscmx_vfl", }, +static struct rpmpd ssc_mx_rwsm0_vfl =3D { + .pd =3D { .name =3D "ssc_mx_vfl", }, .res_type =3D RPMPD_RWSM, .res_id =3D 0, .key =3D KEY_FLOOR_LEVEL, @@ -511,12 +511,12 @@ static struct rpmpd RWSM0_sscmx_vfl =3D { =20 /* mdm9607 RPM Power Domains */ static struct rpmpd *mdm9607_rpmpds[] =3D { - [MDM9607_VDDCX] =3D &SMPA3_LEVEL_cx, - [MDM9607_VDDCX_AO] =3D &SMPA3_LEVEL_cx_ao, - [MDM9607_VDDCX_VFL] =3D &SMPA3_cx_vfl, - [MDM9607_VDDMX] =3D &LDOA12_LEVEL_mx, - [MDM9607_VDDMX_AO] =3D &LDOA12_LEVEL_mx_ao, - [MDM9607_VDDMX_VFL] =3D &LDOA12_mx_vfl, + [MDM9607_VDDCX] =3D &cx_s3a_lvl, + [MDM9607_VDDCX_AO] =3D &cx_s3a_lvl_ao, + [MDM9607_VDDCX_VFL] =3D &cx_s3a_vfl, + [MDM9607_VDDMX] =3D &mx_l12a_lvl, + [MDM9607_VDDMX_AO] =3D &mx_l12a_lvl_ao, + [MDM9607_VDDMX_VFL] =3D &mx_l12a_vfl, }; =20 static const struct rpmpd_desc mdm9607_desc =3D { @@ -527,9 +527,9 @@ static const struct rpmpd_desc mdm9607_desc =3D { =20 /* msm8226 RPM Power Domains */ static struct rpmpd *msm8226_rpmpds[] =3D { - [MSM8226_VDDCX] =3D &SMPA1_CORNER_cx, - [MSM8226_VDDCX_AO] =3D &SMPA1_CORNER_cx_ao, - [MSM8226_VDDCX_VFC] =3D &SMPA1_cx_vfc, + [MSM8226_VDDCX] =3D &cx_s1a_corner, + [MSM8226_VDDCX_AO] =3D &cx_s1a_corner_ao, + [MSM8226_VDDCX_VFC] =3D &cx_s1a_vfc, }; =20 static const struct rpmpd_desc msm8226_desc =3D { @@ -540,14 +540,14 @@ static const struct rpmpd_desc msm8226_desc =3D { =20 /* msm8939 RPM Power Domains */ static struct rpmpd *msm8939_rpmpds[] =3D { - [MSM8939_VDDMDCX] =3D &SMPA1_CORNER_md, - [MSM8939_VDDMDCX_AO] =3D &SMPA1_CORNER_md_ao, - [MSM8939_VDDMDCX_VFC] =3D &SMPA1_md_vfc, - [MSM8939_VDDCX] =3D &SMPA2_CORNER_cx, - [MSM8939_VDDCX_AO] =3D &SMPA2_CORNER_cx_ao, - [MSM8939_VDDCX_VFC] =3D &SMPA2_cx_vfc, - [MSM8939_VDDMX] =3D &LDOA3_CORNER_mx, - [MSM8939_VDDMX_AO] =3D &LDOA3_CORNER_mx_ao, + [MSM8939_VDDMDCX] =3D &md_s1a_corner, + [MSM8939_VDDMDCX_AO] =3D &md_s1a_corner_ao, + [MSM8939_VDDMDCX_VFC] =3D &md_s1a_vfc, + [MSM8939_VDDCX] =3D &cx_s2a_corner, + [MSM8939_VDDCX_AO] =3D &cx_s2a_corner_ao, + [MSM8939_VDDCX_VFC] =3D &cx_s2a_vfc, + [MSM8939_VDDMX] =3D &mx_l3a_corner, + [MSM8939_VDDMX_AO] =3D &mx_l3a_corner_ao, }; =20 static const struct rpmpd_desc msm8939_desc =3D { @@ -558,11 +558,11 @@ static const struct rpmpd_desc msm8939_desc =3D { =20 /* msm8916 RPM Power Domains */ static struct rpmpd *msm8916_rpmpds[] =3D { - [MSM8916_VDDCX] =3D &SMPA1_CORNER_cx, - [MSM8916_VDDCX_AO] =3D &SMPA1_CORNER_cx_ao, - [MSM8916_VDDCX_VFC] =3D &SMPA1_cx_vfc, - [MSM8916_VDDMX] =3D &LDOA3_CORNER_mx, - [MSM8916_VDDMX_AO] =3D &LDOA3_CORNER_mx_ao, + [MSM8916_VDDCX] =3D &cx_s1a_corner, + [MSM8916_VDDCX_AO] =3D &cx_s1a_corner_ao, + [MSM8916_VDDCX_VFC] =3D &cx_s1a_vfc, + [MSM8916_VDDMX] =3D &mx_l3a_corner, + [MSM8916_VDDMX_AO] =3D &mx_l3a_corner_ao, }; =20 static const struct rpmpd_desc msm8916_desc =3D { @@ -573,13 +573,13 @@ static const struct rpmpd_desc msm8916_desc =3D { =20 /* msm8953 RPM Power Domains */ static struct rpmpd *msm8953_rpmpds[] =3D { - [MSM8953_VDDMD] =3D &SMPA1_LEVEL_md, - [MSM8953_VDDMD_AO] =3D &SMPA1_LEVEL_md_ao, - [MSM8953_VDDCX] =3D &SMPA2_LEVEL_cx, - [MSM8953_VDDCX_AO] =3D &SMPA2_LEVEL_cx_ao, - [MSM8953_VDDCX_VFL] =3D &SMPA2_cx_vfl, - [MSM8953_VDDMX] =3D &SMPA7_LEVEL_mx, - [MSM8953_VDDMX_AO] =3D &SMPA7_LEVEL_mx_ao, + [MSM8953_VDDMD] =3D &md_s1a_lvl, + [MSM8953_VDDMD_AO] =3D &md_s1a_lvl_ao, + [MSM8953_VDDCX] =3D &cx_s2a_lvl, + [MSM8953_VDDCX_AO] =3D &cx_s2a_lvl_ao, + [MSM8953_VDDCX_VFL] =3D &cx_s2a_vfl, + [MSM8953_VDDMX] =3D &mx_s7a_lvl, + [MSM8953_VDDMX_AO] =3D &mx_s7a_lvl_ao, }; =20 static const struct rpmpd_desc msm8953_desc =3D { @@ -590,12 +590,12 @@ static const struct rpmpd_desc msm8953_desc =3D { =20 /* msm8976 RPM Power Domains */ static struct rpmpd *msm8976_rpmpds[] =3D { - [MSM8976_VDDCX] =3D &SMPA2_LEVEL_cx, - [MSM8976_VDDCX_AO] =3D &SMPA2_LEVEL_cx_ao, - [MSM8976_VDDCX_VFL] =3D &RWSC2_cx_vfl, - [MSM8976_VDDMX] =3D &SMPA6_LEVEL_mx, - [MSM8976_VDDMX_AO] =3D &SMPA6_LEVEL_mx_ao, - [MSM8976_VDDMX_VFL] =3D &RWSM6_mx_vfl, + [MSM8976_VDDCX] =3D &cx_s2a_lvl, + [MSM8976_VDDCX_AO] =3D &cx_s2a_lvl_ao, + [MSM8976_VDDCX_VFL] =3D &cx_rwsc2_vfl, + [MSM8976_VDDMX] =3D &mx_s6a_lvl, + [MSM8976_VDDMX_AO] =3D &mx_s6a_lvl_ao, + [MSM8976_VDDMX_VFL] =3D &mx_rwsm6_vfl, }; =20 static const struct rpmpd_desc msm8976_desc =3D { @@ -606,15 +606,15 @@ static const struct rpmpd_desc msm8976_desc =3D { =20 /* msm8994 RPM Power domains */ static struct rpmpd *msm8994_rpmpds[] =3D { - [MSM8994_VDDCX] =3D &SMPA1_CORNER_cx, - [MSM8994_VDDCX_AO] =3D &SMPA1_CORNER_cx_ao, - [MSM8994_VDDCX_VFC] =3D &SMPA1_cx_vfc, - [MSM8994_VDDMX] =3D &SMPA2_CORNER_mx, - [MSM8994_VDDMX_AO] =3D &SMPA2_CORNER_mx_ao, + [MSM8994_VDDCX] =3D &cx_s1a_corner, + [MSM8994_VDDCX_AO] =3D &cx_s1a_corner_ao, + [MSM8994_VDDCX_VFC] =3D &cx_s1a_vfc, + [MSM8994_VDDMX] =3D &mx_s2a_corner, + [MSM8994_VDDMX_AO] =3D &mx_s2a_corner_ao, =20 /* Attention! *Some* 8994 boards with pm8004 may use SMPC here! */ - [MSM8994_VDDGFX] =3D &SMPB2_gfx_corner, - [MSM8994_VDDGFX_VFC] =3D &SMPB2_gfx_vfc, + [MSM8994_VDDGFX] =3D &gfx_s2b_corner, + [MSM8994_VDDGFX_VFC] =3D &gfx_s2b_vfc, }; =20 static const struct rpmpd_desc msm8994_desc =3D { @@ -625,13 +625,13 @@ static const struct rpmpd_desc msm8994_desc =3D { =20 /* msm8996 RPM Power domains */ static struct rpmpd *msm8996_rpmpds[] =3D { - [MSM8996_VDDCX] =3D &SMPA1_CORNER_cx, - [MSM8996_VDDCX_AO] =3D &SMPA1_CORNER_cx_ao, - [MSM8996_VDDCX_VFC] =3D &SMPA1_cx_vfc, - [MSM8996_VDDMX] =3D &SMPA2_CORNER_mx, - [MSM8996_VDDMX_AO] =3D &SMPA2_CORNER_mx_ao, - [MSM8996_VDDSSCX] =3D &LDOA26_sscx_corner, - [MSM8996_VDDSSCX_VFC] =3D &LDOA26_sscx_vfc, + [MSM8996_VDDCX] =3D &cx_s1a_corner, + [MSM8996_VDDCX_AO] =3D &cx_s1a_corner_ao, + [MSM8996_VDDCX_VFC] =3D &cx_s1a_vfc, + [MSM8996_VDDMX] =3D &mx_s2a_corner, + [MSM8996_VDDMX_AO] =3D &mx_s2a_corner_ao, + [MSM8996_VDDSSCX] =3D &ssc_cx_l26a_corner, + [MSM8996_VDDSSCX_VFC] =3D &ssc_cx_l26a_vfc, }; =20 static const struct rpmpd_desc msm8996_desc =3D { @@ -642,16 +642,16 @@ static const struct rpmpd_desc msm8996_desc =3D { =20 /* msm8998 RPM Power domains */ static struct rpmpd *msm8998_rpmpds[] =3D { - [MSM8998_VDDCX] =3D &RWCX0_LEVEL_cx, - [MSM8998_VDDCX_AO] =3D &RWCX0_LEVEL_cx_ao, - [MSM8998_VDDCX_VFL] =3D &RWCX0_cx_vfl, - [MSM8998_VDDMX] =3D &RWMX0_LEVEL_mx, - [MSM8998_VDDMX_AO] =3D &RWMX0_LEVEL_mx_ao, - [MSM8998_VDDMX_VFL] =3D &RWMX0_mx_vfl, - [MSM8998_SSCCX] =3D &RWSC0_ssccx_lvl, - [MSM8998_SSCCX_VFL] =3D &RWSC0_ssccx_vfl, - [MSM8998_SSCMX] =3D &RWSM0_sscmx_lvl, - [MSM8998_SSCMX_VFL] =3D &RWSM0_sscmx_vfl, + [MSM8998_VDDCX] =3D &cx_rwcx0_lvl, + [MSM8998_VDDCX_AO] =3D &cx_rwcx0_lvl_ao, + [MSM8998_VDDCX_VFL] =3D &cx_rwcx0_vfl, + [MSM8998_VDDMX] =3D &mx_rwmx0_lvl, + [MSM8998_VDDMX_AO] =3D &mx_rwmx0_lvl_ao, + [MSM8998_VDDMX_VFL] =3D &mx_rwmx0_vfl, + [MSM8998_SSCCX] =3D &ssc_cx_rwsc0_lvl, + [MSM8998_SSCCX_VFL] =3D &ssc_cx_rwsc0_vfl, + [MSM8998_SSCMX] =3D &ssc_mx_rwsm0_lvl, + [MSM8998_SSCMX_VFL] =3D &ssc_mx_rwsm0_vfl, }; =20 static const struct rpmpd_desc msm8998_desc =3D { @@ -662,13 +662,13 @@ static const struct rpmpd_desc msm8998_desc =3D { =20 /* qcs404 RPM Power domains */ static struct rpmpd *qcs404_rpmpds[] =3D { - [QCS404_VDDMX] =3D &RWMX0_LEVEL_mx, - [QCS404_VDDMX_AO] =3D &RWMX0_LEVEL_mx_ao, - [QCS404_VDDMX_VFL] =3D &RWMX0_mx_vfl, - [QCS404_LPICX] =3D &RWLC0_lpi_cx_lvl, - [QCS404_LPICX_VFL] =3D &RWLC0_lpicx_vfl, - [QCS404_LPIMX] =3D &RWLM0_lpi_mx_lvl, - [QCS404_LPIMX_VFL] =3D &RWLM0_lpimx_vfl, + [QCS404_VDDMX] =3D &mx_rwmx0_lvl, + [QCS404_VDDMX_AO] =3D &mx_rwmx0_lvl_ao, + [QCS404_VDDMX_VFL] =3D &mx_rwmx0_vfl, + [QCS404_LPICX] =3D &lpi_cx_rwlc0_lvl, + [QCS404_LPICX_VFL] =3D &lpi_cx_rwlc0_vfl, + [QCS404_LPIMX] =3D &lpi_mx_rwlm0_lvl, + [QCS404_LPIMX_VFL] =3D &lpi_mx_rwlm0_vfl, }; =20 static const struct rpmpd_desc qcs404_desc =3D { @@ -679,16 +679,16 @@ static const struct rpmpd_desc qcs404_desc =3D { =20 /* sdm660 RPM Power domains */ static struct rpmpd *sdm660_rpmpds[] =3D { - [SDM660_VDDCX] =3D &RWCX0_LEVEL_cx, - [SDM660_VDDCX_AO] =3D &RWCX0_LEVEL_cx_ao, - [SDM660_VDDCX_VFL] =3D &RWCX0_cx_vfl, - [SDM660_VDDMX] =3D &RWMX0_LEVEL_mx, - [SDM660_VDDMX_AO] =3D &RWMX0_LEVEL_mx_ao, - [SDM660_VDDMX_VFL] =3D &RWMX0_mx_vfl, - [SDM660_SSCCX] =3D &RWLC0_ssccx_lvl, - [SDM660_SSCCX_VFL] =3D &RWLC0_ssccx_vfl, - [SDM660_SSCMX] =3D &RWLM0_sscmx_lvl, - [SDM660_SSCMX_VFL] =3D &RWLM0_sscmx_vfl, + [SDM660_VDDCX] =3D &cx_rwcx0_lvl, + [SDM660_VDDCX_AO] =3D &cx_rwcx0_lvl_ao, + [SDM660_VDDCX_VFL] =3D &cx_rwcx0_vfl, + [SDM660_VDDMX] =3D &mx_rwmx0_lvl, + [SDM660_VDDMX_AO] =3D &mx_rwmx0_lvl_ao, + [SDM660_VDDMX_VFL] =3D &mx_rwmx0_vfl, + [SDM660_SSCCX] =3D &ssc_cx_rwlc0_lvl, + [SDM660_SSCCX_VFL] =3D &ssc_cx_rwlc0_vfl, + [SDM660_SSCMX] =3D &ssc_mx_rwlm0_lvl, + [SDM660_SSCMX_VFL] =3D &ssc_mx_rwlm0_vfl, }; =20 static const struct rpmpd_desc sdm660_desc =3D { @@ -699,14 +699,14 @@ static const struct rpmpd_desc sdm660_desc =3D { =20 /* sm4250/6115 RPM Power domains */ static struct rpmpd *sm6115_rpmpds[] =3D { - [SM6115_VDDCX] =3D &RWCX0_LEVEL_cx, - [SM6115_VDDCX_AO] =3D &RWCX0_LEVEL_cx_ao, - [SM6115_VDDCX_VFL] =3D &RWCX0_cx_vfl, - [SM6115_VDDMX] =3D &RWMX0_LEVEL_mx, - [SM6115_VDDMX_AO] =3D &RWMX0_LEVEL_mx_ao, - [SM6115_VDDMX_VFL] =3D &RWMX0_mx_vfl, - [SM6115_VDD_LPI_CX] =3D &RWLC0_lpi_cx_lvl, - [SM6115_VDD_LPI_MX] =3D &RWLM0_lpi_mx_lvl, + [SM6115_VDDCX] =3D &cx_rwcx0_lvl, + [SM6115_VDDCX_AO] =3D &cx_rwcx0_lvl_ao, + [SM6115_VDDCX_VFL] =3D &cx_rwcx0_vfl, + [SM6115_VDDMX] =3D &mx_rwmx0_lvl, + [SM6115_VDDMX_AO] =3D &mx_rwmx0_lvl_ao, + [SM6115_VDDMX_VFL] =3D &mx_rwmx0_vfl, + [SM6115_VDD_LPI_CX] =3D &lpi_cx_rwlc0_lvl, + [SM6115_VDD_LPI_MX] =3D &lpi_mx_rwlm0_lvl, }; =20 static const struct rpmpd_desc sm6115_desc =3D { @@ -717,12 +717,12 @@ static const struct rpmpd_desc sm6115_desc =3D { =20 /* sm6125 RPM Power domains */ static struct rpmpd *sm6125_rpmpds[] =3D { - [SM6125_VDDCX] =3D &RWCX0_LEVEL_cx, - [SM6125_VDDCX_AO] =3D &RWCX0_LEVEL_cx_ao, - [SM6125_VDDCX_VFL] =3D &RWCX0_cx_vfl, - [SM6125_VDDMX] =3D &RWMX0_LEVEL_mx, - [SM6125_VDDMX_AO] =3D &RWMX0_LEVEL_mx_ao, - [SM6125_VDDMX_VFL] =3D &RWMX0_mx_vfl, + [SM6125_VDDCX] =3D &cx_rwcx0_lvl, + [SM6125_VDDCX_AO] =3D &cx_rwcx0_lvl_ao, + [SM6125_VDDCX_VFL] =3D &cx_rwcx0_vfl, + [SM6125_VDDMX] =3D &mx_rwmx0_lvl, + [SM6125_VDDMX_AO] =3D &mx_rwmx0_lvl_ao, + [SM6125_VDDMX_VFL] =3D &mx_rwmx0_vfl, }; =20 static const struct rpmpd_desc sm6125_desc =3D { @@ -732,16 +732,16 @@ static const struct rpmpd_desc sm6125_desc =3D { }; =20 static struct rpmpd *sm6375_rpmpds[] =3D { - [SM6375_VDDCX] =3D &RWCX0_LEVEL_cx, - [SM6375_VDDCX_AO] =3D &RWCX0_LEVEL_cx_ao, - [SM6375_VDDCX_VFL] =3D &RWCX0_cx_vfl, - [SM6375_VDDMX] =3D &RWMX0_LEVEL_mx, - [SM6375_VDDMX_AO] =3D &RWMX0_LEVEL_mx_ao, - [SM6375_VDDMX_VFL] =3D &RWMX0_mx_vfl, - [SM6375_VDDGX] =3D &RWGX0_LEVEL_gx, - [SM6375_VDDGX_AO] =3D &RWGX0_LEVEL_gx_ao, - [SM6375_VDD_LPI_CX] =3D &RWLC0_lpi_cx_lvl, - [SM6375_VDD_LPI_MX] =3D &RWLM0_lpi_mx_lvl, + [SM6375_VDDCX] =3D &cx_rwcx0_lvl, + [SM6375_VDDCX_AO] =3D &cx_rwcx0_lvl_ao, + [SM6375_VDDCX_VFL] =3D &cx_rwcx0_vfl, + [SM6375_VDDMX] =3D &mx_rwmx0_lvl, + [SM6375_VDDMX_AO] =3D &mx_rwmx0_lvl_ao, + [SM6375_VDDMX_VFL] =3D &mx_rwmx0_vfl, + [SM6375_VDDGX] =3D &gx_rwgx0_lvl, + [SM6375_VDDGX_AO] =3D &gx_rwgx0_lvl_ao, + [SM6375_VDD_LPI_CX] =3D &lpi_cx_rwlc0_lvl, + [SM6375_VDD_LPI_MX] =3D &lpi_mx_rwlm0_lvl, }; =20 static const struct rpmpd_desc sm6375_desc =3D { @@ -751,14 +751,14 @@ static const struct rpmpd_desc sm6375_desc =3D { }; =20 static struct rpmpd *qcm2290_rpmpds[] =3D { - [QCM2290_VDDCX] =3D &RWCX0_LEVEL_cx, - [QCM2290_VDDCX_AO] =3D &RWCX0_LEVEL_cx_ao, - [QCM2290_VDDCX_VFL] =3D &RWCX0_cx_vfl, - [QCM2290_VDDMX] =3D &RWMX0_LEVEL_mx, - [QCM2290_VDDMX_AO] =3D &RWMX0_LEVEL_mx_ao, - [QCM2290_VDDMX_VFL] =3D &RWMX0_mx_vfl, - [QCM2290_VDD_LPI_CX] =3D &RWLC0_lpi_cx_lvl, - [QCM2290_VDD_LPI_MX] =3D &RWLM0_lpi_mx_lvl, + [QCM2290_VDDCX] =3D &cx_rwcx0_lvl, + [QCM2290_VDDCX_AO] =3D &cx_rwcx0_lvl_ao, + [QCM2290_VDDCX_VFL] =3D &cx_rwcx0_vfl, + [QCM2290_VDDMX] =3D &mx_rwmx0_lvl, + [QCM2290_VDDMX_AO] =3D &mx_rwmx0_lvl_ao, + [QCM2290_VDDMX_VFL] =3D &mx_rwmx0_vfl, + [QCM2290_VDD_LPI_CX] =3D &lpi_cx_rwlc0_lvl, + [QCM2290_VDD_LPI_MX] =3D &lpi_mx_rwlm0_lvl, }; =20 static const struct rpmpd_desc qcm2290_desc =3D { --=20 2.39.2