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

Commit fd38d0fb authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Coresight: Modify reset channel for tmc-etf"

parents d85bbb79 4f71bfce

drivers/hwtracing/coresight/coresight-tmc-etf.c

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int tmc_enable_etf_sink_sysfs(struct coresight_device *csdev) 
		kfree(buf);



	if (!ret) {

		coresight_cti_map_trigin(drvdata->cti_reset, 2, 0);

		coresight_cti_map_trigin(drvdata->cti_reset, 0, 0);

		coresight_cti_map_trigout(drvdata->cti_flush, 1, 0);

		dev_info(drvdata->dev, "TMC-ETB/ETF enabled\n");

	}
@@ -262,7 +262,7 @@ static void tmc_disable_etf_sink(struct coresight_device *csdev) 


	spin_unlock_irqrestore(&drvdata->spinlock, flags);



	coresight_cti_unmap_trigin(drvdata->cti_reset, 2, 0);

	coresight_cti_unmap_trigin(drvdata->cti_reset, 0, 0);

	coresight_cti_unmap_trigout(drvdata->cti_flush, 1, 0);



	dev_info(drvdata->dev, "TMC-ETB/ETF disabled\n");

drivers/hwtracing/coresight/coresight-tmc.c

+8 −4
Original line number Diff line number Diff line
@@ -683,12 +683,16 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) 
		dev_err(dev, "invalid cti data\n");

	} else if (ctidata && ctidata->nr_ctis == 2) {

		drvdata->cti_flush = coresight_cti_get(ctidata->names[0]);

		if (IS_ERR(drvdata->cti_flush))

			dev_err(dev, "failed to get flush cti\n");

		if (IS_ERR(drvdata->cti_flush)) {

			dev_err(dev, "failed to get flush cti, defer probe\n");

			return -EPROBE_DEFER;

		}



		drvdata->cti_reset = coresight_cti_get(ctidata->names[1]);

		if (IS_ERR(drvdata->cti_reset))

			dev_err(dev, "failed to get reset cti\n");

		if (IS_ERR(drvdata->cti_reset)) {

			dev_err(dev, "failed to get reset cti, defer probe\n");

			return -EPROBE_DEFER;

		}

	}



	desc.pdata = pdata;