Skip to content

Commit 31f799a

Browse files
lumagUlf Hansson
lumag
authored and
Ulf Hansson
committed
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: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Reviewed-by: Bjorn Andersson <andersson@kernel.org> Link: https://lore.kernel.org/r/20250718-rework-rpmhpd-rpmpd-v1-4-eedca108e540@oss.qualcomm.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 94838f3 commit 31f799a

1 file changed

Lines changed: 56 additions & 56 deletions

File tree

‎drivers/pmdomain/qcom/rpmpd.c‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -631,12 +631,12 @@ static struct rpmpd ssc_mx_rwsm0_vfl = {
631631
};
632632

633633
static struct rpmpd *mdm9607_rpmpds[] = {
634-
[MDM9607_VDDCX] = &cx_s3a_lvl,
635-
[MDM9607_VDDCX_AO] = &cx_s3a_lvl_ao,
636-
[MDM9607_VDDCX_VFL] = &cx_s3a_vfl,
637-
[MDM9607_VDDMX] = &mx_l12a_lvl,
638-
[MDM9607_VDDMX_AO] = &mx_l12a_lvl_ao,
639-
[MDM9607_VDDMX_VFL] = &mx_l12a_vfl,
634+
[RPMPD_VDDCX] = &cx_s3a_lvl,
635+
[RPMPD_VDDCX_AO] = &cx_s3a_lvl_ao,
636+
[RPMPD_VDDCX_VFL] = &cx_s3a_vfl,
637+
[RPMPD_VDDMX] = &mx_l12a_lvl,
638+
[RPMPD_VDDMX_AO] = &mx_l12a_lvl_ao,
639+
[RPMPD_VDDMX_VFL] = &mx_l12a_vfl,
640640
};
641641

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

648648
static struct rpmpd *msm8226_rpmpds[] = {
649-
[MSM8226_VDDCX] = &cx_s1a_corner,
650-
[MSM8226_VDDCX_AO] = &cx_s1a_corner_ao,
651-
[MSM8226_VDDCX_VFC] = &cx_s1a_vfc,
649+
[RPMPD_VDDCX] = &cx_s1a_corner,
650+
[RPMPD_VDDCX_AO] = &cx_s1a_corner_ao,
651+
[RPMPD_VDDCX_VFC] = &cx_s1a_vfc,
652652
};
653653

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

677677
static struct rpmpd *msm8916_rpmpds[] = {
678-
[MSM8916_VDDCX] = &cx_s1a_corner,
679-
[MSM8916_VDDCX_AO] = &cx_s1a_corner_ao,
680-
[MSM8916_VDDCX_VFC] = &cx_s1a_vfc,
681-
[MSM8916_VDDMX] = &mx_l3a_corner,
682-
[MSM8916_VDDMX_AO] = &mx_l3a_corner_ao,
678+
[RPMPD_VDDCX] = &cx_s1a_corner,
679+
[RPMPD_VDDCX_AO] = &cx_s1a_corner_ao,
680+
[RPMPD_VDDCX_VFC] = &cx_s1a_vfc,
681+
[RPMPD_VDDMX] = &mx_l3a_corner,
682+
[RPMPD_VDDMX_AO] = &mx_l3a_corner_ao,
683683
};
684684

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

691691
static struct rpmpd *msm8917_rpmpds[] = {
692-
[MSM8917_VDDCX] = &cx_s2a_lvl,
693-
[MSM8917_VDDCX_AO] = &cx_s2a_lvl_ao,
694-
[MSM8917_VDDCX_VFL] = &cx_s2a_vfl,
695-
[MSM8917_VDDMX] = &mx_l3a_lvl,
696-
[MSM8917_VDDMX_AO] = &mx_l3a_lvl_ao,
692+
[RPMPD_VDDCX] = &cx_s2a_lvl,
693+
[RPMPD_VDDCX_AO] = &cx_s2a_lvl_ao,
694+
[RPMPD_VDDCX_VFL] = &cx_s2a_vfl,
695+
[RPMPD_VDDMX] = &mx_l3a_lvl,
696+
[RPMPD_VDDMX_AO] = &mx_l3a_lvl_ao,
697697
};
698698

