mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 21:33:00 +00:00
bab588fcfb
This is a larger set of new functionality for the existing SoC families, including: * vt8500 gains support for new CPU cores, notably the Cortex-A9 based wm8850 * prima2 gains support for the "marco" SoC family, its SMP based cousin * tegra gains support for the new Tegra4 (Tegra114) family * socfpga now supports a newer version of the hardware including SMP * i.mx31 and bcm2835 are now using DT probing for their clocks * lots of updates for sh-mobile * OMAP updates for clocks, power management and USB * i.mx6q and tegra now support cpuidle * kirkwood now supports PCIe hot plugging * tegra clock support is updated * tegra USB PHY probing gets implemented diffently -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUSUyPGCrR//JCVInAQI4YA/+Nb0FaA7qMmTPuJhm7aZNfnwBcGxZ7IZp s2xByEl3r5zbLKlKGNGE0x7Q7ETHV4y9tohzi9ZduH2b60dMRYgII06CEmDPu6/h 4vBap2oLzfWfs9hwpCIh7N9wNzxSj/R42vlXHhNmspHlw7cFk1yw5EeJ+ocxmZPq H9lyjAxsGErkZyM/xstNQ1Uvhc8XHAFSUzWrg8hvf6AVVR8hwpIqVzfIizv6Vpk6 ryBoUBHfdTztAOrafK54CdRc7l6kVMomRodKGzMyasnBK3ZfFca3IR7elnxLyEFJ uPDu5DKOdYrjXC8X2dPM6kYiE41YFuqOV2ahBt9HqRe6liNBLHQ6NAH7f7+jBWSI eeWe84c2vFaqhAGlci/xm4GaP0ud5ZLudtiVPlDY5tYIADqLygNcx1HIt/5sT7QI h34LMjc4+/TGVWTVf5yRmIzTrCXZv5YoAak3UWFoM4nVBo/eYVyNLEt5g9YsfjrC P/GWrXJJvOCB3gAi31pgGYJzZg8K7kTTAh/dgxjqzU4f6nGRm5PBydiJe18/lWkH qtfNE0RbhxCi3JEBnxW48AIEndVSRbd7jf8upC/s9rPURtFSVXp4APTHVyNUKCip gojBxcRYtesyG/53nrwdTyiyHx6GocmWnMNZJoDo0UQEkog2dOef+StdC3zhc2Vm 9EttcFqWJ+E= =PRrg -----END PGP SIGNATURE----- Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC-specific updates from Arnd Bergmann: "This is a larger set of new functionality for the existing SoC families, including: - vt8500 gains support for new CPU cores, notably the Cortex-A9 based wm8850 - prima2 gains support for the "marco" SoC family, its SMP based cousin - tegra gains support for the new Tegra4 (Tegra114) family - socfpga now supports a newer version of the hardware including SMP - i.mx31 and bcm2835 are now using DT probing for their clocks - lots of updates for sh-mobile - OMAP updates for clocks, power management and USB - i.mx6q and tegra now support cpuidle - kirkwood now supports PCIe hot plugging - tegra clock support is updated - tegra USB PHY probing gets implemented diffently" * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (148 commits) ARM: prima2: remove duplicate v7_invalidate_l1 ARM: shmobile: r8a7779: Correct TMU clock support again ARM: prima2: fix __init section for cpu hotplug ARM: OMAP: Consolidate OMAP USB-HS platform data (part 3/3) ARM: OMAP: Consolidate OMAP USB-HS platform data (part 1/3) arm: socfpga: Add SMP support for actual socfpga harware arm: Add v7_invalidate_l1 to cache-v7.S arm: socfpga: Add entries to enable make dtbs socfpga arm: socfpga: Add new device tree source for actual socfpga HW ARM: tegra: sort Kconfig selects for Tegra114 ARM: tegra: enable ARCH_REQUIRE_GPIOLIB for Tegra114 ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC ARM: tegra: Fix build error for gic update ARM: tegra: remove empty tegra_smp_init_cpus() ARM: shmobile: Register ARM architected timer ARM: MARCO: fix the build issue due to gic-vic-to-irqchip move ARM: shmobile: r8a7779: Correct TMU clock support ARM: mxs_defconfig: Select CONFIG_DEVTMPFS_MOUNT ARM: mxs: decrease mxs_clockevent_device.min_delta_ns to 2 clock cycles ARM: mxs: use apbx bus clock to drive the timers on timrotv2 ...
139 lines
3.3 KiB
C
139 lines
3.3 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/clk/bcm2835.h>
|
|
#include <linux/clocksource.h>
|
|
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include <mach/bcm2835_soc.h>
|
|
|
|
#define PM_RSTC 0x1c
|
|
#define PM_RSTS 0x20
|
|
#define PM_WDOG 0x24
|
|
|
|
#define PM_PASSWORD 0x5a000000
|
|
#define PM_RSTC_WRCFG_MASK 0x00000030
|
|
#define PM_RSTC_WRCFG_FULL_RESET 0x00000020
|
|
#define PM_RSTS_HADWRH_SET 0x00000040
|
|
|
|
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);
|
|
}
|
|
|
|
/*
|
|
* We can't really power off, but if we do the normal reset scheme, and
|
|
* indicate to bootcode.bin not to reboot, then most of the chip will be
|
|
* powered off.
|
|
*/
|
|
static void bcm2835_power_off(void)
|
|
{
|
|
u32 val;
|
|
|
|
/*
|
|
* We set the watchdog hard reset bit here to distinguish this reset
|
|
* from the normal (full) reset. bootcode.bin will not reboot after a
|
|
* hard reset.
|
|
*/
|
|
val = readl_relaxed(wdt_regs + PM_RSTS);
|
|
val &= ~PM_RSTC_WRCFG_MASK;
|
|
val |= PM_PASSWORD | PM_RSTS_HADWRH_SET;
|
|
writel_relaxed(val, wdt_regs + PM_RSTS);
|
|
|
|
/* Continue with normal reset mechanism */
|
|
bcm2835_restart(0, "");
|
|
}
|
|
|
|
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();
|
|
if (wdt_regs)
|
|
pm_power_off = bcm2835_power_off;
|
|
|
|
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,
|
|
.init_time = clocksource_of_init,
|
|
.restart = bcm2835_restart,
|
|
.dt_compat = bcm2835_compat
|
|
MACHINE_END
|