Commit 1c885984 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Greg Kroah-Hartman
Browse files

coresight replicator: Cleanup programmable replicator naming 



The Linux coresight drivers define the programmable ATB replicator as
Qualcomm replicator, while this is designed by ARM. This can cause
confusion to a user selecting the driver. Cleanup all references to
make it explicitly clear. This patch :

 1) Replace the compatible string for the replicator :
      qcom,coresight-replicator1x => arm,coresight-dynamic-replicator
 2) Changes the Kconfig symbol (since this is not part of any defconfigs)
     CORESIGHT_QCOM_REPLICATOR => CORESIGHT_DYNAMIC_REPLICATOR
 3) Improves the help message in the Kconfig.
 4) Changes the name of the driver and the file :
      coresight-replicator-qcom => coresight-dynamic-replicator

Cc: Pratik Patel <pratikp@codeaurora.org>
Cc: Ivan T. Ivanov <ivan.ivanov@linaro.org>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: devicetree@vger.kernel.org
Cc: Mark Rutland <mark.rutland@arm.com>
Acked-by: default avatarRob Herring <robh+dt@kernel.org>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 27b8f667

Documentation/devicetree/bindings/arm/coresight.txt

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ its hardware characteristcs. 
		- Embedded Trace Macrocell (version 4.x):

			"arm,coresight-etm4x", "arm,primecell";



		- Qualcomm Configurable Replicator (version 1.x):

			"qcom,coresight-replicator1x", "arm,primecell";

		- Coresight programmable Replicator :

			"arm,coresight-dynamic-replicator", "arm,primecell";



		- System Trace Macrocell:

			"arm,coresight-stm", "arm,primecell"; [1]

drivers/hwtracing/coresight/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -70,13 +70,13 @@ config CORESIGHT_SOURCE_ETM4X 
	  for instruction level tracing. Depending on the implemented version

	  data tracing may also be available.



config CORESIGHT_QCOM_REPLICATOR

	bool "Qualcomm CoreSight Replicator driver"

config CORESIGHT_DYNAMIC_REPLICATOR

	bool "CoreSight Programmable Replicator driver"

	depends on CORESIGHT_LINKS_AND_SINKS

	help

	  This enables support for Qualcomm CoreSight link driver. The

	  programmable ATB replicator sends the ATB trace stream from the

	  ETB/ETF to the TPIUi and ETR.

	  This enables support for dynamic CoreSight replicator link driver.

	  The programmable ATB replicator allows independent filtering of the

	  trace data based on the traceid.



config CORESIGHT_STM

	bool "CoreSight System Trace Macrocell driver"

drivers/hwtracing/coresight/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ obj-$(CONFIG_CORESIGHT_SOURCE_ETM3X) += coresight-etm3x.o coresight-etm-cp14.o \ 
					coresight-etm3x-sysfs.o

obj-$(CONFIG_CORESIGHT_SOURCE_ETM4X) += coresight-etm4x.o \

					coresight-etm4x-sysfs.o

obj-$(CONFIG_CORESIGHT_QCOM_REPLICATOR) += coresight-replicator-qcom.o

obj-$(CONFIG_CORESIGHT_DYNAMIC_REPLICATOR) += coresight-dynamic-replicator.o

obj-$(CONFIG_CORESIGHT_STM) += coresight-stm.o

obj-$(CONFIG_CORESIGHT_CPU_DEBUG) += coresight-cpu-debug.o

drivers/hwtracing/coresight/coresight-replicator-qcom.c→drivers/hwtracing/coresight/coresight-dynamic-replicator.c

+1 −3
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ static int replicator_probe(struct amba_device *adev, const struct amba_id *id) 
	if (IS_ERR(drvdata->csdev))

		return PTR_ERR(drvdata->csdev);



	dev_info(dev, "%s initialized\n", (char *)id->data);

	return 0;

}
@@ -179,14 +178,13 @@ static struct amba_id replicator_ids[] = { 
	{

		.id     = 0x0003b909,

		.mask   = 0x0003ffff,

		.data	= "REPLICATOR 1.0",

	},

	{ 0, 0 },

};



static struct amba_driver replicator_driver = {

	.drv = {

		.name	= "coresight-replicator-qcom",

		.name	= "coresight-dynamic-replicator",

		.pm	= &replicator_dev_pm_ops,

		.suppress_bind_attrs = true,

	},

CRA Git | Maintained and supported by SUSTech CRA and CCSE