e6c81cce56
Our SoC branch usually contains expanded support for new SoCs and other core platform code. In this case, that includes: - Support for the new Annapurna Labs "Alpine" platform - A rework greatly simplifying adding new platform support to the MCPM subsystem (Multi-cluster power management) - Cpuidle and PM improvements for Exynos3250 - Misc updates for Renesas, OMAP, Meson, i.MX. Some of these could have gone in other branches but ended up here for various reasons. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJVNzfWAAoJEIwa5zzehBx3idcP/Rt042tqb0bian/4M1Ud1aQ7 AMRd4oU5MfWAlzaGPeMBS+b1eo/eENj6wyWsvBQIByZN76ImlUXtxsx0U0frLrVg mWVo9zOLRuoE6yyq329zZgg1IM1RtRIruS6zucKsHgKtq0DcjhYGGUH0ZVZk/rKI RLtRK8U6Jr0lnpu1TDE5mii7GCCZlEl5dG+J3w5ewC9y7RLRlM09xjK/Zsj0QOqY JvMOIaHuHMT6l7BQ6QajtVxTeGECOJ3YDqC6mDHCVD7f3v88+7H5C20xNGPK921w tLfB5qOojnj+kKZRPhi8EGnRzKwrBq6/mE5CvvigTCGlAEUOzy7PFSY9oNE80QeL 6mUdPTuZuqz7ZEIF0kj8I0AkB6k8B+aYfqA9mqM5yGpa11HvZZGfP7CwI4izoe6+ sT++0OeDPwbsMyRxZjqNQLs4QYaKGYMP4NCgA17zz5ToRCQZy7e5hd2GYzaRouyi kTpR9FbxwDcBIwTcA3F7oJ90BEMJ0tvGz/Al11UQpzPePhTwQt2yB5bRZyK/RYIU x8k8RHArG3fmS89D4aOViL3sy/zoUBedx4UfAo6jVbrvoZGALQL23KHdqBqDiPmP sMRj/sSr+0h9nJCVNM6I/OUD4/IrpFGaeX9V7rpEsHVe7j83eV7Q2wNRPyVTgxdn jS8TS0FNAXIv8FO9EoNH =tcGs -----END PGP SIGNATURE----- Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC platform updates from Olof Johansson: "Our SoC branch usually contains expanded support for new SoCs and other core platform code. In this case, that includes: - support for the new Annapurna Labs "Alpine" platform - a rework greatly simplifying adding new platform support to the MCPM subsystem (Multi-cluster power management) - cpuidle and PM improvements for Exynos3250 - misc updates for Renesas, OMAP, Meson, i.MX. Some of these could have gone in other branches but ended up here for various reasons" * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (53 commits) ARM: alpine: add support for generic pci ARM: Exynos: migrate DCSCB to the new MCPM backend abstraction ARM: vexpress: migrate DCSCB to the new MCPM backend abstraction ARM: vexpress: DCSCB: tighten CPU validity assertion ARM: vexpress: migrate TC2 to the new MCPM backend abstraction ARM: MCPM: move the algorithmic complexity to the core code ARM: EXYNOS: allow cpuidle driver usage on Exynos3250 SoC ARM: EXYNOS: add AFTR mode support for Exynos3250 ARM: EXYNOS: add code for setting/clearing boot flag ARM: EXYNOS: fix CPU1 hotplug on Exynos3250 ARM: S3C64XX: Use fixed IRQ bases to avoid conflicts on Cragganmore ARM: cygnus: fix const declaration bcm_cygnus_dt_compat ARM: DRA7: hwmod: Fix the hwmod class for GPTimer4 ARM: DRA7: hwmod: Add data for GPTimers 13 through 16 ARM: EXYNOS: Remove left over 'extra_save' ARM: EXYNOS: Constify exynos_pm_data array ARM: EXYNOS: use static in suspend.c ARM: EXYNOS: Use platform device name as power domain name ARM: EXYNOS: add support for async-bridge clocks for pm_domains ARM: omap-device: add missed callback for suspend-to-disk ...
248 lines
6.3 KiB
C
248 lines
6.3 KiB
C
/*
|
|
* Device Tree support for Armada 370 and XP platforms.
|
|
*
|
|
* Copyright (C) 2012 Marvell
|
|
*
|
|
* Lior Amsalem <alior@marvell.com>
|
|
* Gregory CLEMENT <gregory.clement@free-electrons.com>
|
|
* Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_fdt.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/io.h>
|
|
#include <linux/clocksource.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/mbus.h>
|
|
#include <linux/signal.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/irqchip.h>
|
|
#include <asm/hardware/cache-l2x0.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/time.h>
|
|
#include <asm/smp_scu.h>
|
|
#include "armada-370-xp.h"
|
|
#include "common.h"
|
|
#include "coherency.h"
|
|
#include "mvebu-soc-id.h"
|
|
|
|
static void __iomem *scu_base;
|
|
|
|
/*
|
|
* Enables the SCU when available. Obviously, this is only useful on
|
|
* Cortex-A based SOCs, not on PJ4B based ones.
|
|
*/
|
|
static void __init mvebu_scu_enable(void)
|
|
{
|
|
struct device_node *np =
|
|
of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu");
|
|
if (np) {
|
|
scu_base = of_iomap(np, 0);
|
|
scu_enable(scu_base);
|
|
of_node_put(np);
|
|
}
|
|
}
|
|
|
|
void __iomem *mvebu_get_scu_base(void)
|
|
{
|
|
return scu_base;
|
|
}
|
|
|
|
/*
|
|
* When returning from suspend, the platform goes through the
|
|
* bootloader, which executes its DDR3 training code. This code has
|
|
* the unfortunate idea of using the first 10 KB of each DRAM bank to
|
|
* exercise the RAM and calculate the optimal timings. Therefore, this
|
|
* area of RAM is overwritten, and shouldn't be used by the kernel if
|
|
* suspend/resume is supported.
|
|
*/
|
|
|
|
#ifdef CONFIG_SUSPEND
|
|
#define MVEBU_DDR_TRAINING_AREA_SZ (10 * SZ_1K)
|
|
static int __init mvebu_scan_mem(unsigned long node, const char *uname,
|
|
int depth, void *data)
|
|
{
|
|
const char *type = of_get_flat_dt_prop(node, "device_type", NULL);
|
|
const __be32 *reg, *endp;
|
|
int l;
|
|
|
|
if (type == NULL || strcmp(type, "memory"))
|
|
return 0;
|
|
|
|
reg = of_get_flat_dt_prop(node, "linux,usable-memory", &l);
|
|
if (reg == NULL)
|
|
reg = of_get_flat_dt_prop(node, "reg", &l);
|
|
if (reg == NULL)
|
|
return 0;
|
|
|
|
endp = reg + (l / sizeof(__be32));
|
|
while ((endp - reg) >= (dt_root_addr_cells + dt_root_size_cells)) {
|
|
u64 base, size;
|
|
|
|
base = dt_mem_next_cell(dt_root_addr_cells, ®);
|
|
size = dt_mem_next_cell(dt_root_size_cells, ®);
|
|
|
|
memblock_reserve(base, MVEBU_DDR_TRAINING_AREA_SZ);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void __init mvebu_memblock_reserve(void)
|
|
{
|
|
of_scan_flat_dt(mvebu_scan_mem, NULL);
|
|
}
|
|
#else
|
|
static void __init mvebu_memblock_reserve(void) {}
|
|
#endif
|
|
|
|
/*
|
|
* Early versions of Armada 375 SoC have a bug where the BootROM
|
|
* leaves an external data abort pending. The kernel is hit by this
|
|
* data abort as soon as it enters userspace, because it unmasks the
|
|
* data aborts at this moment. We register a custom abort handler
|
|
* below to ignore the first data abort to work around this
|
|
* problem.
|
|
*/
|
|
static int armada_375_external_abort_wa(unsigned long addr, unsigned int fsr,
|
|
struct pt_regs *regs)
|
|
{
|
|
static int ignore_first;
|
|
|
|
if (!ignore_first && fsr == 0x1406) {
|
|
ignore_first = 1;
|
|
return 0;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
static void __init mvebu_init_irq(void)
|
|
{
|
|
irqchip_init();
|
|
mvebu_scu_enable();
|
|
coherency_init();
|
|
BUG_ON(mvebu_mbus_dt_init(coherency_available()));
|
|
}
|
|
|
|
static void __init external_abort_quirk(void)
|
|
{
|
|
u32 dev, rev;
|
|
|
|
if (mvebu_get_soc_id(&dev, &rev) == 0 && rev > ARMADA_375_Z1_REV)
|
|
return;
|
|
|
|
hook_fault_code(16 + 6, armada_375_external_abort_wa, SIGBUS, 0,
|
|
"imprecise external abort");
|
|
}
|
|
|
|
static void __init i2c_quirk(void)
|
|
{
|
|
struct device_node *np;
|
|
u32 dev, rev;
|
|
|
|
/*
|
|
* Only revisons more recent than A0 support the offload
|
|
* mechanism. We can exit only if we are sure that we can
|
|
* get the SoC revision and it is more recent than A0.
|
|
*/
|
|
if (mvebu_get_soc_id(&dev, &rev) == 0 && rev > MV78XX0_A0_REV)
|
|
return;
|
|
|
|
for_each_compatible_node(np, NULL, "marvell,mv78230-i2c") {
|
|
struct property *new_compat;
|
|
|
|
new_compat = kzalloc(sizeof(*new_compat), GFP_KERNEL);
|
|
|
|
new_compat->name = kstrdup("compatible", GFP_KERNEL);
|
|
new_compat->length = sizeof("marvell,mv78230-a0-i2c");
|
|
new_compat->value = kstrdup("marvell,mv78230-a0-i2c",
|
|
GFP_KERNEL);
|
|
|
|
of_update_property(np, new_compat);
|
|
}
|
|
return;
|
|
}
|
|
|
|
static void __init mvebu_dt_init(void)
|
|
{
|
|
if (of_machine_is_compatible("marvell,armadaxp"))
|
|
i2c_quirk();
|
|
if (of_machine_is_compatible("marvell,a375-db"))
|
|
external_abort_quirk();
|
|
|
|
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
|
}
|
|
|
|
static const char * const armada_370_xp_dt_compat[] __initconst = {
|
|
"marvell,armada-370-xp",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(ARMADA_370_XP_DT, "Marvell Armada 370/XP (Device Tree)")
|
|
.l2c_aux_val = 0,
|
|
.l2c_aux_mask = ~0,
|
|
/*
|
|
* The following field (.smp) is still needed to ensure backward
|
|
* compatibility with old Device Trees that were not specifying the
|
|
* cpus enable-method property.
|
|
*/
|
|
.smp = smp_ops(armada_xp_smp_ops),
|
|
.init_machine = mvebu_dt_init,
|
|
.init_irq = mvebu_init_irq,
|
|
.restart = mvebu_restart,
|
|
.reserve = mvebu_memblock_reserve,
|
|
.dt_compat = armada_370_xp_dt_compat,
|
|
MACHINE_END
|
|
|
|
static const char * const armada_375_dt_compat[] __initconst = {
|
|
"marvell,armada375",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(ARMADA_375_DT, "Marvell Armada 375 (Device Tree)")
|
|
.l2c_aux_val = 0,
|
|
.l2c_aux_mask = ~0,
|
|
.init_irq = mvebu_init_irq,
|
|
.init_machine = mvebu_dt_init,
|
|
.restart = mvebu_restart,
|
|
.dt_compat = armada_375_dt_compat,
|
|
MACHINE_END
|
|
|
|
static const char * const armada_38x_dt_compat[] __initconst = {
|
|
"marvell,armada380",
|
|
"marvell,armada385",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(ARMADA_38X_DT, "Marvell Armada 380/385 (Device Tree)")
|
|
.l2c_aux_val = 0,
|
|
.l2c_aux_mask = ~0,
|
|
.init_irq = mvebu_init_irq,
|
|
.restart = mvebu_restart,
|
|
.dt_compat = armada_38x_dt_compat,
|
|
MACHINE_END
|
|
|
|
static const char * const armada_39x_dt_compat[] __initconst = {
|
|
"marvell,armada390",
|
|
"marvell,armada398",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(ARMADA_39X_DT, "Marvell Armada 39x (Device Tree)")
|
|
.l2c_aux_val = 0,
|
|
.l2c_aux_mask = ~0,
|
|
.init_irq = mvebu_init_irq,
|
|
.restart = mvebu_restart,
|
|
.dt_compat = armada_39x_dt_compat,
|
|
MACHINE_END
|