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

Commit 5499f800 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: dcc: Add ram offset property for DCC" into msm-4.9

parents 8d23b882 3d86e1b1

Documentation/devicetree/bindings/soc/qcom/dcc.txt

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@ Required properties: 
	of the component.



- reg-names : names corresponding to each reg property value.

	      dcc-base: Base address for DCC configuration reg

	      dcc-ram-base: Start of HLOS address space in SRAM

	      dcc-xpu-base: Base address for XPU configuration reg



- dcc-ram-offset: Address offset from the start of the SRAM address space.



Optional properties:

drivers/soc/qcom/dcc_v2.c

+10 −3
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ struct dcc_drvdata { 
	struct mutex		mutex;

	void __iomem		*ram_base;

	uint32_t		ram_size;

	uint32_t		ram_offset;

	enum dcc_data_sink	data_sink;

	enum dcc_func_type	func_type[DCC_MAX_LINK_LIST];

	uint32_t		ram_cfg;
@@ -517,9 +518,10 @@ static int dcc_enable(struct dcc_drvdata *drvdata) 


		/* 3. If in capture mode program DCC_RAM_CFG reg */

		if (drvdata->func_type[list] == DCC_FUNC_TYPE_CAPTURE) {

			dcc_writel(drvdata, ram_cfg_base, DCC_LL_BASE(list));

			dcc_writel(drvdata, drvdata->ram_start,

				   DCC_FD_BASE(list));

			dcc_writel(drvdata, ram_cfg_base +

				   drvdata->ram_offset/4, DCC_LL_BASE(list));

			dcc_writel(drvdata, drvdata->ram_start +

				   drvdata->ram_offset/4, DCC_FD_BASE(list));

			dcc_writel(drvdata, 0, DCC_LL_TIMEOUT(list));

		}
@@ -1342,6 +1344,11 @@ static int dcc_probe(struct platform_device *pdev) 
	if (!drvdata->ram_base)

		return -ENOMEM;



	ret = of_property_read_u32(pdev->dev.of_node, "dcc-ram-offset",

				   &drvdata->ram_offset);

	if (ret)

		return -EINVAL;



	drvdata->save_reg = of_property_read_bool(pdev->dev.of_node,

						  "qcom,save-reg");