diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-18 14:47:59 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-18 14:47:59 -0800 |
| commit | f58596e5e4c4687bfff60111b538fd417fcfe9b8 (patch) | |
| tree | ae65dbdd4f51756edebd0becd1a994bbfca3a85c | |
| parent | 4639e34368d7894d22a76e5dfe6ce3f453f7b12d (diff) | |
| parent | 19740f9d535bdc41785b46dba450c1aa3ee69601 (diff) | |
Merge "soc: qcom: pil-q6v5: Update the reset sequence for qdspv62.1.2/1.5"
| -rw-r--r-- | drivers/soc/qcom/pil-msa.c | 1 | ||||
| -rw-r--r-- | drivers/soc/qcom/pil-q6v5.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/soc/qcom/pil-msa.c b/drivers/soc/qcom/pil-msa.c index f966d8c11f6e..bbd77d8e0650 100644 --- a/drivers/soc/qcom/pil-msa.c +++ b/drivers/soc/qcom/pil-msa.c @@ -278,6 +278,7 @@ int pil_mss_shutdown(struct pil_desc *pil) struct q6v5_data *drv = container_of(pil, struct q6v5_data, desc); int ret = 0; + dev_info(pil->dev, "MSS is shutting down\n"); if (drv->axi_halt_base) { pil_q6v5_halt_axi_port(pil, drv->axi_halt_base + MSS_Q6_HALT_BASE); diff --git a/drivers/soc/qcom/pil-q6v5.c b/drivers/soc/qcom/pil-q6v5.c index a1cd3b1eeaff..6bafa46a5c0b 100644 --- a/drivers/soc/qcom/pil-q6v5.c +++ b/drivers/soc/qcom/pil-q6v5.c @@ -512,6 +512,8 @@ static int __pil_q6v55_reset(struct pil_desc *pil) val |= BIT(i); writel_relaxed(val, drv->reg_base + QDSP6V6SS_MEM_PWR_CTL); + val = readl_relaxed(drv->reg_base + + QDSP6V6SS_MEM_PWR_CTL); /* * Wait for 1us for both memory peripheral and * data array to turn on. |