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.
83 lines
2.1 KiB
C
83 lines
2.1 KiB
C
/* linux/arch/arm/mach-msm/board-mahimahi.c
|
|
*
|
|
* Copyright (C) 2009 Google, Inc.
|
|
* Copyright (C) 2009 HTC Corporation.
|
|
* Author: Dima Zavin <dima@android.com>
|
|
*
|
|
* This software is licensed under the terms of the GNU General Public
|
|
* License version 2, as published by the Free Software Foundation, and
|
|
* may be copied, distributed, and modified under those terms.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
*/
|
|
|
|
#include <linux/delay.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/init.h>
|
|
#include <linux/input.h>
|
|
#include <linux/io.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/setup.h>
|
|
|
|
#include <mach/board.h>
|
|
#include <mach/hardware.h>
|
|
#include <mach/system.h>
|
|
|
|
#include "board-mahimahi.h"
|
|
#include "devices.h"
|
|
#include "proc_comm.h"
|
|
|
|
static uint debug_uart;
|
|
|
|
module_param_named(debug_uart, debug_uart, uint, 0);
|
|
|
|
static struct platform_device *devices[] __initdata = {
|
|
#if !defined(CONFIG_MSM_SERIAL_DEBUGGER)
|
|
&msm_device_uart1,
|
|
#endif
|
|
&msm_device_uart_dm1,
|
|
&msm_device_nand,
|
|
};
|
|
|
|
static void __init mahimahi_init(void)
|
|
{
|
|
platform_add_devices(devices, ARRAY_SIZE(devices));
|
|
}
|
|
|
|
static void __init mahimahi_fixup(struct tag *tags, char **cmdline,
|
|
struct meminfo *mi)
|
|
{
|
|
mi->nr_banks = 2;
|
|
mi->bank[0].start = PHYS_OFFSET;
|
|
mi->bank[0].node = PHYS_TO_NID(PHYS_OFFSET);
|
|
mi->bank[0].size = (219*1024*1024);
|
|
mi->bank[1].start = MSM_HIGHMEM_BASE;
|
|
mi->bank[1].node = PHYS_TO_NID(MSM_HIGHMEM_BASE);
|
|
mi->bank[1].size = MSM_HIGHMEM_SIZE;
|
|
}
|
|
|
|
static void __init mahimahi_map_io(void)
|
|
{
|
|
msm_map_common_io();
|
|
msm_clock_init();
|
|
}
|
|
|
|
extern struct sys_timer msm_timer;
|
|
|
|
MACHINE_START(MAHIMAHI, "mahimahi")
|
|
.atag_offset = 0x100,
|
|
.fixup = mahimahi_fixup,
|
|
.map_io = mahimahi_map_io,
|
|
.init_irq = msm_init_irq,
|
|
.init_machine = mahimahi_init,
|
|
.timer = &msm_timer,
|
|
MACHINE_END
|