Commit 31f799ae authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Ulf Hansson
Browse files

pmdomain: qcom: rpmpd: switch to RPMPD_* indices 



Use generic RPMPD_* defines for power domain instead of using
platform-specific defines for the platforms that use shared indices.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20250718-rework-rpmhpd-rpmpd-v1-4-eedca108e540@oss.qualcomm.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 94838f38

drivers/pmdomain/qcom/rpmpd.c

+56 −56
Original line number Diff line number Diff line
@@ -631,12 +631,12 @@ static struct rpmpd ssc_mx_rwsm0_vfl = { 
};



static struct rpmpd *mdm9607_rpmpds[] = {

	[MDM9607_VDDCX] =	&cx_s3a_lvl,

	[MDM9607_VDDCX_AO] =	&cx_s3a_lvl_ao,

	[MDM9607_VDDCX_VFL] =	&cx_s3a_vfl,

	[MDM9607_VDDMX] =	&mx_l12a_lvl,

	[MDM9607_VDDMX_AO] =	&mx_l12a_lvl_ao,

	[MDM9607_VDDMX_VFL] =	&mx_l12a_vfl,

	[RPMPD_VDDCX] =		&cx_s3a_lvl,

	[RPMPD_VDDCX_AO] =	&cx_s3a_lvl_ao,

	[RPMPD_VDDCX_VFL] =	&cx_s3a_vfl,

	[RPMPD_VDDMX] =		&mx_l12a_lvl,

	[RPMPD_VDDMX_AO] =	&mx_l12a_lvl_ao,

	[RPMPD_VDDMX_VFL] =	&mx_l12a_vfl,

};



