From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751923Ab2LQGTA (ORCPT ); Mon, 17 Dec 2012 01:19:00 -0500 Received: from hqemgate03.nvidia.com ([216.228.121.140]:12980 "EHLO hqemgate03.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751806Ab2LQGS5 (ORCPT ); Mon, 17 Dec 2012 01:18:57 -0500 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Sun, 16 Dec 2012 22:18:44 -0800 From: Hiroshi Doyu To: CC: Hiroshi Doyu , Grant Likely , Rob Herring , Rob Landley , Stephen Warren , Russell King , , , , Subject: [PATCH 4/4] ARM: tegra: Set SCU base address dynamically from DT Date: Mon, 17 Dec 2012 08:18:04 +0200 Message-ID: <1355725087-11363-4-git-send-email-hdoyu@nvidia.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1355725087-11363-1-git-send-email-hdoyu@nvidia.com> References: <1355725087-11363-1-git-send-email-hdoyu@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Set Snoop Control Unit(SCU) register base address dynamically from DT. Signed-off-by: Hiroshi Doyu --- arch/arm/mach-tegra/platsmp.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c index 1b926df..45c0b79 100644 --- a/arch/arm/mach-tegra/platsmp.c +++ b/arch/arm/mach-tegra/platsmp.c @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include #include @@ -36,7 +38,7 @@ extern void tegra_secondary_startup(void); -static void __iomem *scu_base = IO_ADDRESS(TEGRA_ARM_PERIF_BASE); +static void __iomem *scu_base; #define EVP_CPU_RESET_VECTOR \ (IO_ADDRESS(TEGRA_EXCEPTION_VECTORS_BASE) + 0x100) @@ -143,14 +145,28 @@ done: return status; } +static const struct of_device_id cortex_a9_scu_match[] __initconst = { + { .compatible = "arm,cortex-a9-scu", }, + {} +}; + /* * Initialise the CPU possible map early - this describes the CPUs * which may be present or become present in the system. */ static void __init tegra_smp_init_cpus(void) { - unsigned int i, ncores = scu_get_core_count(scu_base); + struct device_node *np; + unsigned int i, ncores = 1; + + np = of_find_matching_node(NULL, cortex_a9_scu_match); + if (!np) + return; + scu_base = of_iomap(np, 0); + if (!scu_base) + return; + ncores = scu_get_core_count(scu_base); if (ncores > nr_cpu_ids) { pr_warn("SMP: %u cores greater than maximum (%u), clipping\n", ncores, nr_cpu_ids); @@ -166,7 +182,8 @@ static void __init tegra_smp_init_cpus(void) static void __init tegra_smp_prepare_cpus(unsigned int max_cpus) { tegra_cpu_reset_handler_init(); - scu_enable(scu_base); + if (scu_base) + scu_enable(scu_base); } struct smp_operations tegra_smp_ops __initdata = { -- 1.7.9.5