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

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
...@@ -34,8 +34,8 @@ its hardware characteristcs. ...@@ -34,8 +34,8 @@ its hardware characteristcs.
- Embedded Trace Macrocell (version 4.x): - Embedded Trace Macrocell (version 4.x):
"arm,coresight-etm4x", "arm,primecell"; "arm,coresight-etm4x", "arm,primecell";
- Qualcomm Configurable Replicator (version 1.x): - Coresight programmable Replicator :
"qcom,coresight-replicator1x", "arm,primecell"; "arm,coresight-dynamic-replicator", "arm,primecell";
- System Trace Macrocell: - System Trace Macrocell:
"arm,coresight-stm", "arm,primecell"; [1] "arm,coresight-stm", "arm,primecell"; [1]
......
...@@ -70,13 +70,13 @@ config CORESIGHT_SOURCE_ETM4X ...@@ -70,13 +70,13 @@ config CORESIGHT_SOURCE_ETM4X
for instruction level tracing. Depending on the implemented version for instruction level tracing. Depending on the implemented version
data tracing may also be available. data tracing may also be available.
config CORESIGHT_QCOM_REPLICATOR config CORESIGHT_DYNAMIC_REPLICATOR
bool "Qualcomm CoreSight Replicator driver" bool "CoreSight Programmable Replicator driver"
depends on CORESIGHT_LINKS_AND_SINKS depends on CORESIGHT_LINKS_AND_SINKS
help help
This enables support for Qualcomm CoreSight link driver. The This enables support for dynamic CoreSight replicator link driver.
programmable ATB replicator sends the ATB trace stream from the The programmable ATB replicator allows independent filtering of the
ETB/ETF to the TPIUi and ETR. trace data based on the traceid.
config CORESIGHT_STM config CORESIGHT_STM
bool "CoreSight System Trace Macrocell driver" bool "CoreSight System Trace Macrocell driver"
......
...@@ -14,6 +14,6 @@ obj-$(CONFIG_CORESIGHT_SOURCE_ETM3X) += coresight-etm3x.o coresight-etm-cp14.o \ ...@@ -14,6 +14,6 @@ obj-$(CONFIG_CORESIGHT_SOURCE_ETM3X) += coresight-etm3x.o coresight-etm-cp14.o \
coresight-etm3x-sysfs.o coresight-etm3x-sysfs.o
obj-$(CONFIG_CORESIGHT_SOURCE_ETM4X) += coresight-etm4x.o \ obj-$(CONFIG_CORESIGHT_SOURCE_ETM4X) += coresight-etm4x.o \
coresight-etm4x-sysfs.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_STM) += coresight-stm.o
obj-$(CONFIG_CORESIGHT_CPU_DEBUG) += coresight-cpu-debug.o obj-$(CONFIG_CORESIGHT_CPU_DEBUG) += coresight-cpu-debug.o
...@@ -143,7 +143,6 @@ static int replicator_probe(struct amba_device *adev, const struct amba_id *id) ...@@ -143,7 +143,6 @@ static int replicator_probe(struct amba_device *adev, const struct amba_id *id)
if (IS_ERR(drvdata->csdev)) if (IS_ERR(drvdata->csdev))
return PTR_ERR(drvdata->csdev); return PTR_ERR(drvdata->csdev);
dev_info(dev, "%s initialized\n", (char *)id->data);
return 0; return 0;
} }
...@@ -179,14 +178,13 @@ static struct amba_id replicator_ids[] = { ...@@ -179,14 +178,13 @@ static struct amba_id replicator_ids[] = {
{ {
.id = 0x0003b909, .id = 0x0003b909,
.mask = 0x0003ffff, .mask = 0x0003ffff,
.data = "REPLICATOR 1.0",
}, },
{ 0, 0 }, { 0, 0 },
}; };
static struct amba_driver replicator_driver = { static struct amba_driver replicator_driver = {
.drv = { .drv = {
.name = "coresight-replicator-qcom", .name = "coresight-dynamic-replicator",
.pm = &replicator_dev_pm_ops, .pm = &replicator_dev_pm_ops,
.suppress_bind_attrs = true, .suppress_bind_attrs = true,
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment