diff options
author | Markus Mayer <markus.mayer@linaro.org> | 2014-02-25 14:17:43 -0800 |
---|---|---|
committer | Matt Porter <mporter@linaro.org> | 2014-03-06 03:17:59 -0500 |
commit | 8b1c342629ecf7c2c52600dbe626d74cffc8d6cc (patch) | |
tree | 8127124f28d8b4bea739c64d06c613bef9df3fd5 /arch/arm | |
parent | 9c6423aa7e32c74f7992c0428d8456373a5c48a8 (diff) | |
download | linux-stable-8b1c342629ecf7c2c52600dbe626d74cffc8d6cc.tar.gz linux-stable-8b1c342629ecf7c2c52600dbe626d74cffc8d6cc.tar.bz2 linux-stable-8b1c342629ecf7c2c52600dbe626d74cffc8d6cc.zip |
ARM: bcm281xx: Move kona_l2_cache_init() so it can be shared
In preparation for future SoCs, move kona_l2_cache_init() from board
specific board_bcm281xx.c to shared kona.c, so multiple SoC families
can make use of it. Also change the return type to "void", since we
never look at the return code anyway.
Signed-off-by: Markus Mayer <markus.mayer@linaro.org>
Signed-off-by: Matt Porter <mporter@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-bcm/board_bcm281xx.c | 26 | ||||
-rw-r--r-- | arch/arm/mach-bcm/kona.c | 30 | ||||
-rw-r--r-- | arch/arm/mach-bcm/kona.h | 3 |
3 files changed, 32 insertions, 27 deletions
diff --git a/arch/arm/mach-bcm/board_bcm281xx.c b/arch/arm/mach-bcm/board_bcm281xx.c index d8f0b6cc78aa..5494e9146761 100644 --- a/arch/arm/mach-bcm/board_bcm281xx.c +++ b/arch/arm/mach-bcm/board_bcm281xx.c @@ -12,37 +12,13 @@ */ #include <linux/of_platform.h> -#include <linux/init.h> -#include <linux/device.h> -#include <linux/platform_device.h> +#include <linux/of_address.h> #include <linux/clocksource.h> #include <asm/mach/arch.h> -#include <asm/mach/time.h> -#include <asm/hardware/cache-l2x0.h> -#include "bcm_kona_smc.h" #include "kona.h" -static int __init kona_l2_cache_init(void) -{ - if (!IS_ENABLED(CONFIG_CACHE_L2X0)) - return 0; - - if (bcm_kona_smc_init() < 0) { - pr_info("Kona secure API not available. Skipping L2 init\n"); - return 0; - } - - bcm_kona_smc(SSAPI_ENABLE_L2_CACHE, 0, 0, 0, 0); - - /* - * The aux_val and aux_mask have no effect since L2 cache is already - * enabled. Pass 0s for aux_val and 1s for aux_mask for default value. - */ - return l2x0_of_init(0, ~0); -} - static void bcm_board_setup_restart(void) { struct device_node *np; diff --git a/arch/arm/mach-bcm/kona.c b/arch/arm/mach-bcm/kona.c index 6939d9017f63..2f1db29291fe 100644 --- a/arch/arm/mach-bcm/kona.c +++ b/arch/arm/mach-bcm/kona.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Broadcom Corporation + * Copyright (C) 2012-2014 Broadcom Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -12,10 +12,38 @@ */ #include <linux/of_address.h> +#include <linux/of_platform.h> +#include <asm/hardware/cache-l2x0.h> #include <asm/io.h> +#include "bcm_kona_smc.h" #include "kona.h" +void __init kona_l2_cache_init(void) +{ + int ret; + + if (!IS_ENABLED(CONFIG_CACHE_L2X0)) + return; + + ret = bcm_kona_smc_init(); + if (ret) { + pr_info("Secure API not available (%d). Skipping L2 init.\n", + ret); + return; + } + + bcm_kona_smc(SSAPI_ENABLE_L2_CACHE, 0, 0, 0, 0); + + /* + * The aux_val and aux_mask have no effect since L2 cache is already + * enabled. Pass 0s for aux_val and 1s for aux_mask for default value. + */ + ret = l2x0_of_init(0, ~0); + if (ret) + pr_err("Couldn't enable L2 cache: %d\n", ret); +} + static void __iomem *watchdog_base; void bcm_kona_setup_restart(void) diff --git a/arch/arm/mach-bcm/kona.h b/arch/arm/mach-bcm/kona.h index 291eca3e06ff..f42aef837444 100644 --- a/arch/arm/mach-bcm/kona.h +++ b/arch/arm/mach-bcm/kona.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Broadcom Corporation + * Copyright (C) 2012-2014 Broadcom Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -13,5 +13,6 @@ #include <linux/reboot.h> +void __init kona_l2_cache_init(void); void bcm_kona_setup_restart(void); void bcm_kona_restart(enum reboot_mode mode, const char *cmd); |