mirror of
https://github.com/torvalds/linux.git
synced 2024-11-06 20:21:57 +00:00
994c0e9925
* 'next/soc' of git://git.linaro.org/people/arnd/arm-soc: (21 commits) MAINTAINERS: add ARM/FREESCALE IMX6 entry arm/imx: merge i.MX3 and i.MX6 arm/imx6q: add suspend/resume support arm/imx6q: add device tree machine support arm/imx6q: add smp and cpu hotplug support arm/imx6q: add core drivers clock, gpc, mmdc and src arm/imx: add gic_handle_irq function arm/imx6q: add core definitions and low-level debug uart arm/imx6q: add device tree source ARM: highbank: add suspend support ARM: highbank: Add cpu hotplug support ARM: highbank: add SMP support MAINTAINERS: add Calxeda Highbank ARM platform ARM: add Highbank core platform support ARM: highbank: add devicetree source ARM: l2x0: add empty l2x0_of_init picoxcell: add a definition of VMALLOC_END picoxcell: remove custom ioremap implementation picoxcell: add the DTS for the PC7302 board picoxcell: add the DTS for pc3x2 and pc3x3 devices ... Fix up trivial conflicts in arch/arm/Kconfig, and some more header file conflicts in arch/arm/mach-omap2/board-generic.c (as per an ealier merge by Arnd).
158 lines
3.7 KiB
C
158 lines
3.7 KiB
C
/*
|
|
* Copyright (C) 2005 Nokia Corporation
|
|
* Author: Paul Mundt <paul.mundt@nokia.com>
|
|
*
|
|
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
|
|
*
|
|
* Modified from the original mach-omap/omap2/board-generic.c did by Paul
|
|
* to support the OMAP2+ device tree boards with an unique board file.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#include <linux/io.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/irqdomain.h>
|
|
#include <linux/i2c/twl.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/mach/arch.h>
|
|
|
|
#include <plat/board.h>
|
|
#include <plat/common.h>
|
|
#include <mach/omap4-common.h>
|
|
#include "common-board-devices.h"
|
|
|
|
/*
|
|
* XXX: Still needed to boot until the i2c & twl driver is adapted to
|
|
* device-tree
|
|
*/
|
|
static struct twl4030_platform_data sdp4430_twldata = {
|
|
.irq_base = TWL6030_IRQ_BASE,
|
|
.irq_end = TWL6030_IRQ_END,
|
|
};
|
|
|
|
static void __init omap4_i2c_init(void)
|
|
{
|
|
omap4_pmic_init("twl6030", &sdp4430_twldata);
|
|
}
|
|
|
|
static struct twl4030_platform_data beagle_twldata = {
|
|
.irq_base = TWL4030_IRQ_BASE,
|
|
.irq_end = TWL4030_IRQ_END,
|
|
};
|
|
|
|
static void __init omap3_i2c_init(void)
|
|
{
|
|
omap3_pmic_init("twl4030", &beagle_twldata);
|
|
}
|
|
|
|
static struct of_device_id omap_dt_match_table[] __initdata = {
|
|
{ .compatible = "simple-bus", },
|
|
{ .compatible = "ti,omap-infra", },
|
|
{ }
|
|
};
|
|
|
|
static struct of_device_id intc_match[] __initdata = {
|
|
{ .compatible = "ti,omap3-intc", },
|
|
{ .compatible = "arm,cortex-a9-gic", },
|
|
{ }
|
|
};
|
|
|
|
static void __init omap_generic_init(void)
|
|
{
|
|
struct device_node *node = of_find_matching_node(NULL, intc_match);
|
|
if (node)
|
|
irq_domain_add_simple(node, 0);
|
|
|
|
omap_serial_init();
|
|
omap_sdrc_init(NULL, NULL);
|
|
|
|
of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);
|
|
}
|
|
|
|
static void __init omap4_init(void)
|
|
{
|
|
omap4_i2c_init();
|
|
omap_generic_init();
|
|
}
|
|
|
|
static void __init omap3_init(void)
|
|
{
|
|
omap3_i2c_init();
|
|
omap_generic_init();
|
|
}
|
|
|
|
#if defined(CONFIG_SOC_OMAP2420)
|
|
static const char *omap242x_boards_compat[] __initdata = {
|
|
"ti,omap2420",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")
|
|
.atag_offset = 0x100,
|
|
.reserve = omap_reserve,
|
|
.map_io = omap242x_map_io,
|
|
.init_early = omap2420_init_early,
|
|
.init_irq = omap2_init_irq,
|
|
.init_machine = omap_generic_init,
|
|
.timer = &omap2_timer,
|
|
.dt_compat = omap242x_boards_compat,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
#if defined(CONFIG_SOC_OMAP2430)
|
|
static const char *omap243x_boards_compat[] __initdata = {
|
|
"ti,omap2430",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)")
|
|
.atag_offset = 0x100,
|
|
.reserve = omap_reserve,
|
|
.map_io = omap243x_map_io,
|
|
.init_early = omap2430_init_early,
|
|
.init_irq = omap2_init_irq,
|
|
.init_machine = omap_generic_init,
|
|
.timer = &omap2_timer,
|
|
.dt_compat = omap243x_boards_compat,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_OMAP3)
|
|
static const char *omap3_boards_compat[] __initdata = {
|
|
"ti,omap3",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
|
|
.atag_offset = 0x100,
|
|
.reserve = omap_reserve,
|
|
.map_io = omap3_map_io,
|
|
.init_early = omap3430_init_early,
|
|
.init_irq = omap3_init_irq,
|
|
.init_machine = omap3_init,
|
|
.timer = &omap3_timer,
|
|
.dt_compat = omap3_boards_compat,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_OMAP4)
|
|
static const char *omap4_boards_compat[] __initdata = {
|
|
"ti,omap4",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)")
|
|
.atag_offset = 0x100,
|
|
.reserve = omap_reserve,
|
|
.map_io = omap4_map_io,
|
|
.init_early = omap4430_init_early,
|
|
.init_irq = gic_init_irq,
|
|
.init_machine = omap4_init,
|
|
.timer = &omap4_timer,
|
|
.dt_compat = omap4_boards_compat,
|
|
MACHINE_END
|
|
#endif
|