mirror of
https://github.com/torvalds/linux.git
synced 2024-12-21 10:31:54 +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 ...
197 lines
4.8 KiB
C
197 lines
4.8 KiB
C
/*
|
|
* arch/arm/mach-vt8500/vt8500.c
|
|
*
|
|
* Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>
|
|
*
|
|
* 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.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <linux/clocksource.h>
|
|
#include <linux/io.h>
|
|
#include <linux/pm.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/time.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/of_platform.h>
|
|
|
|
#include "common.h"
|
|
|
|
#define LEGACY_GPIO_BASE 0xD8110000
|
|
#define LEGACY_PMC_BASE 0xD8130000
|
|
|
|
/* Registers in GPIO Controller */
|
|
#define VT8500_GPIO_MUX_REG 0x200
|
|
|
|
/* Registers in Power Management Controller */
|
|
#define VT8500_HCR_REG 0x12
|
|
#define VT8500_PMSR_REG 0x60
|
|
|
|
static void __iomem *pmc_base;
|
|
|
|
void vt8500_restart(char mode, const char *cmd)
|
|
{
|
|
if (pmc_base)
|
|
writel(1, pmc_base + VT8500_PMSR_REG);
|
|
}
|
|
|
|
static struct map_desc vt8500_io_desc[] __initdata = {
|
|
/* SoC MMIO registers */
|
|
[0] = {
|
|
.virtual = 0xf8000000,
|
|
.pfn = __phys_to_pfn(0xd8000000),
|
|
.length = 0x00390000, /* max of all chip variants */
|
|
.type = MT_DEVICE
|
|
},
|
|
};
|
|
|
|
void __init vt8500_map_io(void)
|
|
{
|
|
iotable_init(vt8500_io_desc, ARRAY_SIZE(vt8500_io_desc));
|
|
}
|
|
|
|
static void vt8500_power_off(void)
|
|
{
|
|
local_irq_disable();
|
|
writew(5, pmc_base + VT8500_HCR_REG);
|
|
asm("mcr%? p15, 0, %0, c7, c0, 4" : : "r" (0));
|
|
}
|
|
|
|
void __init vt8500_init(void)
|
|
{
|
|
struct device_node *np;
|
|
#if defined(CONFIG_FB_VT8500) || defined(CONFIG_FB_WM8505)
|
|
struct device_node *fb;
|
|
void __iomem *gpio_base;
|
|
#endif
|
|
|
|
#ifdef CONFIG_FB_VT8500
|
|
fb = of_find_compatible_node(NULL, NULL, "via,vt8500-fb");
|
|
if (fb) {
|
|
np = of_find_compatible_node(NULL, NULL, "via,vt8500-gpio");
|
|
if (np) {
|
|
gpio_base = of_iomap(np, 0);
|
|
|
|
if (!gpio_base)
|
|
pr_err("%s: of_iomap(gpio_mux) failed\n",
|
|
__func__);
|
|
|
|
of_node_put(np);
|
|
} else {
|
|
gpio_base = ioremap(LEGACY_GPIO_BASE, 0x1000);
|
|
if (!gpio_base)
|
|
pr_err("%s: ioremap(legacy_gpio_mux) failed\n",
|
|
__func__);
|
|
}
|
|
if (gpio_base) {
|
|
writel(readl(gpio_base + VT8500_GPIO_MUX_REG) | 1,
|
|
gpio_base + VT8500_GPIO_MUX_REG);
|
|
iounmap(gpio_base);
|
|
} else
|
|
pr_err("%s: Could not remap GPIO mux\n", __func__);
|
|
|
|
of_node_put(fb);
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_FB_WM8505
|
|
fb = of_find_compatible_node(NULL, NULL, "wm,wm8505-fb");
|
|
if (fb) {
|
|
np = of_find_compatible_node(NULL, NULL, "wm,wm8505-gpio");
|
|
if (!np)
|
|
np = of_find_compatible_node(NULL, NULL,
|
|
"wm,wm8650-gpio");
|
|
if (np) {
|
|
gpio_base = of_iomap(np, 0);
|
|
|
|
if (!gpio_base)
|
|
pr_err("%s: of_iomap(gpio_mux) failed\n",
|
|
__func__);
|
|
|
|
of_node_put(np);
|
|
} else {
|
|
gpio_base = ioremap(LEGACY_GPIO_BASE, 0x1000);
|
|
if (!gpio_base)
|
|
pr_err("%s: ioremap(legacy_gpio_mux) failed\n",
|
|
__func__);
|
|
}
|
|
if (gpio_base) {
|
|
writel(readl(gpio_base + VT8500_GPIO_MUX_REG) |
|
|
0x80000000, gpio_base + VT8500_GPIO_MUX_REG);
|
|
iounmap(gpio_base);
|
|
} else
|
|
pr_err("%s: Could not remap GPIO mux\n", __func__);
|
|
|
|
of_node_put(fb);
|
|
}
|
|
#endif
|
|
|
|
np = of_find_compatible_node(NULL, NULL, "via,vt8500-pmc");
|
|
if (np) {
|
|
pmc_base = of_iomap(np, 0);
|
|
|
|
if (!pmc_base)
|
|
pr_err("%s:of_iomap(pmc) failed\n", __func__);
|
|
|
|
of_node_put(np);
|
|
} else {
|
|
pmc_base = ioremap(LEGACY_PMC_BASE, 0x1000);
|
|
if (!pmc_base)
|
|
pr_err("%s:ioremap(power_off) failed\n", __func__);
|
|
}
|
|
if (pmc_base)
|
|
pm_power_off = &vt8500_power_off;
|
|
else
|
|
pr_err("%s: PMC Hibernation register could not be remapped, not enabling power off!\n", __func__);
|
|
|
|
vtwm_clk_init(pmc_base);
|
|
|
|
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
|
}
|
|
|
|
static const struct of_device_id vt8500_irq_match[] __initconst = {
|
|
{ .compatible = "via,vt8500-intc", .data = vt8500_irq_init, },
|
|
{ /* sentinel */ },
|
|
};
|
|
|
|
static void __init vt8500_init_irq(void)
|
|
{
|
|
of_irq_init(vt8500_irq_match);
|
|
};
|
|
|
|
static const char * const vt8500_dt_compat[] = {
|
|
"via,vt8500",
|
|
"wm,wm8650",
|
|
"wm,wm8505",
|
|
"wm,wm8750",
|
|
"wm,wm8850",
|
|
};
|
|
|
|
DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)")
|
|
.dt_compat = vt8500_dt_compat,
|
|
.map_io = vt8500_map_io,
|
|
.init_irq = vt8500_init_irq,
|
|
.init_machine = vt8500_init,
|
|
.init_time = clocksource_of_init,
|
|
.restart = vt8500_restart,
|
|
.handle_irq = vt8500_handle_irq,
|
|
MACHINE_END
|
|
|