diff options
Diffstat (limited to 'arch/arm/mach-bcm/board_bcm.c')
| -rw-r--r-- | arch/arm/mach-bcm/board_bcm.c | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/arch/arm/mach-bcm/board_bcm.c b/arch/arm/mach-bcm/board_bcm.c index 3a62f1b1cab..22e8421b1df 100644 --- a/arch/arm/mach-bcm/board_bcm.c +++ b/arch/arm/mach-bcm/board_bcm.c @@ -11,47 +11,51 @@ * GNU General Public License for more details. */ -#include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/init.h> #include <linux/device.h> #include <linux/platform_device.h> +#include <linux/irqchip.h> +#include <linux/clocksource.h> #include <asm/mach/arch.h> -#include <asm/hardware/gic.h> - #include <asm/mach/time.h> +#include <asm/hardware/cache-l2x0.h> + -static const struct of_device_id irq_match[] = { - {.compatible = "arm,cortex-a9-gic", .data = gic_of_init, }, - {} -}; +#include "bcm_kona_smc.h" -static void timer_init(void) +static int __init kona_l2_cache_init(void) { -} + if (!IS_ENABLED(CONFIG_CACHE_L2X0)) + return 0; -static struct sys_timer timer = { - .init = timer_init, -}; + bcm_kona_smc(SSAPI_ENABLE_L2_CACHE, 0, 0, 0, 0); -static void __init init_irq(void) -{ - of_irq_init(irq_match); + /* + * 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. + */ + l2x0_of_init(0, ~0); + + return 0; } static void __init board_init(void) { of_platform_populate(NULL, of_default_bus_match_table, NULL, &platform_bus); + + bcm_kona_smc_init(); + + kona_l2_cache_init(); } static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, }; DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor") - .init_irq = init_irq, - .timer = &timer, + .init_irq = irqchip_init, + .init_time = clocksource_of_init, .init_machine = board_init, .dt_compat = bcm11351_dt_compat, - .handle_irq = gic_handle_irq, MACHINE_END |