Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941426AbcKNFDd (ORCPT ); Mon, 14 Nov 2016 00:03:33 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:51703 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932189AbcKNE7a (ORCPT ); Sun, 13 Nov 2016 23:59:30 -0500 X-AuditID: cbfee61a-f79916d0000062de-80-582944a63651 From: Pankaj Dubey To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: rmk+kernel@armlinux.org.uk, arnd@arndb.de, horms@verge.net.au, magnus.damm@gmail.com, geert+renesas@glider.be, vireshk@kernel.org, shiraz.linux.kernel@gmail.com, krzk@kernel.org, thomas.ab@samsung.com, Pankaj Dubey , Jisheng Zhang , Sebastian Hesselbarth Subject: [PATCH 03/16] ARM: berlin: use generic API for enabling SCU Date: Mon, 14 Nov 2016 10:31:58 +0530 Message-id: <1479099731-28108-4-git-send-email-pankaj.dubey@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1479099731-28108-1-git-send-email-pankaj.dubey@samsung.com> References: <1479099731-28108-1-git-send-email-pankaj.dubey@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCIsWRmVeSWpSXmKPExsVy+t9jQd1lLpoRBo/vWVv8nXSM3WLu7EmM Fs1bvzJavDu+m8Xi/PkN7BabHl9jtbi8aw6bxYPVb9ksFm39wm5xqX8ik8X7n44W87+dZLXo WMZosfnBMTYHPo/L1y4ye/z+NYnRY+JZXY+ds+6ye2xa1cnmsXlJvcfkhUC5vi2rGD3m/PzG 4vF5k1wAV5SbTUZqYkpqkUJqXnJ+SmZeuq1SaIibroWSQl5ibqqtUoSub0iQkkJZYk4pkGdk gAYcnAPcg5X07RLcMlZu6WcqOMtTcW7VCeYGxn1cXYwcHBICJhIXp/t2MXICmWISF+6tZ+ti 5OIQEpjFKPFz7woo5yejRPP3bWwgVWwCuhJP3s9lBrFFBNwkbjR2MIEUMQvcZpL4Of8LC0hC WMBFoq3hFBvIBhYBVYkvi6JAwrwCHhKzf31jhNgmJ3HzXCfYHE4BT4k5nWfA5gsB1Ty/cZ1x AiPvAkaGVYwSqQXJBcVJ6bmGeanlesWJucWleel6yfm5mxjBMfRMagfjwV3uhxgFOBiVeHgP mGlGCLEmlhVX5h5ilOBgVhLhdbUBCvGmJFZWpRblxxeV5qQWH2I0BbprIrOUaHI+ML7zSuIN TcxNzI0NLMwtLU2MlMR5G2c/CxcSSE8sSc1OTS1ILYLpY+LglGpgPPz6Ctckb/FsUSvDzgzl 8zrTLaqDGu8G30+UdClpmtb+/WrF4Xuss+xmH/c//kt99R2X/21n3nrczXSYlXBj1dw3C77e OXl135v1UgFBNllzUzOqC44cehMhUr/C+O+R0GOWFQe//fHx/cfwPHC52Kb3/U7HLmtuezgp Sbs3oCPf7CO7g8DCTUosxRmJhlrMRcWJAEogC323AgAA X-MTR: 20000000000000000@CPGS Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1554 Lines: 57 Now as we have of_scu_enable which takes care of mapping scu base from DT, lets use it. CC: Jisheng Zhang CC: Sebastian Hesselbarth Signed-off-by: Pankaj Dubey --- 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