Merge branch 'devel-stable' into for-linus

[firefly-linux-kernel-4.4.55.git] / arch / arm / mm / cache-feroceon-l2.c

diff --git a/arch/arm/mm/cache-feroceon-l2.c b/arch/arm/mm/cache-feroceon-l2.c
index 097181e08c25f7e924a33a51afc995b2e9baacdd..5c1b7a7b9af630002a49852652a36b6a698bf062 100644 (file)
--- a/arch/arm/mm/cache-feroceon-l2.c
+++ b/arch/arm/mm/cache-feroceon-l2.c
@@ -368,7 +368,6 @@ int __init feroceon_of_init(void)
        struct device_node *node;
        void __iomem *base;
        bool l2_wt_override = false;
-       struct resource res;
 
 #if defined(CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH)
        l2_wt_override = true;
@@ -376,10 +375,7 @@ int __init feroceon_of_init(void)
 
        node = of_find_matching_node(NULL, feroceon_ids);
        if (node && of_device_is_compatible(node, "marvell,kirkwood-cache")) {
-               if (of_address_to_resource(node, 0, &res))
-                       return -ENODEV;
-
-               base = ioremap(res.start, resource_size(&res));
+               base = of_iomap(node, 0);
                if (!base)
                        return -ENOMEM;