699699
static const struct rpmpd_desc msm8917_desc = {
@@ -747,12 +747,12 @@ static const struct rpmpd_desc msm8974pro_pma8084_desc = {
747747
};
748748

749749
static struct rpmpd *msm8976_rpmpds[] = {
750-
[MSM8976_VDDCX] = &cx_s2a_lvl,
751-
[MSM8976_VDDCX_AO] = &cx_s2a_lvl_ao,
752-
[MSM8976_VDDCX_VFL] = &cx_rwsc2_vfl,
753-
[MSM8976_VDDMX] = &mx_s6a_lvl,
754-
[MSM8976_VDDMX_AO] = &mx_s6a_lvl_ao,
755-
[MSM8976_VDDMX_VFL] = &mx_rwsm6_vfl,
750+
[RPMPD_VDDCX] = &cx_s2a_lvl,
751+
[RPMPD_VDDCX_AO] = &cx_s2a_lvl_ao,
752+
[RPMPD_VDDCX_VFL] = &cx_rwsc2_vfl,
753+
[RPMPD_VDDMX] = &mx_s6a_lvl,
754+
[RPMPD_VDDMX_AO] = &mx_s6a_lvl_ao,
755+
[RPMPD_VDDMX_VFL] = &mx_rwsm6_vfl,
756756
};
757757

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

798798
static struct rpmpd *msm8998_rpmpds[] = {
799-
[MSM8998_VDDCX] = &cx_rwcx0_lvl,
800-
[MSM8998_VDDCX_AO] = &cx_rwcx0_lvl_ao,
801-
[MSM8998_VDDCX_VFL] = &cx_rwcx0_vfl,
802-
[MSM8998_VDDMX] = &mx_rwmx0_lvl,
803-
[MSM8998_VDDMX_AO] = &mx_rwmx0_lvl_ao,
804-
[MSM8998_VDDMX_VFL] = &mx_rwmx0_vfl,
805-
[MSM8998_SSCCX] = &ssc_cx_rwsc0_lvl,
806-
[MSM8998_SSCCX_VFL] = &ssc_cx_rwsc0_vfl,
807-
[MSM8998_SSCMX] = &ssc_mx_rwsm0_lvl,
808-
[MSM8998_SSCMX_VFL] = &ssc_mx_rwsm0_vfl,
799+
[RPMPD_VDDCX] = &cx_rwcx0_lvl,
800+
[RPMPD_VDDCX_AO] = &cx_rwcx0_lvl_ao,
801+
[RPMPD_VDDCX_VFL] = &cx_rwcx0_vfl,
802+
[RPMPD_VDDMX] = &mx_rwmx0_lvl,
803+
[RPMPD_VDDMX_AO] = &mx_rwmx0_lvl_ao,
804+
[RPMPD_VDDMX_VFL] = &mx_rwmx0_vfl,
805+
[RPMPD_SSCCX] = &ssc_cx_rwsc0_lvl,
806+
[RPMPD_SSCCX_VFL] = &ssc_cx_rwsc0_vfl,
807+
[RPMPD_SSCMX] = &ssc_mx_rwsm0_lvl,
808+
[RPMPD_SSCMX_VFL] = &ssc_mx_rwsm0_vfl,
809809
};
810810

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

833833
static struct rpmpd *qm215_rpmpds[] = {
834-
[QM215_VDDCX] = &cx_s1a_lvl,
835-
[QM215_VDDCX_AO] = &cx_s1a_lvl_ao,
836-
[QM215_VDDCX_VFL] = &cx_s1a_vfl,
837-
[QM215_VDDMX] = &mx_l2a_lvl,
838-
[QM215_VDDMX_AO] = &mx_l2a_lvl_ao,
834+
[RPMPD_VDDCX] = &cx_s1a_lvl,
835+
[RPMPD_VDDCX_AO] = &cx_s1a_lvl_ao,
836+
[RPMPD_VDDCX_VFL] = &cx_s1a_vfl,
837+
[RPMPD_VDDMX] = &mx_l2a_lvl,
838+
[RPMPD_VDDMX_AO] = &mx_l2a_lvl_ao,
839839
};
840840

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

847847
static struct rpmpd *sdm660_rpmpds[] = {
848-
[SDM660_VDDCX] = &cx_rwcx0_lvl,
849-
[SDM660_VDDCX_AO] = &cx_rwcx0_lvl_ao,
850-
[SDM660_VDDCX_VFL] = &cx_rwcx0_vfl,
851-
[SDM660_VDDMX] = &mx_rwmx0_lvl,
852-
[SDM660_VDDMX_AO] = &mx_rwmx0_lvl_ao,
853-
[SDM660_VDDMX_VFL] = &mx_rwmx0_vfl,
854-
[SDM660_SSCCX] = &ssc_cx_rwlc0_lvl,
855-
[SDM660_SSCCX_VFL] = &ssc_cx_rwlc0_vfl,
856-
[SDM660_SSCMX] = &ssc_mx_rwlm0_lvl,
857-
[SDM660_SSCMX_VFL] = &ssc_mx_rwlm0_vfl,
848+
[RPMPD_VDDCX] = &cx_rwcx0_lvl,
849+
[RPMPD_VDDCX_AO] = &cx_rwcx0_lvl_ao,
850+
[RPMPD_VDDCX_VFL] = &cx_rwcx0_vfl,
851+
[RPMPD_VDDMX] = &mx_rwmx0_lvl,
852+
[RPMPD_VDDMX_AO] = &mx_rwmx0_lvl_ao,
853+
[RPMPD_VDDMX_VFL] = &mx_rwmx0_vfl,
854+
[RPMPD_SSCCX] = &ssc_cx_rwlc0_lvl,
855+
[RPMPD_SSCCX_VFL] = &ssc_cx_rwlc0_vfl,
856+
[RPMPD_SSCMX] = &ssc_mx_rwlm0_lvl,
857+
[RPMPD_SSCMX_VFL] = &ssc_mx_rwlm0_vfl,
858858
};
859859

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

883883
static struct rpmpd *sm6125_rpmpds[] = {
884-
[SM6125_VDDCX] = &cx_rwcx0_lvl,
885-
[SM6125_VDDCX_AO] = &cx_rwcx0_lvl_ao,
886-
[SM6125_VDDCX_VFL] = &cx_rwcx0_vfl,
887-
[SM6125_VDDMX] = &mx_rwmx0_lvl,
888-
[SM6125_VDDMX_AO] = &mx_rwmx0_lvl_ao,
889-
[SM6125_VDDMX_VFL] = &mx_rwmx0_vfl,
884+
[RPMPD_VDDCX] = &cx_rwcx0_lvl,
885+
[RPMPD_VDDCX_AO] = &cx_rwcx0_lvl_ao,
886+
[RPMPD_VDDCX_VFL] = &cx_rwcx0_vfl,
887+
[RPMPD_VDDMX] = &mx_rwmx0_lvl,
888+
[RPMPD_VDDMX_AO] = &mx_rwmx0_lvl_ao,
889+
[RPMPD_VDDMX_VFL] = &mx_rwmx0_vfl,
890890
};
891891

892892
static const struct rpmpd_desc sm6125_desc = {

0 commit comments

Comments
 (0)