@@ -65,46 +65,9 @@ static DEFINE_MUTEX(rpmhpd_lock);
6565
6666/* RPMH powerdomains */
6767
68- static struct rpmhpd ebi = {
69- .pd = { .name = "ebi" , },
70- .res_name = "ebi.lvl" ,
71- };
72-
73- static struct rpmhpd lmx = {
74- .pd = { .name = "lmx" , },
75- .res_name = "lmx.lvl" ,
76- };
77-
78- static struct rpmhpd lcx = {
79- .pd = { .name = "lcx" , },
80- .res_name = "lcx.lvl" ,
81- };
82-
83- static struct rpmhpd gfx = {
84- .pd = { .name = "gfx" , },
85- .res_name = "gfx.lvl" ,
86- };
87-
88- static struct rpmhpd mss = {
89- .pd = { .name = "mss" , },
90- .res_name = "mss.lvl" ,
91- };
92-
93- static struct rpmhpd mx_ao ;
94- static struct rpmhpd mx = {
95- .pd = { .name = "mx" , },
96- .peer = & mx_ao ,
97- .res_name = "mx.lvl" ,
98- };
99-
100- static struct rpmhpd mx_ao = {
101- .pd = { .name = "mx_ao" , },
102- .active_only = true,
103- .peer = & mx ,
104- .res_name = "mx.lvl" ,
105- };
106-
10768static struct rpmhpd cx_ao ;
69+ static struct rpmhpd mx ;
70+ static struct rpmhpd mx_ao ;
10871static struct rpmhpd cx = {
10972 .pd = { .name = "cx" , },
11073 .peer = & cx_ao ,
@@ -134,6 +97,26 @@ static struct rpmhpd cx_ao_w_mx_parent = {
13497 .res_name = "cx.lvl" ,
13598};
13699
100+ static struct rpmhpd ebi = {
101+ .pd = { .name = "ebi" , },
102+ .res_name = "ebi.lvl" ,
103+ };
104+
105+ static struct rpmhpd gfx = {
106+ .pd = { .name = "gfx" , },
107+ .res_name = "gfx.lvl" ,
108+ };
109+
110+ static struct rpmhpd lcx = {
111+ .pd = { .name = "lcx" , },
112+ .res_name = "lcx.lvl" ,
113+ };
114+
115+ static struct rpmhpd lmx = {
116+ .pd = { .name = "lmx" , },
117+ .res_name = "lmx.lvl" ,
118+ };
119+
137120static struct rpmhpd mmcx_ao ;
138121static struct rpmhpd mmcx = {
139122 .pd = { .name = "mmcx" , },
@@ -164,6 +147,25 @@ static struct rpmhpd mmcx_ao_w_cx_parent = {
164147 .res_name = "mmcx.lvl" ,
165148};
166149
150+ static struct rpmhpd mss = {
151+ .pd = { .name = "mss" , },
152+ .res_name = "mss.lvl" ,
153+ };
154+
155+ static struct rpmhpd mx_ao ;
156+ static struct rpmhpd mx = {
157+ .pd = { .name = "mx" , },
158+ .peer = & mx_ao ,
159+ .res_name = "mx.lvl" ,
160+ };
161+
162+ static struct rpmhpd mx_ao = {
163+ .pd = { .name = "mx_ao" , },
164+ .active_only = true,
165+ .peer = & mx ,
166+ .res_name = "mx.lvl" ,
167+ };
168+
167169static struct rpmhpd mxc_ao ;
168170static struct rpmhpd mxc = {
169171 .pd = { .name = "mxc" , },
@@ -180,15 +182,15 @@ static struct rpmhpd mxc_ao = {
180182
181183/* SDM845 RPMH powerdomains */
182184static struct rpmhpd * sdm845_rpmhpds [] = {
183- [SDM845_EBI ] = & ebi ,
184- [SDM845_MX ] = & mx ,
185- [SDM845_MX_AO ] = & mx_ao ,
186185 [SDM845_CX ] = & cx_w_mx_parent ,
187186 [SDM845_CX_AO ] = & cx_ao_w_mx_parent ,
188- [SDM845_LMX ] = & lmx ,
189- [SDM845_LCX ] = & lcx ,
187+ [SDM845_EBI ] = & ebi ,
190188 [SDM845_GFX ] = & gfx ,
189+ [SDM845_LCX ] = & lcx ,
190+ [SDM845_LMX ] = & lmx ,
191191 [SDM845_MSS ] = & mss ,
192+ [SDM845_MX ] = & mx ,
193+ [SDM845_MX_AO ] = & mx_ao ,
192194};
193195
194196static const struct rpmhpd_desc sdm845_desc = {
@@ -198,9 +200,9 @@ static const struct rpmhpd_desc sdm845_desc = {
198200
199201/* SDX55 RPMH powerdomains */
200202static struct rpmhpd * sdx55_rpmhpds [] = {
203+ [SDX55_CX ] = & cx_w_mx_parent ,
201204 [SDX55_MSS ] = & mss ,
202205 [SDX55_MX ] = & mx ,
203- [SDX55_CX ] = & cx_w_mx_parent ,
204206};
205207
206208static const struct rpmhpd_desc sdx55_desc = {
@@ -225,17 +227,17 @@ static const struct rpmhpd_desc sm6350_desc = {
225227
226228/* SM8150 RPMH powerdomains */
227229static struct rpmhpd * sm8150_rpmhpds [] = {
228- [SM8150_MSS ] = & mss ,
229- [SM8150_EBI ] = & ebi ,
230- [SM8150_LMX ] = & lmx ,
231- [SM8150_LCX ] = & lcx ,
232- [SM8150_GFX ] = & gfx ,
233- [SM8150_MX ] = & mx ,
234- [SM8150_MX_AO ] = & mx_ao ,
235230 [SM8150_CX ] = & cx_w_mx_parent ,
236231 [SM8150_CX_AO ] = & cx_ao_w_mx_parent ,
232+ [SM8150_EBI ] = & ebi ,
233+ [SM8150_GFX ] = & gfx ,
234+ [SM8150_LCX ] = & lcx ,
235+ [SM8150_LMX ] = & lmx ,
237236 [SM8150_MMCX ] = & mmcx ,
238237 [SM8150_MMCX_AO ] = & mmcx_ao ,
238+ [SM8150_MSS ] = & mss ,
239+ [SM8150_MX ] = & mx ,
240+ [SM8150_MX_AO ] = & mx_ao ,
239241};
240242
241243static const struct rpmhpd_desc sm8150_desc = {
@@ -272,11 +274,11 @@ static struct rpmhpd *sm8350_rpmhpds[] = {
272274 [SM8350_LMX ] = & lmx ,
273275 [SM8350_MMCX ] = & mmcx ,
274276 [SM8350_MMCX_AO ] = & mmcx_ao ,
277+ [SM8350_MSS ] = & mss ,
275278 [SM8350_MX ] = & mx ,
276279 [SM8350_MX_AO ] = & mx_ao ,
277280 [SM8350_MXC ] = & mxc ,
278281 [SM8350_MXC_AO ] = & mxc_ao ,
279- [SM8350_MSS ] = & mss ,
280282};
281283
282284static const struct rpmhpd_desc sm8350_desc = {
@@ -294,11 +296,11 @@ static struct rpmhpd *sm8450_rpmhpds[] = {
294296 [SM8450_LMX ] = & lmx ,
295297 [SM8450_MMCX ] = & mmcx_w_cx_parent ,
296298 [SM8450_MMCX_AO ] = & mmcx_ao_w_cx_parent ,
299+ [SM8450_MSS ] = & mss ,
297300 [SM8450_MX ] = & mx ,
298301 [SM8450_MX_AO ] = & mx_ao ,
299302 [SM8450_MXC ] = & mxc ,
300303 [SM8450_MXC_AO ] = & mxc_ao ,
301- [SM8450_MSS ] = & mss ,
302304};
303305
304306static const struct rpmhpd_desc sm8450_desc = {
@@ -311,11 +313,11 @@ static struct rpmhpd *sc7180_rpmhpds[] = {
311313 [SC7180_CX ] = & cx_w_mx_parent ,
312314 [SC7180_CX_AO ] = & cx_ao_w_mx_parent ,
313315 [SC7180_GFX ] = & gfx ,
314- [SC7180_MX ] = & mx ,
315- [SC7180_MX_AO ] = & mx_ao ,
316- [SC7180_LMX ] = & lmx ,
317316 [SC7180_LCX ] = & lcx ,
317+ [SC7180_LMX ] = & lmx ,
318318 [SC7180_MSS ] = & mss ,
319+ [SC7180_MX ] = & mx ,
320+ [SC7180_MX_AO ] = & mx_ao ,
319321};
320322
321323static const struct rpmhpd_desc sc7180_desc = {
@@ -329,11 +331,11 @@ static struct rpmhpd *sc7280_rpmhpds[] = {
329331 [SC7280_CX_AO ] = & cx_ao ,
330332 [SC7280_EBI ] = & ebi ,
331333 [SC7280_GFX ] = & gfx ,
332- [SC7280_MX ] = & mx ,
333- [SC7280_MX_AO ] = & mx_ao ,
334- [SC7280_LMX ] = & lmx ,
335334 [SC7280_LCX ] = & lcx ,
335+ [SC7280_LMX ] = & lmx ,
336336 [SC7280_MSS ] = & mss ,
337+ [SC7280_MX ] = & mx ,
338+ [SC7280_MX_AO ] = & mx_ao ,
337339};
338340
339341static const struct rpmhpd_desc sc7280_desc = {
0 commit comments