mirror of
https://github.com/torvalds/linux.git
synced 2024-12-17 00:21:32 +00:00
ARM: mach-bcm: cleanups for 3.15
- make bcm281xx symbol naming consistent with SoC name - remove unneeded and reorder bcm281xx header files - consolidate bcm281xx reboot and l2 cache code # -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJTGDPeAAoJEOfTILNwq7R4qf0QAPRRcEFl8+B1jHFKeoR1NE73 Y8RaajbaaVbiu7R/P3u271KfLl0M5yT3XT/ocG6wzaMgbewb3EYs47kNGJ8STqAB N9SCrS3baWbSjHKFbgHGqz/LMhGEWwUuRa0UE9Pqth/jhLcxS4p3sASyugINEr66 E/mzZ5u04HRPE97FyAl6MbpX0ZOcA7BjNpeSwIDgd74bj6fmi2cO8Yo+Sozd2nBj bKo4BdTmJYx0O2A3p5UEjbQKOeAffoKznYKmIyfhsx21sRigkqj85JpynAO6bNY7 wPhnGXbcePqECnBxSvlLwsVTmBKN3QKzMIjiHrqBDQ5bWl4ffVK68UtuBSxsmgWw oA9e76tT5qtbDDmWki4T0hhpK8LB27cJQB87nuV5C+C75FfVKRQLmg2jO4F+FllG K20Y+a2d6LGsUaMYeR/QhrPdMXCgwDGOjsqHerAGXWZXVHUiOB+KMyeS8cOQm1YV b5UgbNaOc1myrjejbvHfPMopdMuznWq1a3eVlK4W5cJKaY60/i3bqvdGn8bNJLQb 2ViePUfHpx4vMeKWnfNtD2Ys6lvkw1DMy0uVLRkQEQO88jJBDWrJaA7cUNekCd2E R12sj7H61lvdi5lfz9mKabWHY0jZlqB6A1lGsTtvb/bL49faMGFJynfni9ZYv8zW D/j3x30zph+6gkC/8pi/ =vYzH -----END PGP SIGNATURE----- Merge tag 'armsoc/for-3.15/cleanup' of git://github.com/broadcom/mach-bcm into next/cleanup Merge "ARM: mach-bcm: cleanups for 3.15" from Matt Porter: - make bcm281xx symbol naming consistent with SoC name - remove unneeded and reorder bcm281xx header files - consolidate bcm281xx reboot and l2 cache code * tag 'armsoc/for-3.15/cleanup' of git://github.com/broadcom/mach-bcm: ARM: bcm281xx: Rename board_init() function ARM: bcm281xx: Re-order hearder files ARM: bcm281xx: Consolidate reboot code ARM: bcm281xx: Move kona_l2_cache_init() so it can be shared ARM: bcm281xx: symbol cleanup Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
commit
50776b6cf8
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2012-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
|
||||
@ -11,64 +11,65 @@
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#include <linux/of_platform.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/clocksource.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/of_platform.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;
|
||||
#define SECWDOG_OFFSET 0x00000000
|
||||
#define SECWDOG_RESERVED_MASK 0xe2000000
|
||||
#define SECWDOG_WD_LOAD_FLAG_MASK 0x10000000
|
||||
#define SECWDOG_EN_MASK 0x08000000
|
||||
#define SECWDOG_SRSTEN_MASK 0x04000000
|
||||
#define SECWDOG_CLKS_SHIFT 20
|
||||
#define SECWDOG_COUNT_SHIFT 0
|
||||
|
||||
if (bcm_kona_smc_init() < 0) {
|
||||
pr_info("Kona secure API not available. Skipping L2 init\n");
|
||||
return 0;
|
||||
static void bcm281xx_restart(enum reboot_mode mode, const char *cmd)
|
||||
{
|
||||
uint32_t val;
|
||||
void __iomem *base;
|
||||
struct device_node *np_wdog;
|
||||
|
||||
np_wdog = of_find_compatible_node(NULL, NULL, "brcm,kona-wdt");
|
||||
if (!np_wdog) {
|
||||
pr_emerg("Couldn't find brcm,kona-wdt\n");
|
||||
return;
|
||||
}
|
||||
base = of_iomap(np_wdog, 0);
|
||||
if (!base) {
|
||||
pr_emerg("Couldn't map brcm,kona-wdt\n");
|
||||
return;
|
||||
}
|
||||
|
||||
bcm_kona_smc(SSAPI_ENABLE_L2_CACHE, 0, 0, 0, 0);
|
||||
/* Enable watchdog with short timeout (244us). */
|
||||
val = readl(base + SECWDOG_OFFSET);
|
||||
val &= SECWDOG_RESERVED_MASK | SECWDOG_WD_LOAD_FLAG_MASK;
|
||||
val |= SECWDOG_EN_MASK | SECWDOG_SRSTEN_MASK |
|
||||
(0x15 << SECWDOG_CLKS_SHIFT) |
|
||||
(0x8 << SECWDOG_COUNT_SHIFT);
|
||||
writel(val, base + SECWDOG_OFFSET);
|
||||
|
||||
/*
|
||||
* 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);
|
||||
/* Wait for reset */
|
||||
while (1);
|
||||
}
|
||||
|
||||
static void bcm_board_setup_restart(void)
|
||||
{
|
||||
struct device_node *np;
|
||||
|
||||
np = of_find_compatible_node(NULL, NULL, "brcm,bcm11351");
|
||||
if (np) {
|
||||
if (of_device_is_available(np))
|
||||
bcm_kona_setup_restart();
|
||||
of_node_put(np);
|
||||
}
|
||||
/* Restart setup for other boards goes here */
|
||||
}
|
||||
|
||||
static void __init board_init(void)
|
||||
static void __init bcm281xx_init(void)
|
||||
{
|
||||
of_platform_populate(NULL, of_default_bus_match_table, NULL,
|
||||
&platform_bus);
|
||||
|
||||
bcm_board_setup_restart();
|
||||
kona_l2_cache_init();
|
||||
}
|
||||
|
||||
static const char * const bcm11351_dt_compat[] = { "brcm,bcm11351", NULL, };
|
||||
static const char * const bcm281xx_dt_compat[] = {
|
||||
"brcm,bcm11351", /* Have to use the first number upstreamed */
|
||||
NULL,
|
||||
};
|
||||
|
||||
DT_MACHINE_START(BCM11351_DT, "BCM281xx Broadcom Application Processor")
|
||||
.init_machine = board_init,
|
||||
.restart = bcm_kona_restart,
|
||||
.dt_compat = bcm11351_dt_compat,
|
||||
DT_MACHINE_START(BCM281XX_DT, "BCM281xx Broadcom Application Processor")
|
||||
.init_machine = bcm281xx_init,
|
||||
.restart = bcm281xx_restart,
|
||||
.dt_compat = bcm281xx_dt_compat,
|
||||
MACHINE_END
|
||||
|
||||
@ -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
|
||||
@ -11,55 +11,33 @@
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#include <linux/of_address.h>
|
||||
#include <asm/io.h>
|
||||
#include <linux/of_platform.h>
|
||||
#include <asm/hardware/cache-l2x0.h>
|
||||
|
||||
#include "bcm_kona_smc.h"
|
||||
#include "kona.h"
|
||||
|
||||
static void __iomem *watchdog_base;
|
||||
|
||||
void bcm_kona_setup_restart(void)
|
||||
void __init kona_l2_cache_init(void)
|
||||
{
|
||||
struct device_node *np_wdog;
|
||||
int ret;
|
||||
|
||||
/*
|
||||
* The assumption is that whoever calls bcm_kona_setup_restart()
|
||||
* also needs a Kona Watchdog Timer entry in Device Tree, i.e. we
|
||||
* report an error if the DT entry is missing.
|
||||
*/
|
||||
np_wdog = of_find_compatible_node(NULL, NULL, "brcm,kona-wdt");
|
||||
if (!np_wdog) {
|
||||
pr_err("brcm,kona-wdt not found in DT, reboot disabled\n");
|
||||
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;
|
||||
}
|
||||
watchdog_base = of_iomap(np_wdog, 0);
|
||||
WARN(!watchdog_base, "failed to map watchdog base");
|
||||
of_node_put(np_wdog);
|
||||
}
|
||||
|
||||
#define SECWDOG_OFFSET 0x00000000
|
||||
#define SECWDOG_RESERVED_MASK 0xE2000000
|
||||
#define SECWDOG_WD_LOAD_FLAG_MASK 0x10000000
|
||||
#define SECWDOG_EN_MASK 0x08000000
|
||||
#define SECWDOG_SRSTEN_MASK 0x04000000
|
||||
#define SECWDOG_CLKS_SHIFT 20
|
||||
#define SECWDOG_LOCK_SHIFT 0
|
||||
|
||||
void bcm_kona_restart(enum reboot_mode mode, const char *cmd)
|
||||
{
|
||||
uint32_t val;
|
||||
|
||||
if (!watchdog_base)
|
||||
panic("Watchdog not mapped. Reboot failed.\n");
|
||||
|
||||
/* Enable watchdog2 with very short timeout. */
|
||||
val = readl(watchdog_base + SECWDOG_OFFSET);
|
||||
val &= SECWDOG_RESERVED_MASK | SECWDOG_WD_LOAD_FLAG_MASK;
|
||||
val |= SECWDOG_EN_MASK | SECWDOG_SRSTEN_MASK |
|
||||
(0x8 << SECWDOG_CLKS_SHIFT) |
|
||||
(0x8 << SECWDOG_LOCK_SHIFT);
|
||||
writel(val, watchdog_base + SECWDOG_OFFSET);
|
||||
|
||||
while (1)
|
||||
;
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
@ -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
|
||||
@ -11,7 +11,4 @@
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#include <linux/reboot.h>
|
||||
|
||||
void bcm_kona_setup_restart(void);
|
||||
void bcm_kona_restart(enum reboot_mode mode, const char *cmd);
|
||||
void __init kona_l2_cache_init(void);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user