static const struct rpmpd_desc mdm9607_desc = {
@@ -646,9 +646,9 @@ static const struct rpmpd_desc mdm9607_desc = { 
};



static struct rpmpd *msm8226_rpmpds[] = {

	[MSM8226_VDDCX] =	&cx_s1a_corner,

	[MSM8226_VDDCX_AO] =	&cx_s1a_corner_ao,

	[MSM8226_VDDCX_VFC] =	&cx_s1a_vfc,

	[RPMPD_VDDCX] =		&cx_s1a_corner,

	[RPMPD_VDDCX_AO] =	&cx_s1a_corner_ao,

	[RPMPD_VDDCX_VFC] =	&cx_s1a_vfc,

};



static const struct rpmpd_desc msm8226_desc = {
@@ -675,11 +675,11 @@ static const struct rpmpd_desc msm8939_desc = { 
};



static struct rpmpd *msm8916_rpmpds[] = {

	[MSM8916_VDDCX] =	&cx_s1a_corner,

	[MSM8916_VDDCX_AO] =	&cx_s1a_corner_ao,

	[MSM8916_VDDCX_VFC] =	&cx_s1a_vfc,

	[MSM8916_VDDMX] =	&mx_l3a_corner,

	[MSM8916_VDDMX_AO] =	&mx_l3a_corner_ao,

	[RPMPD_VDDCX] =		&cx_s1a_corner,

	[RPMPD_VDDCX_AO] =	&cx_s1a_corner_ao,

	[RPMPD_VDDCX_VFC] =	&cx_s1a_vfc,

	[RPMPD_VDDMX] =		&mx_l3a_corner,

	[RPMPD_VDDMX_AO] =	&mx_l3a_corner_ao,

};



static const struct rpmpd_desc msm8916_desc = {
@@ -689,11 +689,11 @@ static const struct rpmpd_desc msm8916_desc = { 
};



static struct rpmpd *msm8917_rpmpds[] = {

	[MSM8917_VDDCX] =	&cx_s2a_lvl,

	[MSM8917_VDDCX_AO] =	&cx_s2a_lvl_ao,

	[MSM8917_VDDCX_VFL] =	&cx_s2a_vfl,

	[MSM8917_VDDMX] =	&mx_l3a_lvl,

	[MSM8917_VDDMX_AO] =	&mx_l3a_lvl_ao,

	[RPMPD_VDDCX] =		&cx_s2a_lvl,

	[RPMPD_VDDCX_AO] =	&cx_s2a_lvl_ao,

	[RPMPD_VDDCX_VFL] =	&cx_s2a_vfl,

	[RPMPD_VDDMX] =		&mx_l3a_lvl,

	[RPMPD_VDDMX_AO] =	&mx_l3a_lvl_ao,

};



static const struct rpmpd_desc msm8917_desc = {
@@ -747,12 +747,12 @@ static const struct rpmpd_desc msm8974pro_pma8084_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_VDDMX] =	&mx_s6a_lvl,

	[MSM8976_VDDMX_AO] =	&mx_s6a_lvl_ao,

	[MSM8976_VDDMX_VFL] =	&mx_rwsm6_vfl,

	[RPMPD_VDDCX] =		&cx_s2a_lvl,

	[RPMPD_VDDCX_AO] =	&cx_s2a_lvl_ao,

	[RPMPD_VDDCX_VFL] =	&cx_rwsc2_vfl,

	[RPMPD_VDDMX] =		&mx_s6a_lvl,

	[RPMPD_VDDMX_AO] =	&mx_s6a_lvl_ao,

	[RPMPD_VDDMX_VFL] =	&mx_rwsm6_vfl,

};



static const struct rpmpd_desc msm8976_desc = {
@@ -796,16 +796,16 @@ static const struct rpmpd_desc msm8996_desc = { 
};



static struct rpmpd *msm8998_rpmpds[] = {

	[MSM8998_VDDCX] =	&cx_rwcx0_lvl,

	[MSM8998_VDDCX_AO] =	&cx_rwcx0_lvl_ao,

	[MSM8998_VDDCX_VFL] =	&cx_rwcx0_vfl,

	[MSM8998_VDDMX] =	&mx_rwmx0_lvl,

	[MSM8998_VDDMX_AO] =	&mx_rwmx0_lvl_ao,

	[MSM8998_VDDMX_VFL] =	&mx_rwmx0_vfl,

	[MSM8998_SSCCX] =	&ssc_cx_rwsc0_lvl,

	[MSM8998_SSCCX_VFL] =	&ssc_cx_rwsc0_vfl,

	[MSM8998_SSCMX] =	&ssc_mx_rwsm0_lvl,

	[MSM8998_SSCMX_VFL] =	&ssc_mx_rwsm0_vfl,

	[RPMPD_VDDCX] =		&cx_rwcx0_lvl,

	[RPMPD_VDDCX_AO] =	&cx_rwcx0_lvl_ao,

	[RPMPD_VDDCX_VFL] =	&cx_rwcx0_vfl,

	[RPMPD_VDDMX] =		&mx_rwmx0_lvl,

	[RPMPD_VDDMX_AO] =	&mx_rwmx0_lvl_ao,

	[RPMPD_VDDMX_VFL] =	&mx_rwmx0_vfl,

	[RPMPD_SSCCX] =		&ssc_cx_rwsc0_lvl,

	[RPMPD_SSCCX_VFL] =	&ssc_cx_rwsc0_vfl,

	[RPMPD_SSCMX] =		&ssc_mx_rwsm0_lvl,

	[RPMPD_SSCMX_VFL] =	&ssc_mx_rwsm0_vfl,

};



static const struct rpmpd_desc msm8998_desc = {
@@ -831,11 +831,11 @@ static const struct rpmpd_desc qcs404_desc = { 
};



static struct rpmpd *qm215_rpmpds[] = {

	[QM215_VDDCX] =		&cx_s1a_lvl,

	[QM215_VDDCX_AO] =	&cx_s1a_lvl_ao,

	[QM215_VDDCX_VFL] =	&cx_s1a_vfl,

	[QM215_VDDMX] =		&mx_l2a_lvl,

	[QM215_VDDMX_AO] =	&mx_l2a_lvl_ao,

	[RPMPD_VDDCX] =		&cx_s1a_lvl,

	[RPMPD_VDDCX_AO] =	&cx_s1a_lvl_ao,

	[RPMPD_VDDCX_VFL] =	&cx_s1a_vfl,

	[RPMPD_VDDMX] =		&mx_l2a_lvl,

	[RPMPD_VDDMX_AO] =	&mx_l2a_lvl_ao,

};



static const struct rpmpd_desc qm215_desc = {
@@ -845,16 +845,16 @@ static const struct rpmpd_desc qm215_desc = { 
};



static struct rpmpd *sdm660_rpmpds[] = {

	[SDM660_VDDCX] =	&cx_rwcx0_lvl,

	[SDM660_VDDCX_AO] =	&cx_rwcx0_lvl_ao,

	[SDM660_VDDCX_VFL] =	&cx_rwcx0_vfl,

	[SDM660_VDDMX] =	&mx_rwmx0_lvl,

	[SDM660_VDDMX_AO] =	&mx_rwmx0_lvl_ao,

	[SDM660_VDDMX_VFL] =	&mx_rwmx0_vfl,

	[SDM660_SSCCX] =	&ssc_cx_rwlc0_lvl,

	[SDM660_SSCCX_VFL] =	&ssc_cx_rwlc0_vfl,

	[SDM660_SSCMX] =	&ssc_mx_rwlm0_lvl,

	[SDM660_SSCMX_VFL] =	&ssc_mx_rwlm0_vfl,

	[RPMPD_VDDCX] =		&cx_rwcx0_lvl,

	[RPMPD_VDDCX_AO] =	&cx_rwcx0_lvl_ao,

	[RPMPD_VDDCX_VFL] =	&cx_rwcx0_vfl,

	[RPMPD_VDDMX] =		&mx_rwmx0_lvl,

	[RPMPD_VDDMX_AO] =	&mx_rwmx0_lvl_ao,

	[RPMPD_VDDMX_VFL] =	&mx_rwmx0_vfl,

	[RPMPD_SSCCX] =		&ssc_cx_rwlc0_lvl,

	[RPMPD_SSCCX_VFL] =	&ssc_cx_rwlc0_vfl,

	[RPMPD_SSCMX] =		&ssc_mx_rwlm0_lvl,

	[RPMPD_SSCMX_VFL] =	&ssc_mx_rwlm0_vfl,

};



static const struct rpmpd_desc sdm660_desc = {
@@ -881,12 +881,12 @@ static const struct rpmpd_desc sm6115_desc = { 
};



static struct rpmpd *sm6125_rpmpds[] = {

	[SM6125_VDDCX] =	&cx_rwcx0_lvl,

	[SM6125_VDDCX_AO] =	&cx_rwcx0_lvl_ao,

	[SM6125_VDDCX_VFL] =	&cx_rwcx0_vfl,

	[SM6125_VDDMX] =	&mx_rwmx0_lvl,

	[SM6125_VDDMX_AO] =	&mx_rwmx0_lvl_ao,

	[SM6125_VDDMX_VFL] =	&mx_rwmx0_vfl,

	[RPMPD_VDDCX] =		&cx_rwcx0_lvl,

	[RPMPD_VDDCX_AO] =	&cx_rwcx0_lvl_ao,

	[RPMPD_VDDCX_VFL] =	&cx_rwcx0_vfl,

	[RPMPD_VDDMX] =		&mx_rwmx0_lvl,

	[RPMPD_VDDMX_AO] =	&mx_rwmx0_lvl_ao,

	[RPMPD_VDDMX_VFL] =	&mx_rwmx0_vfl,

};



static const struct rpmpd_desc sm6125_desc = {