![Linus Torvalds](/assets/img/avatar_default.png)
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (149 commits) arm: omap: Add omap3_defconfig AM35xx: Defconfig for AM3517 EVM board AM35xx: Add support for AM3517 EVM board omap: 3630sdp: defconfig creation omap: 3630sdp: introduce 3630 sdp board support omap3: Add defconfig for IGEP v2 board omap3: Add minimal IGEP v2 support omap3: Add CompuLab CM-T35 defconfig omap3: Add CompuLab CM-T35 board support omap3: rx51: Add wl1251 wlan driver support omap3: rx51: Add SDRAM init omap1: Add default kernel configuration for Herald omap1: Add board support and LCD for HTC Herald omap: zoom2: update defconfig for LL_DEBUG_NONE omap: zoom3: defconfig creation omap3: zoom: Introduce zoom3 board support omap3: zoom: Drop i2c-1 speed to 2400 omap3: zoom: rename zoom2 name to generic zoom omap3: zoom: split board file for software reuse omap3evm: MIgrate to smsc911x ethernet driver ... Fix trivial conflict (two unrelated config options added next to each other) in arch/arm/mach-omap2/Makefile
92 lines
2 KiB
C
92 lines
2 KiB
C
/*
|
|
* Copyright (C) 2009 Texas Instruments Inc.
|
|
* Mikkel Christensen <mlc@ti.com>
|
|
*
|
|
* Modified from mach-omap2/board-ldp.c
|
|
*
|
|
* 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/platform_device.h>
|
|
#include <linux/input.h>
|
|
#include <linux/gpio.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
|
|
#include <plat/common.h>
|
|
#include <plat/board.h>
|
|
|
|
#include <mach/board-zoom.h>
|
|
|
|
#include "sdram-micron-mt46h32m32lf-6.h"
|
|
|
|
static void __init omap_zoom2_init_irq(void)
|
|
{
|
|
omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
|
|
mt46h32m32lf6_sdrc_params);
|
|
omap_init_irq();
|
|
omap_gpio_init();
|
|
}
|
|
|
|
/* REVISIT: These audio entries can be removed once MFD code is merged */
|
|
#if 0
|
|
|
|
static struct twl4030_madc_platform_data zoom2_madc_data = {
|
|
.irq_line = 1,
|
|
};
|
|
|
|
static struct twl4030_codec_audio_data zoom2_audio_data = {
|
|
.audio_mclk = 26000000,
|
|
};
|
|
|
|
static struct twl4030_codec_data zoom2_codec_data = {
|
|
.audio_mclk = 26000000,
|
|
.audio = &zoom2_audio_data,
|
|
};
|
|
|
|
static struct twl4030_platform_data zoom2_twldata = {
|
|
.irq_base = TWL4030_IRQ_BASE,
|
|
.irq_end = TWL4030_IRQ_END,
|
|
|
|
/* platform_data for children goes here */
|
|
.bci = &zoom2_bci_data,
|
|
.madc = &zoom2_madc_data,
|
|
.usb = &zoom2_usb_data,
|
|
.gpio = &zoom2_gpio_data,
|
|
.keypad = &zoom2_kp_twl4030_data,
|
|
.codec = &zoom2_codec_data,
|
|
.vmmc1 = &zoom2_vmmc1,
|
|
.vmmc2 = &zoom2_vmmc2,
|
|
.vsim = &zoom2_vsim,
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
static void __init omap_zoom2_init(void)
|
|
{
|
|
zoom_peripherals_init();
|
|
zoom_debugboard_init();
|
|
}
|
|
|
|
static void __init omap_zoom2_map_io(void)
|
|
{
|
|
omap2_set_globals_343x();
|
|
omap2_map_common_io();
|
|
}
|
|
|
|
MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
|
|
.phys_io = 0x48000000,
|
|
.io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
|
|
.boot_params = 0x80000100,
|
|
.map_io = omap_zoom2_map_io,
|
|
.init_irq = omap_zoom2_init_irq,
|
|
.init_machine = omap_zoom2_init,
|
|
.timer = &omap_timer,
|
|
MACHINE_END
|