Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / perf / arm-ccn.c

diff --git a/drivers/perf/arm-ccn.c b/drivers/perf/arm-ccn.c
index 6fc0273b6129d286c111d182fb4cbf63ecda670d..fea354d6fb2999854592c34f42e76c0cb96ec513 100644 (file)
--- a/drivers/perf/arm-ccn.c
+++ b/drivers/perf/arm-ccn.c
@@ -1477,8 +1477,7 @@ static int arm_ccn_probe(struct platform_device *pdev)
        ccn->dev = &pdev->dev;
        platform_set_drvdata(pdev, ccn);
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       ccn->base = devm_ioremap_resource(ccn->dev, res);
+       ccn->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(ccn->base))
                return PTR_ERR(ccn->base);
 
@@ -1537,6 +1536,7 @@ static int arm_ccn_remove(struct platform_device *pdev)
 static const struct of_device_id arm_ccn_match[] = {
        { .compatible = "arm,ccn-502", },
        { .compatible = "arm,ccn-504", },
+       { .compatible = "arm,ccn-512", },
        {},
 };
 MODULE_DEVICE_TABLE(of, arm_ccn_match);