Merge branch 'devel-stable' of git://git.armlinux.org.uk/~rmk/linux-arm into char...

[linux-2.6-microblaze.git] / drivers / hwtracing / coresight / coresight-etb10.c

diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c
index 51c801c..f775cbe 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etb10.c
+++ b/drivers/hwtracing/coresight/coresight-etb10.c
@@ -132,7 +132,7 @@ static void __etb_enable_hw(struct etb_drvdata *drvdata)
 
 static int etb_enable_hw(struct etb_drvdata *drvdata)
 {
-       int rc = coresight_claim_device(drvdata->base);
+       int rc = coresight_claim_device(drvdata->csdev);
 
        if (rc)
                return rc;
@@ -252,6 +252,7 @@ static void __etb_disable_hw(struct etb_drvdata *drvdata)
 {
        u32 ffcr;
        struct device *dev = &drvdata->csdev->dev;
+       struct csdev_access *csa = &drvdata->csdev->access;
 
        CS_UNLOCK(drvdata->base);
 
@@ -263,7 +264,7 @@ static void __etb_disable_hw(struct etb_drvdata *drvdata)
        ffcr |= ETB_FFCR_FON_MAN;
        writel_relaxed(ffcr, drvdata->base + ETB_FFCR);
 
-       if (coresight_timeout(drvdata->base, ETB_FFCR, ETB_FFCR_BIT, 0)) {
+       if (coresight_timeout(csa, ETB_FFCR, ETB_FFCR_BIT, 0)) {
                dev_err(dev,
                "timeout while waiting for completion of Manual Flush\n");
        }
@@ -271,7 +272,7 @@ static void __etb_disable_hw(struct etb_drvdata *drvdata)
        /* disable trace capture */
        writel_relaxed(0x0, drvdata->base + ETB_CTL_REG);
 
-       if (coresight_timeout(drvdata->base, ETB_FFSR, ETB_FFSR_BIT, 1)) {
+       if (coresight_timeout(csa, ETB_FFSR, ETB_FFSR_BIT, 1)) {
                dev_err(dev,
                        "timeout while waiting for Formatter to Stop\n");
        }
@@ -344,7 +345,7 @@ static void etb_disable_hw(struct etb_drvdata *drvdata)
 {
        __etb_disable_hw(drvdata);
        etb_dump_hw(drvdata);
-       coresight_disclaim_device(drvdata->base);
+       coresight_disclaim_device(drvdata->csdev);
 }
 
 static int etb_disable(struct coresight_device *csdev)
@@ -757,6 +758,7 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id)
                return PTR_ERR(base);
 
        drvdata->base = base;
+       desc.access = CSDEV_ACCESS_IOMEM(base);
 
        spin_lock_init(&drvdata->spinlock);