diff options
Diffstat (limited to 'src/soc/qualcomm')
-rw-r--r-- | src/soc/qualcomm/sc7280/Makefile.inc | 1 | ||||
-rw-r--r-- | src/soc/qualcomm/sc7280/cpucp_load_reset.c | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/soc/qualcomm/sc7280/Makefile.inc b/src/soc/qualcomm/sc7280/Makefile.inc index 85508e97bb..a20d49b8cd 100644 --- a/src/soc/qualcomm/sc7280/Makefile.inc +++ b/src/soc/qualcomm/sc7280/Makefile.inc @@ -27,6 +27,7 @@ verstage-$(CONFIG_DRIVERS_UART) += ../common/qupv3_uart.c ################################################################################ romstage-y += cbmem.c romstage-y += shrm_load_reset.c +romstage-y += cpucp_load_reset.c romstage-y += ../common/qclib.c romstage-y += ../common/mmu.c romstage-y += mmu.c diff --git a/src/soc/qualcomm/sc7280/cpucp_load_reset.c b/src/soc/qualcomm/sc7280/cpucp_load_reset.c index cfb16879de..6f8f51ff9f 100644 --- a/src/soc/qualcomm/sc7280/cpucp_load_reset.c +++ b/src/soc/qualcomm/sc7280/cpucp_load_reset.c @@ -11,13 +11,11 @@ void cpucp_prepare(void) { - /* allow NS access to EPSS memory*/ + /* allow NS access to EPSS memory */ setbits32(&epss_top->access_override, 0x1); - /* Enable subsystem clock. Required for CPUCP PDMEM access*/ + /* Enable subsystem clock. Required for CPUCP PDMEM access */ setbits32(&epss_fast->epss_muc_clk_ctrl, 0x1); - if (!wait_ms(300, ((read32(&epss_fast->epss_muc_clk_ctrl) & 0x1) != 0x1))) - printk(BIOS_ERR, "%s: cannot get CPUCP PDMEM access.\n", __func__); } void cpucp_fw_load_reset(void) @@ -25,7 +23,8 @@ void cpucp_fw_load_reset(void) struct prog cpucp_fw_prog = PROG_INIT(PROG_PAYLOAD, CONFIG_CBFS_PREFIX "/cpucp"); - cpucp_prepare(); + if (!wait_ms(300, (read32(&epss_fast->epss_muc_clk_ctrl) & 0x1) == 0x1)) + printk(BIOS_ERR, "%s: cannot get CPUCP PDMEM access.\n", __func__); if (!selfload(&cpucp_fw_prog)) die("SOC image: CPUCP load failed"); |