diff -Nurp linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S b/arch/arm/boot/compressed/head-at91rm9200.S --- linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S 2007-06-12 22:29:12.000000000 +0200 +++ b/arch/arm/boot/compressed/head-at91rm9200.S 2007-06-12 02:57:07.000000000 +0200 @@ -73,6 +73,12 @@ cmp r7, r3 beq 99f + @ AT91RM9200 + mov r3, #(MACH_TYPE_AT91RM9200 & 0xff) + orr r3, r3, #(MACH_TYPE_AT91RM9200 & 0xff00) + cmp r7, r3 + beq 99f + @ Unknown board, use the AT91RM9200DK board @ mov r7, #MACH_TYPE_AT91RM9200 mov r7, #(MACH_TYPE_AT91RM9200DK & 0xff) diff -Nurp linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c b/arch/arm/mach-at91/board-sarge.c --- linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-at91/board-sarge.c 2007-06-12 02:57:07.000000000 +0200 @@ -0,0 +1,190 @@ +/* + * linux/arch/arm/mach-at91/board-sarge.c + * + * Copyright (C) 2007 BlackMesaEast staff + * + * mcgregor@blackmesaeast.com.pl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +#include "generic.h" + + +/* + * Serial port configuration. + * 0 .. 3 = USART0 .. USART3 + * 4 = DBGU + */ +static struct at91_uart_config __initdata sarge_uart_config = { + .console_tty = 0, /* ttyS0 */ + .nr_tty = 5, + .tty_map = { 4, 1, 0, 2, 3 } /* ttyS0, ..., ttyS4 */ +}; + +static void __init sarge_map_io(void) +{ + /* Initialize processor: 18.432 MHz crystal */ + at91rm9200_initialize(18432000, AT91RM9200_PQFP); + + /* Setup the serial ports and console */ + at91_init_serial(&sarge_uart_config); +} + +static void __init sarge_init_irq(void) +{ + at91rm9200_init_interrupts(NULL); +} + +static struct at91_eth_data __initdata sarge_eth_data = { + .phy_irq_pin = AT91_PIN_PB1, + .is_rmii = 0, +}; + +static struct at91_usbh_data __initdata sarge_usbh_data = { + .ports = 1, +}; + +static struct at91_udc_data __initdata sarge_udc_data = { + .vbus_pin = AT91_PIN_PA20, + .pullup_pin = AT91_PIN_PA21, +}; + +static struct at91_cf_data __initdata sarge_cf_data = { + .det_pin = AT91_PIN_PB24, + .rst_pin = AT91_PIN_PB23, + // .irq_pin = ... not connected + // .vcc_pin = ... always powered +}; + +static struct at91_mmc_data __initdata sarge_mmc_data = { + .det_pin = AT91_PIN_PB0, + .slot_b = 0, + .wire4 = 1, + .wp_pin = AT91_PIN_PB2, +}; + + + +static struct spi_board_info sarge_spi_devices[] = { + { /* DataFlash chip */ + .modalias = "mtd_dataflash", + .chip_select = 0, + .max_speed_hz = 15 * 1000 * 1000, + } +}; + +static struct mtd_partition __initdata sarge_nand_partition[] = { + { + .name = "NAND Partition 1", + .offset = 0, + .size = MTDPART_SIZ_FULL, + }, +}; + +static struct mtd_partition *nand_partitions(int size, int *num_partitions) +{ + *num_partitions = ARRAY_SIZE(sarge_nand_partition); + return sarge_nand_partition; +} + +static struct at91_nand_data __initdata sarge_nand_data = { + .ale = 22, + .cle = 21, + .det_pin = AT91_PIN_PB22, + .rdy_pin = AT91_PIN_PB22, + // .enable_pin = ... not there + .partition_info = nand_partitions, +}; + +#define SARGE_FLASH_BASE AT91_CHIPSELECT_0 +#define SARGE_FLASH_SIZE 0x200000 + +static struct physmap_flash_data sarge_flash_data = { + .width = 2, +}; + +static struct resource sarge_flash_resource = { + .start = SARGE_FLASH_BASE, + .end = SARGE_FLASH_BASE + SARGE_FLASH_SIZE - 1, + .flags = IORESOURCE_MEM, +}; + +static struct platform_device sarge_flash = { + .name = "physmap-flash", + .id = 0, + .dev = { + .platform_data = &sarge_flash_data, + }, + .resource = &sarge_flash_resource, + .num_resources = 1, +}; + +static void __init sarge_board_init(void) +{ + /* Serial */ + at91_add_device_serial(); + /* Ethernet */ + at91_add_device_eth(&sarge_eth_data); + /* USB Host */ + at91_add_device_usbh(&sarge_usbh_data); + /* USB Device */ + at91_add_device_udc(&sarge_udc_data); + at91_set_multi_drive(sarge_udc_data.pullup_pin, 1); /* pullup_pin is connected to reset */ + /* Compact Flash */ + at91_add_device_cf(&sarge_cf_data); + /* I2C */ + at91_add_device_i2c(); + /* SPI */ + at91_add_device_spi(sarge_spi_devices, ARRAY_SIZE(sarge_spi_devices)); + + /* MMC */ + at91_add_device_mmc(0, &sarge_mmc_data); + /* NAND */ + at91_add_device_nand(&sarge_nand_data); + /* NOR Flash */ + platform_device_register(&sarge_flash); +} +MACHINE_START(AT91RM9200, "Sarge AT91RM9200 SBC") + /* Maintainer: mcgregor@blackmesaeast.com.pl */ + .phys_io = AT91_BASE_SYS, + .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc, + .boot_params = AT91_SDRAM_BASE + 0x100, + .timer = &at91rm9200_timer, + .map_io = sarge_map_io, + .init_irq = sarge_init_irq, + .init_machine = sarge_board_init, +MACHINE_END diff -Nurp linux-2.6.21.4/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig --- linux-2.6.21.4/arch/arm/mach-at91/Kconfig 2007-06-12 22:29:12.000000000 +0200 +++ b/arch/arm/mach-at91/Kconfig 2007-06-12 03:00:28.000000000 +0200 @@ -90,6 +90,13 @@ config MACH_KAFA help Select this if you are using Sperry-Sun's KAFA board. +config MACH_SARGE + bool "Black Mesa East Sarge SBC" + depends on ARCH_AT91RM9200 + help + Select this if you are using BlackMesaEast Sarge PCB + + config MACH_CHUB bool "Promwad Chub board" depends on ARCH_AT91RM9200 diff -Nurp linux-2.6.21.4/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile --- linux-2.6.21.4/arch/arm/mach-at91/Makefile 2007-06-12 22:29:12.000000000 +0200 +++ b/arch/arm/mach-at91/Makefile 2007-06-12 03:00:47.000000000 +0200 @@ -29,6 +29,7 @@ obj-$(CONFIG_MACH_KB9200) += board-kb920 obj-$(CONFIG_MACH_ATEB9200) += board-eb9200.o obj-$(CONFIG_MACH_KAFA) += board-kafa.o obj-$(CONFIG_MACH_CHUB) += board-chub.o +obj-$(CONFIG_MACH_SARGE) += board-sarge.o # AT91SAM9260 board-specific support obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o