diff options
| -rw-r--r-- | Documentation/devicetree/bindings/pil/pil-q6v5-mss.txt | 1 | ||||
| -rw-r--r-- | drivers/soc/qcom/pil-q6v5.c | 8 | ||||
| -rw-r--r-- | drivers/soc/qcom/pil-q6v5.h | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/pil/pil-q6v5-mss.txt b/Documentation/devicetree/bindings/pil/pil-q6v5-mss.txt index 57b0b81dce25..5b10a4369986 100644 --- a/Documentation/devicetree/bindings/pil/pil-q6v5-mss.txt +++ b/Documentation/devicetree/bindings/pil/pil-q6v5-mss.txt @@ -80,6 +80,7 @@ Optional properties: - qcom,mx-spike-wa: Boolean- Present if we need to assert QDSP6 I/O clamp, memory wordline clamp, and compiler memory clamp during MSS restart. - qcom,qdsp6v56-1-10: Boolean- Present if the qdsp version is v56 1.10 +- qcom,override-acc-1: Override the default ACC settings with this value if present. Example: qcom,mss@fc880000 { diff --git a/drivers/soc/qcom/pil-q6v5.c b/drivers/soc/qcom/pil-q6v5.c index 39b352b6f159..a62091b0854d 100644 --- a/drivers/soc/qcom/pil-q6v5.c +++ b/drivers/soc/qcom/pil-q6v5.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -361,6 +361,12 @@ static int __pil_q6v55_reset(struct pil_desc *pil) writel_relaxed(QDSP6SS_ACC_OVERRIDE_VAL, drv->reg_base + QDSP6SS_STRAP_ACC); + /* Override the ACC value with input value */ + if (!of_property_read_u32(pil->dev->of_node, "qcom,override-acc-1", + &drv->override_acc_1)) + writel_relaxed(drv->override_acc_1, + drv->reg_base + QDSP6SS_STRAP_ACC); + /* Assert resets, stop core */ val = readl_relaxed(drv->reg_base + QDSP6SS_RESET); val |= (Q6SS_CORE_ARES | Q6SS_BUS_ARES_ENA | Q6SS_STOP_CORE); diff --git a/drivers/soc/qcom/pil-q6v5.h b/drivers/soc/qcom/pil-q6v5.h index f1465e32b9af..6a59b06f7b6c 100644 --- a/drivers/soc/qcom/pil-q6v5.h +++ b/drivers/soc/qcom/pil-q6v5.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -65,6 +65,7 @@ struct q6v5_data { bool non_elf_image; bool restart_reg_sec; bool override_acc; + int override_acc_1; bool ahb_clk_vote; bool mx_spike_wa; }; |