Merge "coresight-tmc: Add support to set default mem_type" into msm-4.9 (702aa97c) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/hwtracing/coresight/coresight-tmc.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -436,8 +436,11 @@ static int tmc_probe(struct amba_device adev, const struct amba_id id)
		if (ret)
		drvdata->size = SZ_1M;

		drvdata->mem_size = drvdata->size;
		if (of_property_read_bool(np, "arm,sg-enable"))
		drvdata->memtype = TMC_ETR_MEM_TYPE_SG;
		else
		drvdata->memtype = TMC_ETR_MEM_TYPE_CONTIG;
		drvdata->mem_size = drvdata->size;
		drvdata->mem_type = drvdata->memtype;
		} else {
		drvdata->size = readl_relaxed(drvdata->base + TMC_RSZ) * 4;