proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2025-12-11 00:36:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: bcm281xx: Consolidate reboot code

Browse Source 
Consolidate reboot code and remove unnecessary functions.

Signed-off-by: Markus Mayer <markus.mayer@linaro.org>
Signed-off-by: Matt Porter <mporter@linaro.org>
This commit is contained in:
Markus Mayer 2014-02-25 14:17:44 -08:00 committed by Matt Porter
parent 8b1c342629
commit a21ea269b9
3 changed files with 35 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
arch/arm/mach-bcm/board_bcm281xx.c
View File

@ -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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@ -19,25 +19,47 @@
#include "kona.h" #include "kona.h"
static void bcm_board_setup_restart(void) #define SECWDOG_OFFSET 0x00000000
{ #define SECWDOG_RESERVED_MASK 0xe2000000
struct device_node *np; #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
np = of_find_compatible_node(NULL, NULL, "brcm,bcm11351"); static void bcm281xx_restart(enum reboot_mode mode, const char *cmd)
if (np) { {
if (of_device_is_available(np)) uint32_t val;
bcm_kona_setup_restart(); void __iomem *base;
of_node_put(np); 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;
} }
/* Restart setup for other boards goes here */ base = of_iomap(np_wdog, 0);
if (!base) {
pr_emerg("Couldn't map brcm,kona-wdt\n");
return;
}
/* 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);
/* Wait for reset */
while (1);
} }
static void __init board_init(void) static void __init board_init(void)
{ {
of_platform_populate(NULL, of_default_bus_match_table, NULL, of_platform_populate(NULL, of_default_bus_match_table, NULL,
&platform_bus); &platform_bus);
bcm_board_setup_restart();
kona_l2_cache_init(); kona_l2_cache_init();
} }
@ -48,6 +70,6 @@ static const char * const bcm281xx_dt_compat[] = {
DT_MACHINE_START(BCM281XX_DT, "BCM281xx Broadcom Application Processor") DT_MACHINE_START(BCM281XX_DT, "BCM281xx Broadcom Application Processor")
.init_machine = board_init, .init_machine = board_init,
.restart = bcm_kona_restart, .restart = bcm281xx_restart,
.dt_compat = bcm281xx_dt_compat, .dt_compat = bcm281xx_dt_compat,
MACHINE_END MACHINE_END

50
arch/arm/mach-bcm/kona.c
View File

@ -11,10 +11,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <linux/of_address.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <asm/hardware/cache-l2x0.h> #include <asm/hardware/cache-l2x0.h>
#include <asm/io.h>
#include "bcm_kona_smc.h" #include "bcm_kona_smc.h"
#include "kona.h" #include "kona.h"
@ -43,51 +41,3 @@ void __init kona_l2_cache_init(void)
if (ret) if (ret)
pr_err("Couldn't enable L2 cache: %d\n", ret); pr_err("Couldn't enable L2 cache: %d\n", ret);
} }
static void __iomem *watchdog_base;
void bcm_kona_setup_restart(void)
{
struct device_node *np_wdog;
/*
* 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");
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)
;
}

4
arch/arm/mach-bcm/kona.h
View File

@ -11,8 +11,4 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <linux/reboot.h>
void __init kona_l2_cache_init(void); void __init kona_l2_cache_init(void);
void bcm_kona_setup_restart(void);
void bcm_kona_restart(enum reboot_mode mode, const char *cmd);