Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b1c3426 authored by Markus Mayer's avatar Markus Mayer Committed by Matt Porter
Browse files

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: default avatarMarkus Mayer <markus.mayer@linaro.org>
Signed-off-by: default avatarMatt Porter <mporter@linaro.org>
parent 9c6423aa

arch/arm/mach-bcm/board_bcm281xx.c

+1 −25
Original line number Diff line number Diff line
@@ -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;

arch/arm/mach-bcm/kona.c

+29 −1
Original line number Diff line number Diff line 
/*

 * 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)

arch/arm/mach-bcm/kona.h

+2 −1
Original line number Diff line number Diff line 
/*

 * 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);