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.
61 lines
1.4 KiB
C
61 lines
1.4 KiB
C
/*
|
|
* arch/arm/mach-ks8695/board-micrel.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/gpio.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/types.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/irq.h>
|
|
|
|
#include <mach/gpio-ks8695.h>
|
|
#include <mach/devices.h>
|
|
|
|
#include "generic.h"
|
|
|
|
#ifdef CONFIG_PCI
|
|
static int micrel_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
|
{
|
|
return KS8695_IRQ_EXTERN0;
|
|
}
|
|
|
|
static struct ks8695_pci_cfg __initdata micrel_pci = {
|
|
.mode = KS8695_MODE_MINIPCI,
|
|
.map_irq = micrel_pci_map_irq,
|
|
};
|
|
#endif
|
|
|
|
|
|
static void __init micrel_init(void)
|
|
{
|
|
printk(KERN_INFO "Micrel KS8695 Development Board initializing\n");
|
|
|
|
ks8695_register_gpios();
|
|
|
|
#ifdef CONFIG_PCI
|
|
ks8695_init_pci(&micrel_pci);
|
|
#endif
|
|
|
|
/* Add devices */
|
|
ks8695_add_device_wan(); /* eth0 = WAN */
|
|
ks8695_add_device_lan(); /* eth1 = LAN */
|
|
}
|
|
|
|
MACHINE_START(KS8695, "KS8695 Centaur Development Board")
|
|
/* Maintainer: Micrel Semiconductor Inc. */
|
|
.atag_offset = 0x100,
|
|
.map_io = ks8695_map_io,
|
|
.init_irq = ks8695_init_irq,
|
|
.init_machine = micrel_init,
|
|
.timer = &ks8695_timer,
|
|
MACHINE_END
|