3dfaf7a68e
Patch from Martin Michlmayr ARM patch 3226/1 (IXP4xx runtime expansion bus window size configuration) forgot to update mach-ixp4xx/nslu2-setup.c which leads to the following compilation error. Update NSLU2 flash support following patch 3226/1. CC arch/arm/mach-ixp4xx/nslu2-setup.o arch/arm/mach-ixp4xx/nslu2-setup.c:30: error: ‘NSLU2_FLASH_BASE’ undeclared here (not in a function) arch/arm/mach-ixp4xx/nslu2-setup.c:31: error: ‘NSLU2_FLASH_SIZE’ undeclared here (not in a function) make[1]: *** [arch/arm/mach-ixp4xx/nslu2-setup.o] Error 1 make: *** [arch/arm/mach-ixp4xx] Error 2 Signed-off-by: Martin Michlmayr <tbm@cyrius.com> --- nslu2-setup.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
135 lines
3.1 KiB
C
135 lines
3.1 KiB
C
/*
|
|
* arch/arm/mach-ixp4xx/nslu2-setup.c
|
|
*
|
|
* NSLU2 board-setup
|
|
*
|
|
* based ixdp425-setup.c:
|
|
* Copyright (C) 2003-2004 MontaVista Software, Inc.
|
|
*
|
|
* Author: Mark Rakes <mrakes at mac.com>
|
|
* Maintainers: http://www.nslu2-linux.org/
|
|
*
|
|
* Fixed missing init_time in MACHINE_START kas11 10/22/04
|
|
* Changed to conform to new style __init ixdp425 kas11 10/22/04
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/serial.h>
|
|
#include <linux/serial_8250.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/flash.h>
|
|
|
|
static struct flash_platform_data nslu2_flash_data = {
|
|
.map_name = "cfi_probe",
|
|
.width = 2,
|
|
};
|
|
|
|
static struct resource nslu2_flash_resource = {
|
|
.flags = IORESOURCE_MEM,
|
|
};
|
|
|
|
static struct platform_device nslu2_flash = {
|
|
.name = "IXP4XX-Flash",
|
|
.id = 0,
|
|
.dev.platform_data = &nslu2_flash_data,
|
|
.num_resources = 1,
|
|
.resource = &nslu2_flash_resource,
|
|
};
|
|
|
|
static struct ixp4xx_i2c_pins nslu2_i2c_gpio_pins = {
|
|
.sda_pin = NSLU2_SDA_PIN,
|
|
.scl_pin = NSLU2_SCL_PIN,
|
|
};
|
|
|
|
static struct platform_device nslu2_i2c_controller = {
|
|
.name = "IXP4XX-I2C",
|
|
.id = 0,
|
|
.dev.platform_data = &nslu2_i2c_gpio_pins,
|
|
.num_resources = 0,
|
|
};
|
|
|
|
static struct resource nslu2_uart_resources[] = {
|
|
{
|
|
.start = IXP4XX_UART1_BASE_PHYS,
|
|
.end = IXP4XX_UART1_BASE_PHYS + 0x0fff,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = IXP4XX_UART2_BASE_PHYS,
|
|
.end = IXP4XX_UART2_BASE_PHYS + 0x0fff,
|
|
.flags = IORESOURCE_MEM,
|
|
}
|
|
};
|
|
|
|
static struct plat_serial8250_port nslu2_uart_data[] = {
|
|
{
|
|
.mapbase = IXP4XX_UART1_BASE_PHYS,
|
|
.membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
|
|
.irq = IRQ_IXP4XX_UART1,
|
|
.flags = UPF_BOOT_AUTOCONF,
|
|
.iotype = UPIO_MEM,
|
|
.regshift = 2,
|
|
.uartclk = IXP4XX_UART_XTAL,
|
|
},
|
|
{
|
|
.mapbase = IXP4XX_UART2_BASE_PHYS,
|
|
.membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
|
|
.irq = IRQ_IXP4XX_UART2,
|
|
.flags = UPF_BOOT_AUTOCONF,
|
|
.iotype = UPIO_MEM,
|
|
.regshift = 2,
|
|
.uartclk = IXP4XX_UART_XTAL,
|
|
},
|
|
{ }
|
|
};
|
|
|
|
static struct platform_device nslu2_uart = {
|
|
.name = "serial8250",
|
|
.id = PLAT8250_DEV_PLATFORM,
|
|
.dev.platform_data = nslu2_uart_data,
|
|
.num_resources = 2,
|
|
.resource = nslu2_uart_resources,
|
|
};
|
|
|
|
static struct platform_device *nslu2_devices[] __initdata = {
|
|
&nslu2_i2c_controller,
|
|
&nslu2_flash,
|
|
&nslu2_uart,
|
|
};
|
|
|
|
static void nslu2_power_off(void)
|
|
{
|
|
/* This causes the box to drop the power and go dead. */
|
|
|
|
/* enable the pwr cntl gpio */
|
|
gpio_line_config(NSLU2_PO_GPIO, IXP4XX_GPIO_OUT);
|
|
|
|
/* do the deed */
|
|
gpio_line_set(NSLU2_PO_GPIO, IXP4XX_GPIO_HIGH);
|
|
}
|
|
|
|
static void __init nslu2_init(void)
|
|
{
|
|
ixp4xx_sys_init();
|
|
|
|
nslu2_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
|
|
nslu2_flash_resource.end =
|
|
IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
|
|
|
|
pm_power_off = nslu2_power_off;
|
|
|
|
platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices));
|
|
}
|
|
|
|
MACHINE_START(NSLU2, "Linksys NSLU2")
|
|
/* Maintainer: www.nslu2-linux.org */
|
|
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
|
|
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC,
|
|
.boot_params = 0x00000100,
|
|
.map_io = ixp4xx_map_io,
|
|
.init_irq = ixp4xx_init_irq,
|
|
.timer = &ixp4xx_timer,
|
|
.init_machine = nslu2_init,
|
|
MACHINE_END
|