1fdb24e969
* 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits) ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET ARM: gic, local timers: use the request_percpu_irq() interface ARM: gic: consolidate PPI handling ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H ARM: mach-s5p64x0: remove mach/memory.h ARM: mach-s3c64xx: remove mach/memory.h ARM: plat-mxc: remove mach/memory.h ARM: mach-prima2: remove mach/memory.h ARM: mach-zynq: remove mach/memory.h ARM: mach-bcmring: remove mach/memory.h ARM: mach-davinci: remove mach/memory.h ARM: mach-pxa: remove mach/memory.h ARM: mach-ixp4xx: remove mach/memory.h ARM: mach-h720x: remove mach/memory.h ARM: mach-vt8500: remove mach/memory.h ARM: mach-s5pc100: remove mach/memory.h ARM: mach-tegra: remove mach/memory.h ARM: plat-tcc: remove mach/memory.h ARM: mach-mmp: remove mach/memory.h ARM: mach-cns3xxx: remove mach/memory.h ... Fix up mostly pretty trivial conflicts in: - arch/arm/Kconfig - arch/arm/include/asm/localtimer.h - arch/arm/kernel/Makefile - arch/arm/mach-shmobile/board-ap4evb.c - arch/arm/mach-u300/core.c - arch/arm/mm/dma-mapping.c - arch/arm/mm/proc-v7.S - arch/arm/plat-omap/Kconfig largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP -> CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and addition of NEED_MACH_MEMORY_H next to HAVE_IDE.
103 lines
2.4 KiB
C
103 lines
2.4 KiB
C
/*
|
|
* linux/arch/arm/mach-omap1/board-generic.c
|
|
*
|
|
* Modified from board-innovator1510.c
|
|
*
|
|
* Code for generic OMAP board. Should work on many OMAP systems where
|
|
* the device drivers take care of all the necessary hardware initialization.
|
|
* Do not put any board specific code to this file; create a new machine
|
|
* type if you need custom low-level initializations.
|
|
*
|
|
* 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/gpio.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include <plat/mux.h>
|
|
#include <plat/usb.h>
|
|
#include <plat/board.h>
|
|
#include <plat/common.h>
|
|
|
|
static void __init omap_generic_init_irq(void)
|
|
{
|
|
omap1_init_common_hw();
|
|
omap1_init_irq();
|
|
}
|
|
|
|
/* assume no Mini-AB port */
|
|
|
|
#ifdef CONFIG_ARCH_OMAP15XX
|
|
static struct omap_usb_config generic1510_usb_config __initdata = {
|
|
.register_host = 1,
|
|
.register_dev = 1,
|
|
.hmc_mode = 16,
|
|
.pins[0] = 3,
|
|
};
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_OMAP16XX)
|
|
static struct omap_usb_config generic1610_usb_config __initdata = {
|
|
#ifdef CONFIG_USB_OTG
|
|
.otg = 1,
|
|
#endif
|
|
.register_host = 1,
|
|
.register_dev = 1,
|
|
.hmc_mode = 16,
|
|
.pins[0] = 6,
|
|
};
|
|
#endif
|
|
|
|
static struct omap_board_config_kernel generic_config[] __initdata = {
|
|
};
|
|
|
|
static void __init omap_generic_init(void)
|
|
{
|
|
#ifdef CONFIG_ARCH_OMAP15XX
|
|
if (cpu_is_omap15xx()) {
|
|
/* mux pins for uarts */
|
|
omap_cfg_reg(UART1_TX);
|
|
omap_cfg_reg(UART1_RTS);
|
|
omap_cfg_reg(UART2_TX);
|
|
omap_cfg_reg(UART2_RTS);
|
|
omap_cfg_reg(UART3_TX);
|
|
omap_cfg_reg(UART3_RX);
|
|
|
|
omap1_usb_init(&generic1510_usb_config);
|
|
}
|
|
#endif
|
|
#if defined(CONFIG_ARCH_OMAP16XX)
|
|
if (!cpu_is_omap1510()) {
|
|
omap1_usb_init(&generic1610_usb_config);
|
|
}
|
|
#endif
|
|
|
|
omap_board_config = generic_config;
|
|
omap_board_config_size = ARRAY_SIZE(generic_config);
|
|
omap_serial_init();
|
|
omap_register_i2c_bus(1, 100, NULL, 0);
|
|
}
|
|
|
|
static void __init omap_generic_map_io(void)
|
|
{
|
|
omap1_map_common_io();
|
|
}
|
|
|
|
MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")
|
|
/* Maintainer: Tony Lindgren <tony@atomide.com> */
|
|
.atag_offset = 0x100,
|
|
.map_io = omap_generic_map_io,
|
|
.reserve = omap_reserve,
|
|
.init_irq = omap_generic_init_irq,
|
|
.init_machine = omap_generic_init,
|
|
.timer = &omap1_timer,
|
|
MACHINE_END
|