Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e3ef8c0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: pil-q6v5: Add support to read acc register value and override it"

parents 6a0d7f19 cf7cec73

Documentation/devicetree/bindings/pil/pil-q6v5-mss.txt

+1 −0
Original line number Diff line number Diff line
@@ -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 {

drivers/soc/qcom/pil-q6v5.c

+7 −1
Original line number Diff line number Diff line 
/*

 * 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);

drivers/soc/qcom/pil-q6v5.h

+2 −1
Original line number Diff line number Diff line 
/*

 * 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;

};