[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-id: <1479099731-28108-4-git-send-email-pankaj.dubey@samsung.com>
Date: Mon, 14 Nov 2016 10:31:58 +0530
From: Pankaj Dubey <pankaj.dubey@...sung.com>
To: linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Cc: rmk+kernel@...linux.org.uk, arnd@...db.de, horms@...ge.net.au,
magnus.damm@...il.com, geert+renesas@...der.be, vireshk@...nel.org,
shiraz.linux.kernel@...il.com, krzk@...nel.org,
thomas.ab@...sung.com, Pankaj Dubey <pankaj.dubey@...sung.com>,
Jisheng Zhang <jszhang@...vell.com>,
Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>
Subject: [PATCH 03/16] ARM: berlin: use generic API for enabling SCU
Now as we have of_scu_enable which takes care of mapping
scu base from DT, lets use it.
CC: Jisheng Zhang <jszhang@...vell.com>
CC: Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>
Signed-off-by: Pankaj Dubey <pankaj.dubey@...sung.com>
---
arch/arm/mach-berlin/platsmp.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/arch/arm/mach-berlin/platsmp.c b/arch/arm/mach-berlin/platsmp.c
index 93f9068..25a6ca5 100644
--- a/arch/arm/mach-berlin/platsmp.c
+++ b/arch/arm/mach-berlin/platsmp.c
@@ -60,26 +60,21 @@ static int berlin_boot_secondary(unsigned int cpu, struct task_struct *idle)
static void __init berlin_smp_prepare_cpus(unsigned int max_cpus)
{
struct device_node *np;
- void __iomem *scu_base;
void __iomem *vectors_base;
- np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu");
- scu_base = of_iomap(np, 0);
- of_node_put(np);
- if (!scu_base)
- return;
-
np = of_find_compatible_node(NULL, NULL, "marvell,berlin-cpu-ctrl");
cpu_ctrl = of_iomap(np, 0);
of_node_put(np);
if (!cpu_ctrl)
- goto unmap_scu;
+ return;
vectors_base = ioremap(CONFIG_VECTORS_BASE, SZ_32K);
if (!vectors_base)
- goto unmap_scu;
+ return;
+
+ if (of_scu_enable())
+ return;
- scu_enable(scu_base);
flush_cache_all();
/*
@@ -95,8 +90,6 @@ static void __init berlin_smp_prepare_cpus(unsigned int max_cpus)
writel(virt_to_phys(secondary_startup), vectors_base + SW_RESET_ADDR);
iounmap(vectors_base);
-unmap_scu:
- iounmap(scu_base);
}
#ifdef CONFIG_HOTPLUG_CPU
--
2.7.4
Powered by blists - more mailing lists