evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "soc: qcom: pil-q6v5: Update the reset sequence for qdspv62.1.2/1.5"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-18 14:47:59 -08:00 • committed by Gerrit - the friendly Code Review server
commit f58596e5e4
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/soc/qcom/pil-msa.c
View file

@ -278,6 +278,7 @@ int pil_mss_shutdown(struct pil_desc *pil)
struct q6v5_data *drv = container_of(pil, struct q6v5_data, desc); struct q6v5_data *drv = container_of(pil, struct q6v5_data, desc);
int ret = 0; int ret = 0;
dev_info(pil->dev, "MSS is shutting down\n");
if (drv->axi_halt_base) { if (drv->axi_halt_base) {
pil_q6v5_halt_axi_port(pil, pil_q6v5_halt_axi_port(pil,
drv->axi_halt_base + MSS_Q6_HALT_BASE); drv->axi_halt_base + MSS_Q6_HALT_BASE);

2
drivers/soc/qcom/pil-q6v5.c
View file

@ -512,6 +512,8 @@ static int __pil_q6v55_reset(struct pil_desc *pil)
val |= BIT(i); val |= BIT(i);
writel_relaxed(val, drv->reg_base + writel_relaxed(val, drv->reg_base +
QDSP6V6SS_MEM_PWR_CTL); QDSP6V6SS_MEM_PWR_CTL);
val = readl_relaxed(drv->reg_base +
QDSP6V6SS_MEM_PWR_CTL);
/* /*
* Wait for 1us for both memory peripheral and * Wait for 1us for both memory peripheral and
* data array to turn on. * data array to turn on.