Skip to content

Commit de3acb7

Browse files
RohitAgarwalQUICandersson
authored andcommitted
soc: qcom: rpmhpd: Use the newly created generic RPMHPD bindings
Update the SoC SM8[2345]50 entries to use the new generic RPMHPD bindings. Signed-off-by: Rohit Agarwal <quic_rohiagar@quicinc.com> Reviewed-by: Bjorn Andersson <andersson@kernel.org> Link: https://lore.kernel.org/r/1689744162-9421-3-git-send-email-quic_rohiagar@quicinc.com Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 39bb3ab commit de3acb7

1 file changed

Lines changed: 51 additions & 50 deletions

File tree

drivers/soc/qcom/rpmhpd.c

Lines changed: 51 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <soc/qcom/cmd-db.h>
1515
#include <soc/qcom/rpmh.h>
1616
#include <dt-bindings/power/qcom-rpmpd.h>
17+
#include <dt-bindings/power/qcom,rpmhpd.h>
1718

1819
#define domain_to_rpmhpd(domain) container_of(domain, struct rpmhpd, pd)
1920

@@ -358,16 +359,16 @@ static const struct rpmhpd_desc sa8155p_desc = {
358359

359360
/* SM8250 RPMH powerdomains */
360361
static struct rpmhpd *sm8250_rpmhpds[] = {
361-
[SM8250_CX] = &cx_w_mx_parent,
362-
[SM8250_CX_AO] = &cx_ao_w_mx_parent,
363-
[SM8250_EBI] = &ebi,
364-
[SM8250_GFX] = &gfx,
365-
[SM8250_LCX] = &lcx,
366-
[SM8250_LMX] = &lmx,
367-
[SM8250_MMCX] = &mmcx,
368-
[SM8250_MMCX_AO] = &mmcx_ao,
369-
[SM8250_MX] = &mx,
370-
[SM8250_MX_AO] = &mx_ao,
362+
[RPMHPD_CX] = &cx_w_mx_parent,
363+
[RPMHPD_CX_AO] = &cx_ao_w_mx_parent,
364+
[RPMHPD_EBI] = &ebi,
365+
[RPMHPD_GFX] = &gfx,
366+
[RPMHPD_LCX] = &lcx,
367+
[RPMHPD_LMX] = &lmx,
368+
[RPMHPD_MMCX] = &mmcx,
369+
[RPMHPD_MMCX_AO] = &mmcx_ao,
370+
[RPMHPD_MX] = &mx,
371+
[RPMHPD_MX_AO] = &mx_ao,
371372
};
372373

373374
static const struct rpmhpd_desc sm8250_desc = {
@@ -377,19 +378,19 @@ static const struct rpmhpd_desc sm8250_desc = {
377378

378379
/* SM8350 Power domains */
379380
static struct rpmhpd *sm8350_rpmhpds[] = {
380-
[SM8350_CX] = &cx_w_mx_parent,
381-
[SM8350_CX_AO] = &cx_ao_w_mx_parent,
382-
[SM8350_EBI] = &ebi,
383-
[SM8350_GFX] = &gfx,
384-
[SM8350_LCX] = &lcx,
385-
[SM8350_LMX] = &lmx,
386-
[SM8350_MMCX] = &mmcx,
387-
[SM8350_MMCX_AO] = &mmcx_ao,
388-
[SM8350_MSS] = &mss,
389-
[SM8350_MX] = &mx,
390-
[SM8350_MX_AO] = &mx_ao,
391-
[SM8350_MXC] = &mxc,
392-
[SM8350_MXC_AO] = &mxc_ao,
381+
[RPMHPD_CX] = &cx_w_mx_parent,
382+
[RPMHPD_CX_AO] = &cx_ao_w_mx_parent,
383+
[RPMHPD_EBI] = &ebi,
384+
[RPMHPD_GFX] = &gfx,
385+
[RPMHPD_LCX] = &lcx,
386+
[RPMHPD_LMX] = &lmx,
387+
[RPMHPD_MMCX] = &mmcx,
388+
[RPMHPD_MMCX_AO] = &mmcx_ao,
389+
[RPMHPD_MSS] = &mss,
390+
[RPMHPD_MX] = &mx,
391+
[RPMHPD_MX_AO] = &mx_ao,
392+
[RPMHPD_MXC] = &mxc,
393+
[RPMHPD_MXC_AO] = &mxc_ao,
393394
};
394395

395396
static const struct rpmhpd_desc sm8350_desc = {
@@ -399,19 +400,19 @@ static const struct rpmhpd_desc sm8350_desc = {
399400

400401
/* SM8450 RPMH powerdomains */
401402
static struct rpmhpd *sm8450_rpmhpds[] = {
402-
[SM8450_CX] = &cx,
403-
[SM8450_CX_AO] = &cx_ao,
404-
[SM8450_EBI] = &ebi,
405-
[SM8450_GFX] = &gfx,
406-
[SM8450_LCX] = &lcx,
407-
[SM8450_LMX] = &lmx,
408-
[SM8450_MMCX] = &mmcx_w_cx_parent,
409-
[SM8450_MMCX_AO] = &mmcx_ao_w_cx_parent,
410-
[SM8450_MSS] = &mss,
411-
[SM8450_MX] = &mx,
412-
[SM8450_MX_AO] = &mx_ao,
413-
[SM8450_MXC] = &mxc,
414-
[SM8450_MXC_AO] = &mxc_ao,
403+
[RPMHPD_CX] = &cx,
404+
[RPMHPD_CX_AO] = &cx_ao,
405+
[RPMHPD_EBI] = &ebi,
406+
[RPMHPD_GFX] = &gfx,
407+
[RPMHPD_LCX] = &lcx,
408+
[RPMHPD_LMX] = &lmx,
409+
[RPMHPD_MMCX] = &mmcx_w_cx_parent,
410+
[RPMHPD_MMCX_AO] = &mmcx_ao_w_cx_parent,
411+
[RPMHPD_MSS] = &mss,
412+
[RPMHPD_MX] = &mx,
413+
[RPMHPD_MX_AO] = &mx_ao,
414+
[RPMHPD_MXC] = &mxc,
415+
[RPMHPD_MXC_AO] = &mxc_ao,
415416
};
416417

417418
static const struct rpmhpd_desc sm8450_desc = {
@@ -421,20 +422,20 @@ static const struct rpmhpd_desc sm8450_desc = {
421422

422423
/* SM8550 RPMH powerdomains */
423424
static struct rpmhpd *sm8550_rpmhpds[] = {
424-
[SM8550_CX] = &cx,
425-
[SM8550_CX_AO] = &cx_ao,
426-
[SM8550_EBI] = &ebi,
427-
[SM8550_GFX] = &gfx,
428-
[SM8550_LCX] = &lcx,
429-
[SM8550_LMX] = &lmx,
430-
[SM8550_MMCX] = &mmcx_w_cx_parent,
431-
[SM8550_MMCX_AO] = &mmcx_ao_w_cx_parent,
432-
[SM8550_MSS] = &mss,
433-
[SM8550_MX] = &mx,
434-
[SM8550_MX_AO] = &mx_ao,
435-
[SM8550_MXC] = &mxc,
436-
[SM8550_MXC_AO] = &mxc_ao,
437-
[SM8550_NSP] = &nsp,
425+
[RPMHPD_CX] = &cx,
426+
[RPMHPD_CX_AO] = &cx_ao,
427+
[RPMHPD_EBI] = &ebi,
428+
[RPMHPD_GFX] = &gfx,
429+
[RPMHPD_LCX] = &lcx,
430+
[RPMHPD_LMX] = &lmx,
431+
[RPMHPD_MMCX] = &mmcx_w_cx_parent,
432+
[RPMHPD_MMCX_AO] = &mmcx_ao_w_cx_parent,
433+
[RPMHPD_MSS] = &mss,
434+
[RPMHPD_MX] = &mx,
435+
[RPMHPD_MX_AO] = &mx_ao,
436+
[RPMHPD_MXC] = &mxc,
437+
[RPMHPD_MXC_AO] = &mxc_ao,
438+
[RPMHPD_NSP] = &nsp,
438439
};
439440

440441
static const struct rpmhpd_desc sm8550_desc = {

0 commit comments

Comments
 (0)