mirror of
https://github.com/torvalds/linux.git
synced 2024-12-22 19:01:37 +00:00
583ddafe17
arch/arm/mach-ep93xx/include/mach/hardware.h
1. Properly name the include files so that they are loaded
from the <mach/*> directory and not the local directory.
2. Remove including the ts72xx.h header. This header is not
generic to the ep93xx platform. It should only be included
by the ts72xx specific files that require it. The only
two users in the tree are arch/arm/mach-ep93xx/ts72xx.c
and drivers/mtd/nand/ts7250.c.
arch/arm/mach-ep93xx/include/mach/ts72xx.h
1. <linux/io.h> should already be included by any user of this
header. Doing the include here hides it from being needed
by the calling source file.
arch/arm/mach-ep93xx/core.c
1. Remove unnecessary headers. They were probably included
originally due to cut-and-paste from other files.
2. <linux/io.h> should be included not <mach/gpio.h>
arch/arm/mach-ep93xx/adsphere.c
arch/arm/mach-ep93xx/edb93xx.c
arch/arm/mach-ep93xx/gesbc9312.c
arch/arm/mach-ep93xx/micro9.c
arch/arm/mach-ep93xx/ts72xx.c
1. Remove unnecessary headers.
arch/arm/mach-ep93xx/ts72xx.c
1. Remove unnecessary headers.
2. Add platform specific header <mach/ts72xx.h>.
drivers/mtd/nand/ts7250.c
1. <linux/io.h> should be included not <asm/io.h>.
2. Add platform specific header <mach/ts72xx.h>.
Cc: Ryan Mallon <ryan@bluewatersys.com>
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
124 lines
2.8 KiB
C
124 lines
2.8 KiB
C
/*
|
|
* linux/arch/arm/mach-ep93xx/micro9.c
|
|
*
|
|
* Copyright (C) 2006 Contec Steuerungstechnik & Automation GmbH
|
|
* Manfred Gruber <manfred.gruber@contec.at>
|
|
*
|
|
* 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/mtd/physmap.h>
|
|
|
|
#include <mach/hardware.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
|
|
|
|
static struct ep93xx_eth_data micro9_eth_data = {
|
|
.phy_id = 0x1f,
|
|
};
|
|
|
|
static void __init micro9_init(void)
|
|
{
|
|
ep93xx_register_eth(µ9_eth_data, 1);
|
|
}
|
|
|
|
/*
|
|
* Micro9-H
|
|
*/
|
|
#ifdef CONFIG_MACH_MICRO9H
|
|
static struct physmap_flash_data micro9h_flash_data = {
|
|
.width = 4,
|
|
};
|
|
|
|
static struct resource micro9h_flash_resource = {
|
|
.start = EP93XX_CS1_PHYS_BASE,
|
|
.end = EP93XX_CS1_PHYS_BASE + SZ_64M - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
};
|
|
|
|
static struct platform_device micro9h_flash = {
|
|
.name = "physmap-flash",
|
|
.id = 0,
|
|
.dev = {
|
|
.platform_data = µ9h_flash_data,
|
|
},
|
|
.num_resources = 1,
|
|
.resource = µ9h_flash_resource,
|
|
};
|
|
|
|
static void __init micro9h_init(void)
|
|
{
|
|
platform_device_register(µ9h_flash);
|
|
}
|
|
|
|
static void __init micro9h_init_machine(void)
|
|
{
|
|
ep93xx_init_devices();
|
|
micro9_init();
|
|
micro9h_init();
|
|
}
|
|
|
|
MACHINE_START(MICRO9, "Contec Hypercontrol Micro9-H")
|
|
/* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */
|
|
.phys_io = EP93XX_APB_PHYS_BASE,
|
|
.io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
|
|
.boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
|
|
.map_io = ep93xx_map_io,
|
|
.init_irq = ep93xx_init_irq,
|
|
.timer = &ep93xx_timer,
|
|
.init_machine = micro9h_init_machine,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
/*
|
|
* Micro9-M
|
|
*/
|
|
#ifdef CONFIG_MACH_MICRO9M
|
|
static void __init micro9m_init_machine(void)
|
|
{
|
|
ep93xx_init_devices();
|
|
micro9_init();
|
|
}
|
|
|
|
MACHINE_START(MICRO9M, "Contec Hypercontrol Micro9-M")
|
|
/* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */
|
|
.phys_io = EP93XX_APB_PHYS_BASE,
|
|
.io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
|
|
.boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
|
|
.map_io = ep93xx_map_io,
|
|
.init_irq = ep93xx_init_irq,
|
|
.timer = &ep93xx_timer,
|
|
.init_machine = micro9m_init_machine,
|
|
MACHINE_END
|
|
#endif
|
|
|
|
/*
|
|
* Micro9-L
|
|
*/
|
|
#ifdef CONFIG_MACH_MICRO9L
|
|
static void __init micro9l_init_machine(void)
|
|
{
|
|
ep93xx_init_devices();
|
|
micro9_init();
|
|
}
|
|
|
|
MACHINE_START(MICRO9L, "Contec Hypercontrol Micro9-L")
|
|
/* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */
|
|
.phys_io = EP93XX_APB_PHYS_BASE,
|
|
.io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
|
|
.boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
|
|
.map_io = ep93xx_map_io,
|
|
.init_irq = ep93xx_init_irq,
|
|
.timer = &ep93xx_timer,
|
|
.init_machine = micro9l_init_machine,
|
|
MACHINE_END
|
|
#endif
|
|
|