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

Commit af8e44de authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "coresight-dummy: add device tree property for source devices" into msm-4.9

parents 573b6cf8 80e47d47

Documentation/devicetree/bindings/arm/coresight.txt

+3 −0
Original line number Diff line number Diff line
@@ -84,6 +84,9 @@ its hardware characteristcs. 


	* coresight-name: unique descriptive name of the component.



* Additional required property for coresight-dummy devices:

	* qcom,dummy-source: Configure the device as source.



* Optional properties for all components:

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

drivers/hwtracing/coresight/coresight-dummy.c

+9 −2
Original line number Diff line number Diff line
@@ -84,8 +84,15 @@ static int dummy_probe(struct platform_device *pdev) 


	drvdata->traceid = traceid++;



	if (of_property_read_bool(pdev->dev.of_node, "qcom,dummy-source")) {

		desc->type = CORESIGHT_DEV_TYPE_SOURCE;

	desc->subtype.source_subtype = CORESIGHT_DEV_SUBTYPE_SOURCE_PROC;

		desc->subtype.source_subtype =

					CORESIGHT_DEV_SUBTYPE_SOURCE_PROC;

	} else {

		dev_info(dev, "Device type not set.\n");

		return -EINVAL;

	}



	desc->ops = &dummy_cs_ops;

	desc->pdata = pdev->dev.platform_data;

	desc->dev = &pdev->dev;