Commit 36f59082 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Greg Kroah-Hartman

coresight: replicator: Cleanup device tracking

In preparation to use a consistent device naming scheme,
clean up the device link tracking in replicator driver.
Use the "coresight" device instead of the "real" parent device
for all internal purposes. All other requests (e.g, power management,
DMA operations) must use the "real" device which is the parent device.
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 207f3112
...@@ -26,13 +26,11 @@ ...@@ -26,13 +26,11 @@
* struct replicator_drvdata - specifics associated to a replicator component * struct replicator_drvdata - specifics associated to a replicator component
* @base: memory mapped base address for this component. Also indicates * @base: memory mapped base address for this component. Also indicates
* whether this one is programmable or not. * whether this one is programmable or not.
* @dev: the device entity associated with this component
* @atclk: optional clock for the core parts of the replicator. * @atclk: optional clock for the core parts of the replicator.
* @csdev: component vitals needed by the framework * @csdev: component vitals needed by the framework
*/ */
struct replicator_drvdata { struct replicator_drvdata {
void __iomem *base; void __iomem *base;
struct device *dev;
struct clk *atclk; struct clk *atclk;
struct coresight_device *csdev; struct coresight_device *csdev;
}; };
...@@ -100,7 +98,7 @@ static int replicator_enable(struct coresight_device *csdev, int inport, ...@@ -100,7 +98,7 @@ static int replicator_enable(struct coresight_device *csdev, int inport,
if (drvdata->base) if (drvdata->base)
rc = dynamic_replicator_enable(drvdata, inport, outport); rc = dynamic_replicator_enable(drvdata, inport, outport);
if (!rc) if (!rc)
dev_dbg(drvdata->dev, "REPLICATOR enabled\n"); dev_dbg(&csdev->dev, "REPLICATOR enabled\n");
return rc; return rc;
} }
...@@ -139,7 +137,7 @@ static void replicator_disable(struct coresight_device *csdev, int inport, ...@@ -139,7 +137,7 @@ static void replicator_disable(struct coresight_device *csdev, int inport,
if (drvdata->base) if (drvdata->base)
dynamic_replicator_disable(drvdata, inport, outport); dynamic_replicator_disable(drvdata, inport, outport);
dev_dbg(drvdata->dev, "REPLICATOR disabled\n"); dev_dbg(&csdev->dev, "REPLICATOR disabled\n");
} }
static const struct coresight_ops_link replicator_link_ops = { static const struct coresight_ops_link replicator_link_ops = {
...@@ -196,7 +194,6 @@ static int replicator_probe(struct device *dev, struct resource *res) ...@@ -196,7 +194,6 @@ static int replicator_probe(struct device *dev, struct resource *res)
if (!drvdata) if (!drvdata)
return -ENOMEM; return -ENOMEM;
drvdata->dev = dev;
drvdata->atclk = devm_clk_get(dev, "atclk"); /* optional */ drvdata->atclk = devm_clk_get(dev, "atclk"); /* optional */
if (!IS_ERR(drvdata->atclk)) { if (!IS_ERR(drvdata->atclk)) {
ret = clk_prepare_enable(drvdata->atclk); ret = clk_prepare_enable(drvdata->atclk);
......
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