d027db132b
This contains the bulk of new SoC development for this merge window. Two new platforms have been added, the sunxi platforms (Allwinner A1x SoCs) by Maxime Ripard, and a generic Broadcom platform for a new series of ARMv7 platforms from them, where the hope is that we can keep the platform code generic enough to have them all share one mach directory. The new Broadcom platform is contributed by Christian Daudt. Highbank has grown support for Calxeda's next generation of hardware, ECX-2000. clps711x has seen a lot of cleanup from Alexander Shiyan, and he's also taken on maintainership of the platform. Beyond this there has been a bunch of work from a number of people on converting more platforms to IRQ domains, pinctrl conversion, cleanup and general feature enablement across most of the active platforms. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQyLCjAAoJEIwa5zzehBx3AdQP/R+L3+EQMjiEWt/p7g/ql5Em 0SnP92CcGzrjgLTg9z1FeOazfOsGnkZAYUlDRkqfKobH3VqkhYFFtt1/0x0KMahm xcowHgMBOyimFdWT9vLK3J8U6DLui5XrEG9LGH2VL+lqmfjIyP/OOF3mVc0/+pV9 WTLAsYswdBRSeiNuF43kqlfrOwF6xsPLgiNMlc82w6BzHqoHu6dOif5M9MqWaApS V74DPmwLD371Tyit6aHqt3JOqpgiPSHlmxkzomK+5idcW3Pa7HnzzFYmx85dk/eN J2siqIkoOu7tEfjIbNZTL2MYoX4tUUKv4qZZ3IOl3YSWaV3P5ilMApF01XVrkk8E DWOMhzte9hC7L90W+/kCPLF1VyeAhCem2KQWUitO71fKur3r+3ZaUokNVvWzkJIL 7aduxAJOV2hfLgEqbjbjF3o4S8p63OV3kzivFJM1And15zDJo4+qqOh67+bPo4jj +R4du+SqzXriw4i3tDLGVpdjDffk4D41tbLzgkWAtvGyoP45yeYfHAzAh0pDFPRv ASfZVmZ5PhwAUAkIMnpC2sjgmxMYff3SYqmDgnsqXES7rbDH/hG+teymtHFTyUQp m+f60DNotSMcMvkLdvruLSB4aeTiwbfOqPn/g+aXYUlPuNMq1fVWgN7EJKWkamK4 nRwaJmLwx1/ojcVbpy2G =YMKB -----END PGP SIGNATURE----- Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC updates from Olof Johansson: "This contains the bulk of new SoC development for this merge window. Two new platforms have been added, the sunxi platforms (Allwinner A1x SoCs) by Maxime Ripard, and a generic Broadcom platform for a new series of ARMv7 platforms from them, where the hope is that we can keep the platform code generic enough to have them all share one mach directory. The new Broadcom platform is contributed by Christian Daudt. Highbank has grown support for Calxeda's next generation of hardware, ECX-2000. clps711x has seen a lot of cleanup from Alexander Shiyan, and he's also taken on maintainership of the platform. Beyond this there has been a bunch of work from a number of people on converting more platforms to IRQ domains, pinctrl conversion, cleanup and general feature enablement across most of the active platforms." Fix up trivial conflicts as per Olof. * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (174 commits) mfd: vexpress-sysreg: Remove LEDs code irqchip: irq-sunxi: Add terminating entry for sunxi_irq_dt_ids clocksource: sunxi_timer: Add terminating entry for sunxi_timer_dt_ids irq: versatile: delete dangling variable ARM: sunxi: add missing include for mdelay() ARM: EXYNOS: Avoid early use of of_machine_is_compatible() ARM: dts: add node for PL330 MDMA1 controller for exynos4 ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412 ARM: EXYNOS: add UART3 to DEBUG_LL ports ARM: S3C24XX: Add clkdev entry for camif-upll clock ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers ARM: sunxi: Add missing sun4i.dtsi file pinctrl: samsung: Do not initialise statics to 0 ARM i.MX6: remove gate_mask from pllv3 ARM i.MX6: Fix ethernet PLL clocks ARM i.MX6: rename PLLs according to datasheet ARM i.MX6: Add pwm support ARM i.MX51: Add pwm support ARM i.MX53: Add pwm support ARM: mx5: Replace clk_register_clkdev with clock DT lookup ...
110 lines
2.6 KiB
C
110 lines
2.6 KiB
C
/*
|
|
* Copyright (C) 2010 Broadcom
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/delay.h>
|
|
#include <linux/init.h>
|
|
#include <linux/irqchip/bcm2835.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/bcm2835_timer.h>
|
|
#include <linux/clk/bcm2835.h>
|
|
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include <mach/bcm2835_soc.h>
|
|
|
|
#define PM_RSTC 0x1c
|
|
#define PM_WDOG 0x24
|
|
|
|
#define PM_PASSWORD 0x5a000000
|
|
#define PM_RSTC_WRCFG_MASK 0x00000030
|
|
#define PM_RSTC_WRCFG_FULL_RESET 0x00000020
|
|
|
|
static void __iomem *wdt_regs;
|
|
|
|
/*
|
|
* The machine restart method can be called from an atomic context so we won't
|
|
* be able to ioremap the regs then.
|
|
*/
|
|
static void bcm2835_setup_restart(void)
|
|
{
|
|
struct device_node *np = of_find_compatible_node(NULL, NULL,
|
|
"brcm,bcm2835-pm-wdt");
|
|
if (WARN(!np, "unable to setup watchdog restart"))
|
|
return;
|
|
|
|
wdt_regs = of_iomap(np, 0);
|
|
WARN(!wdt_regs, "failed to remap watchdog regs");
|
|
}
|
|
|
|
static void bcm2835_restart(char mode, const char *cmd)
|
|
{
|
|
u32 val;
|
|
|
|
if (!wdt_regs)
|
|
return;
|
|
|
|
/* use a timeout of 10 ticks (~150us) */
|
|
writel_relaxed(10 | PM_PASSWORD, wdt_regs + PM_WDOG);
|
|
val = readl_relaxed(wdt_regs + PM_RSTC);
|
|
val &= ~PM_RSTC_WRCFG_MASK;
|
|
val |= PM_PASSWORD | PM_RSTC_WRCFG_FULL_RESET;
|
|
writel_relaxed(val, wdt_regs + PM_RSTC);
|
|
|
|
/* No sleeping, possibly atomic. */
|
|
mdelay(1);
|
|
}
|
|
|
|
static struct map_desc io_map __initdata = {
|
|
.virtual = BCM2835_PERIPH_VIRT,
|
|
.pfn = __phys_to_pfn(BCM2835_PERIPH_PHYS),
|
|
.length = BCM2835_PERIPH_SIZE,
|
|
.type = MT_DEVICE
|
|
};
|
|
|
|
static void __init bcm2835_map_io(void)
|
|
{
|
|
iotable_init(&io_map, 1);
|
|
}
|
|
|
|
static void __init bcm2835_init(void)
|
|
{
|
|
int ret;
|
|
|
|
bcm2835_setup_restart();
|
|
bcm2835_init_clocks();
|
|
|
|
ret = of_platform_populate(NULL, of_default_bus_match_table, NULL,
|
|
NULL);
|
|
if (ret) {
|
|
pr_err("of_platform_populate failed: %d\n", ret);
|
|
BUG();
|
|
}
|
|
}
|
|
|
|
static const char * const bcm2835_compat[] = {
|
|
"brcm,bcm2835",
|
|
NULL
|
|
};
|
|
|
|
DT_MACHINE_START(BCM2835, "BCM2835")
|
|
.map_io = bcm2835_map_io,
|
|
.init_irq = bcm2835_init_irq,
|
|
.handle_irq = bcm2835_handle_irq,
|
|
.init_machine = bcm2835_init,
|
|
.timer = &bcm2835_timer,
|
|
.restart = bcm2835_restart,
|
|
.dt_compat = bcm2835_compat
|
|
MACHINE_END
|