mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 06:12:08 +00:00
7c38cf021b
Patch from Tony Lindgren This patch syncs the mainline kernel with linux-omap tree. The highlights of the patch are: - Convert more drivers to register resources in board-*.c to take advantage of the driver model by David Brownell and Ladislav Michl - Use set_irq_type() for GPIO interrupts instead of omap_set_gpio_edge_ctrl() by David Brownell - Add minimal support for handling optional add-on boards, such as OSK Mistral board with LCD and keypad, by David Brownell - Minimal support for loading functions to SRAM by Tony Lindgren - Wake up from serial port by muxing RX lines temporarily into GPIO interrupts by Tony Lindgren - 32KHz sched_clock by Tony Lindgren and Juha Yrjola Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
136 lines
3.2 KiB
C
136 lines
3.2 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/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/device.h>
|
|
|
|
#include <asm/hardware.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include <asm/arch/gpio.h>
|
|
#include <asm/arch/mux.h>
|
|
#include <asm/arch/usb.h>
|
|
#include <asm/arch/board.h>
|
|
#include <asm/arch/common.h>
|
|
|
|
static int __initdata generic_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1};
|
|
|
|
static void __init omap_generic_init_irq(void)
|
|
{
|
|
omap_init_irq();
|
|
}
|
|
|
|
/* assume no Mini-AB port */
|
|
|
|
#ifdef CONFIG_ARCH_OMAP1510
|
|
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,
|
|
};
|
|
|
|
static struct omap_mmc_config generic_mmc_config __initdata = {
|
|
.mmc [0] = {
|
|
.enabled = 0,
|
|
.wire4 = 0,
|
|
.wp_pin = -1,
|
|
.power_pin = -1,
|
|
.switch_pin = -1,
|
|
},
|
|
.mmc [1] = {
|
|
.enabled = 0,
|
|
.wire4 = 0,
|
|
.wp_pin = -1,
|
|
.power_pin = -1,
|
|
.switch_pin = -1,
|
|
},
|
|
};
|
|
|
|
#endif
|
|
|
|
static struct omap_board_config_kernel generic_config[] = {
|
|
{ OMAP_TAG_USB, NULL },
|
|
{ OMAP_TAG_MMC, &generic_mmc_config },
|
|
};
|
|
|
|
static void __init omap_generic_init(void)
|
|
{
|
|
const struct omap_uart_config *uart_conf;
|
|
|
|
/*
|
|
* Make sure the serial ports are muxed on at this point.
|
|
* You have to mux them off in device drivers later on
|
|
* if not needed.
|
|
*/
|
|
#ifdef CONFIG_ARCH_OMAP1510
|
|
if (cpu_is_omap1510()) {
|
|
generic_config[0].data = &generic1510_usb_config;
|
|
}
|
|
#endif
|
|
#if defined(CONFIG_ARCH_OMAP16XX)
|
|
if (!cpu_is_omap1510()) {
|
|
generic_config[0].data = &generic1610_usb_config;
|
|
}
|
|
#endif
|
|
|
|
uart_conf = omap_get_config(OMAP_TAG_UART, struct omap_uart_config);
|
|
if (uart_conf != NULL) {
|
|
unsigned int enabled_ports, i;
|
|
|
|
enabled_ports = uart_conf->enabled_uarts;
|
|
for (i = 0; i < 3; i++) {
|
|
if (!(enabled_ports & (1 << i)))
|
|
generic_serial_ports[i] = 0;
|
|
}
|
|
}
|
|
|
|
omap_board_config = generic_config;
|
|
omap_board_config_size = ARRAY_SIZE(generic_config);
|
|
omap_serial_init(generic_serial_ports);
|
|
}
|
|
|
|
static void __init omap_generic_map_io(void)
|
|
{
|
|
omap_map_common_io();
|
|
}
|
|
|
|
MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")
|
|
/* Maintainer: Tony Lindgren <tony@atomide.com> */
|
|
.phys_ram = 0x10000000,
|
|
.phys_io = 0xfff00000,
|
|
.io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
|
|
.boot_params = 0x10000100,
|
|
.map_io = omap_generic_map_io,
|
|
.init_irq = omap_generic_init_irq,
|
|
.init_machine = omap_generic_init,
|
|
.timer = &omap_timer,
|
|
MACHINE_END
|