mirror of
https://github.com/torvalds/linux.git
synced 2024-12-22 10:56:40 +00:00
8b45bc892e
These are changes for drivers that are intimately tied to some SoC
and for some reason could not get merged through the respective
subsystem maintainer tree.
Most of the new code is for the Keystone Navigator driver, which is
new base support that is going to be needed for their hardware
accelerated network driver and other units.
Most of the commits are for moving old code around from at91 and omap
for things that are done in device drivers nowadays.
- at91: move reset, poweroff, memory and clocksource code into drivers
directories
- socfpga: add edac driver (through arm-soc, as requested by Boris)
- omap: move omap-intc code to drivers/irqchip
- sunxi: added an RTC driver for sun6i
- omap: mailbox driver related changes
- keystone: support for the "Navigator" component
- versatile: new reboot, led and soc drivers
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIVAwUAVDWWQGCrR//JCVInAQKX7Q//bDkoseKCZsGaXN7vfQ2YhT3SAc52mROV
YQKdNmtMUrHqDgngATZTx5ogOh1hInnqueFjGGhfMYsHQO1Vj8+odj0r+4jhjuUY
3YfY+qZ+91tq33JlUOhKn+mfVMdxJc8XarGgR6MSWYkqWVYCtLtBluum7hKm2UJ6
/e4hd2zzImX5ATwj/LXWLx5eTf1qAVFGWzNUph1DrW+1V5lOu58X4gKwk1QOCVEh
Pa0GV9oRTkjoswwz9drzjeFtie2yofQ2mygj6QKxg5NsosIF0+B8kJ61Sxwg56Ak
tF+qn1hGtB2cDQkpxK4o2cZgCELhkh5Aqgol/vZUS1DMBSUEGCV9PPp2eOW83r3B
0zsTgsShyVcTh7khdpQmHNRigvcc7e69LaAGC4o/RxaZpCU/LUNCQ+/iqVExSE8A
VNEXr+JNxGxhj3m9KUHuEktdWx1oNvaYR8Rr4RPr6EWR8R6emJ04I7kXInvzhJZL
HOGh75vSuAU83FrsP8fFRLadoHNVDXylAs38BPfGEMngVpjvwJLgQ3+729CwW+Q4
+xQXAKSwKfr8xA8eg6wBSbFcwnEW4QwRqFqQ5XPw7zTZkCZbiLtvn3JpI5bH5A5Q
/d2D+M2vFbB7VbWJBM4etO95eNS/pfhqJhcQh4t0DjXjoW6WqLiHCxhEx8Ogfvop
/4ckyGvtEOI=
=POJD
-----END PGP SIGNATURE-----
Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC driver updates from Arnd Bergmann:
"These are changes for drivers that are intimately tied to some SoC and
for some reason could not get merged through the respective subsystem
maintainer tree.
Most of the new code is for the Keystone Navigator driver, which is
new base support that is going to be needed for their hardware
accelerated network driver and other units.
Most of the commits are for moving old code around from at91 and omap
for things that are done in device drivers nowadays.
- at91: move reset, poweroff, memory and clocksource code into
drivers directories
- socfpga: add edac driver (through arm-soc, as requested by Boris)
- omap: move omap-intc code to drivers/irqchip
- sunxi: added an RTC driver for sun6i
- omap: mailbox driver related changes
- keystone: support for the "Navigator" component
- versatile: new reboot, led and soc drivers"
* tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (92 commits)
bus: arm-ccn: Fix spurious warning message
leds: add device tree bindings for register bit LEDs
soc: add driver for the ARM RealView
power: reset: driver for the Versatile syscon reboot
leds: add a driver for syscon-based LEDs
drivers/soc: ti: fix build break with modules
MAINTAINERS: Add Keystone Multicore Navigator drivers entry
soc: ti: add Keystone Navigator DMA support
Documentation: dt: soc: add Keystone Navigator DMA bindings
soc: ti: add Keystone Navigator QMSS driver
Documentation: dt: soc: add Keystone Navigator QMSS bindings
rtc: sunxi: Depend on platforms sun4i/sun7i that actually have the rtc
rtc: sun6i: Add sun6i RTC driver
irqchip: omap-intc: remove unnecessary comments
irqchip: omap-intc: correct maximum number or MIR registers
irqchip: omap-intc: enable TURBO idle mode
irqchip: omap-intc: enable IP protection
irqchip: omap-intc: remove unnecesary of_address_to_resource() call
irqchip: omap-intc: comment style cleanup
irqchip: omap-intc: minor improvement to omap_irq_pending()
...
269 lines
6.8 KiB
C
269 lines
6.8 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_irq.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/irqdomain.h>
|
|
|
|
#include <asm/mach/arch.h>
|
|
|
|
#include "common.h"
|
|
|
|
#if !(defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3))
|
|
#define intc_of_init NULL
|
|
#endif
|
|
#ifndef CONFIG_ARCH_OMAP4
|
|
#define gic_of_init NULL
|
|
#endif
|
|
|
|
static const struct of_device_id omap_dt_match_table[] __initconst = {
|
|
{ .compatible = "simple-bus", },
|
|
{ .compatible = "ti,omap-infra", },
|
|
{ }
|
|
};
|
|
|
|
static void __init omap_generic_init(void)
|
|
{
|
|
omapdss_early_init_of();
|
|
|
|
pdata_quirks_init(omap_dt_match_table);
|
|
|
|
omapdss_init_of();
|
|
}
|
|
|
|
#ifdef CONFIG_SOC_OMAP2420
|
|
static const char *const omap242x_boards_compat[] __initconst = {
|
|
"ti,omap2420",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")
|
|
.reserve = omap_reserve,
|
|
.map_io = omap242x_map_io,
|
|
.init_early = omap2420_init_early,
|
|
.init_machine = omap_generic_init,
|
|
.init_time = omap2_sync32k_timer_init,
|
|
.dt_compat = omap242x_boards_compat,
|
|
.restart = omap2xxx_restart,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
#ifdef CONFIG_SOC_OMAP2430
|
|
static const char *const omap243x_boards_compat[] __initconst = {
|
|
"ti,omap2430",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)")
|
|
.reserve = omap_reserve,
|
|
.map_io = omap243x_map_io,
|
|
.init_early = omap2430_init_early,
|
|
.init_machine = omap_generic_init,
|
|
.init_time = omap2_sync32k_timer_init,
|
|
.dt_compat = omap243x_boards_compat,
|
|
.restart = omap2xxx_restart,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_OMAP3
|
|
static const char *const omap3_boards_compat[] __initconst = {
|
|
"ti,omap3430",
|
|
"ti,omap3",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
|
|
.reserve = omap_reserve,
|
|
.map_io = omap3_map_io,
|
|
.init_early = omap3430_init_early,
|
|
.init_machine = omap_generic_init,
|
|
.init_late = omap3_init_late,
|
|
.init_time = omap3_sync32k_timer_init,
|
|
.dt_compat = omap3_boards_compat,
|
|
.restart = omap3xxx_restart,
|
|
MACHINE_END
|
|
|
|
static const char *const omap36xx_boards_compat[] __initconst = {
|
|
"ti,omap36xx",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(OMAP36XX_DT, "Generic OMAP36xx (Flattened Device Tree)")
|
|
.reserve = omap_reserve,
|
|
.map_io = omap3_map_io,
|
|
.init_early = omap3630_init_early,
|
|
.init_machine = omap_generic_init,
|
|
.init_late = omap3_init_late,
|
|
.init_time = omap3_sync32k_timer_init,
|
|
.dt_compat = omap36xx_boards_compat,
|
|
.restart = omap3xxx_restart,
|
|
MACHINE_END
|
|
|
|
static const char *const omap3_gp_boards_compat[] __initconst = {
|
|
"ti,omap3-beagle",
|
|
"timll,omap3-devkit8000",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)")
|
|
.reserve = omap_reserve,
|
|
.map_io = omap3_map_io,
|
|
.init_early = omap3430_init_early,
|
|
.init_machine = omap_generic_init,
|
|
.init_late = omap3_init_late,
|
|
.init_time = omap3_secure_sync32k_timer_init,
|
|
.dt_compat = omap3_gp_boards_compat,
|
|
.restart = omap3xxx_restart,
|
|
MACHINE_END
|
|
|
|
static const char *const am3517_boards_compat[] __initconst = {
|
|
"ti,am3517",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(AM3517_DT, "Generic AM3517 (Flattened Device Tree)")
|
|
.reserve = omap_reserve,
|
|
.map_io = omap3_map_io,
|
|
.init_early = am35xx_init_early,
|
|
.init_machine = omap_generic_init,
|
|
.init_late = omap3_init_late,
|
|
.init_time = omap3_gptimer_timer_init,
|
|
.dt_compat = am3517_boards_compat,
|
|
.restart = omap3xxx_restart,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
#ifdef CONFIG_SOC_AM33XX
|
|
static const char *const am33xx_boards_compat[] __initconst = {
|
|
"ti,am33xx",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)")
|
|
.reserve = omap_reserve,
|
|
.map_io = am33xx_map_io,
|
|
.init_early = am33xx_init_early,
|
|
.init_machine = omap_generic_init,
|
|
.init_late = am33xx_init_late,
|
|
.init_time = omap3_gptimer_timer_init,
|
|
.dt_compat = am33xx_boards_compat,
|
|
.restart = am33xx_restart,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_OMAP4
|
|
static const char *const omap4_boards_compat[] __initconst = {
|
|
"ti,omap4460",
|
|
"ti,omap4430",
|
|
"ti,omap4",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)")
|
|
.reserve = omap_reserve,
|
|
.smp = smp_ops(omap4_smp_ops),
|
|
.map_io = omap4_map_io,
|
|
.init_early = omap4430_init_early,
|
|
.init_irq = omap_gic_of_init,
|
|
.init_machine = omap_generic_init,
|
|
.init_late = omap4430_init_late,
|
|
.init_time = omap4_local_timer_init,
|
|
.dt_compat = omap4_boards_compat,
|
|
.restart = omap44xx_restart,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
#ifdef CONFIG_SOC_OMAP5
|
|
static const char *const omap5_boards_compat[] __initconst = {
|
|
"ti,omap5432",
|
|
"ti,omap5430",
|
|
"ti,omap5",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(OMAP5_DT, "Generic OMAP5 (Flattened Device Tree)")
|
|
.reserve = omap_reserve,
|
|
.smp = smp_ops(omap4_smp_ops),
|
|
.map_io = omap5_map_io,
|
|
.init_early = omap5_init_early,
|
|
.init_irq = omap_gic_of_init,
|
|
.init_machine = omap_generic_init,
|
|
.init_late = omap5_init_late,
|
|
.init_time = omap5_realtime_timer_init,
|
|
.dt_compat = omap5_boards_compat,
|
|
.restart = omap44xx_restart,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
#ifdef CONFIG_SOC_AM43XX
|
|
static const char *const am43_boards_compat[] __initconst = {
|
|
"ti,am4372",
|
|
"ti,am43",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)")
|
|
.map_io = am33xx_map_io,
|
|
.init_early = am43xx_init_early,
|
|
.init_late = am43xx_init_late,
|
|
.init_irq = omap_gic_of_init,
|
|
.init_machine = omap_generic_init,
|
|
.init_time = omap3_gptimer_timer_init,
|
|
.dt_compat = am43_boards_compat,
|
|
.restart = omap44xx_restart,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
#ifdef CONFIG_SOC_DRA7XX
|
|
static const char *const dra74x_boards_compat[] __initconst = {
|
|
"ti,am5728",
|
|
"ti,am5726",
|
|
"ti,dra742",
|
|
"ti,dra7",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(DRA74X_DT, "Generic DRA74X (Flattened Device Tree)")
|
|
.reserve = omap_reserve,
|
|
.smp = smp_ops(omap4_smp_ops),
|
|
.map_io = omap5_map_io,
|
|
.init_early = dra7xx_init_early,
|
|
.init_late = dra7xx_init_late,
|
|
.init_irq = omap_gic_of_init,
|
|
.init_machine = omap_generic_init,
|
|
.init_time = omap5_realtime_timer_init,
|
|
.dt_compat = dra74x_boards_compat,
|
|
.restart = omap44xx_restart,
|
|
MACHINE_END
|
|
|
|
static const char *const dra72x_boards_compat[] __initconst = {
|
|
"ti,am5718",
|
|
"ti,am5716",
|
|
"ti,dra722",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(DRA72X_DT, "Generic DRA72X (Flattened Device Tree)")
|
|
.reserve = omap_reserve,
|
|
.map_io = omap5_map_io,
|
|
.init_early = dra7xx_init_early,
|
|
.init_late = dra7xx_init_late,
|
|
.init_irq = omap_gic_of_init,
|
|
.init_machine = omap_generic_init,
|
|
.init_time = omap5_realtime_timer_init,
|
|
.dt_compat = dra72x_boards_compat,
|
|
.restart = omap44xx_restart,
|
|
MACHINE_END
|
|
#endif
|