diff -Nur --exclude-from linux-3.5.4/Documentation/dontdiff linux-3.5.4/arch/arm/mach-at91/at91sam9260_devices.c linux-3.5.4-MR1002/arch/arm/mach-at91/at91sam9260_devices.c --- linux-3.5.4/arch/arm/mach-at91/at91sam9260_devices.c 2012-09-15 00:28:08.000000000 +0200 +++ linux-3.5.4-MR1002/arch/arm/mach-at91/at91sam9260_devices.c 2012-09-18 10:06:01.835278474 +0200 @@ -195,8 +195,8 @@ at91_set_B_periph(AT91_PIN_PA25, 0); /* ERX2 */ at91_set_B_periph(AT91_PIN_PA26, 0); /* ERX3 */ at91_set_B_periph(AT91_PIN_PA27, 0); /* ERXCK */ - at91_set_B_periph(AT91_PIN_PA23, 0); /* ETX2 */ - at91_set_B_periph(AT91_PIN_PA24, 0); /* ETX3 */ + at91_set_B_periph(AT91_PIN_PA10, 0); /* ETX2 */ + at91_set_B_periph(AT91_PIN_PA11, 0); /* ETX3 */ at91_set_B_periph(AT91_PIN_PA22, 0); /* ETXER */ } diff -Nur --exclude-from linux-3.5.4/Documentation/dontdiff linux-3.5.4/arch/arm/mach-at91/board-geu09.c linux-3.5.4-MR1002/arch/arm/mach-at91/board-geu09.c --- linux-3.5.4/arch/arm/mach-at91/board-geu09.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.5.4-MR1002/arch/arm/mach-at91/board-geu09.c 2012-09-18 14:22:54.548024425 +0200 @@ -0,0 +1,274 @@ +/* + * linux/arch/arm/mach-at91/board-sam9260ek.c + * + * Copyright (C) 2005 SAN People + * Copyright (C) 2006 Atmel + * + * 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 + +#include +#include +#include +#include +#include + +#include "sam9_smc.h" +#include "generic.h" + +static void __init ek_init_early(void) +{ + /* Initialize processor: 18.432 MHz crystal */ + at91_initialize(18432000); +} + +/* + * USB Host port + */ +static struct at91_usbh_data __initdata ek_usbh_data = { + .ports = 2, + .vbus_pin = {-EINVAL, -EINVAL}, + .overcurrent_pin= {-EINVAL, -EINVAL}, +}; + +/* + * USB Device port + */ +static struct at91_udc_data __initdata ek_udc_data = { + .vbus_pin = AT91_PIN_PC9, + .pullup_pin = -EINVAL, /* pull-up driven by UDC */ +}; + +/* + * SPI devices. + */ +static struct spi_board_info ek_spi_devices[] = { + { /* RTC */ + .modalias = "rtc-pcf2123", + .chip_select = 0, + .mode = SPI_CS_HIGH, + .max_speed_hz = 1 * 1000 * 1000, + .bus_num = 1, + }, +}; + + +/* + * MACB Ethernet device + */ +static struct macb_platform_data __initdata ek_macb_data = { + .phy_irq_pin = AT91_PIN_PA7, + .is_rmii = 0, +}; + + +/* + * NAND flash + */ +static struct mtd_partition __initdata ek_nand_partition[] = { + { + .name = "kernel", + .offset = 0, + .size = SZ_8M, + }, + { + .name = "rootfs", + .offset = MTDPART_OFS_NXTBLK, + .size = MTDPART_SIZ_FULL, + }, +}; + +static struct atmel_nand_data __initdata ek_nand_data = { + .ale = 21, + .cle = 22, + .det_pin = -EINVAL, + .rdy_pin = AT91_PIN_PC13, + .enable_pin = AT91_PIN_PC14, + .ecc_mode = NAND_ECC_SOFT, + .on_flash_bbt = -EINVAL, + .parts = ek_nand_partition, + .num_parts = ARRAY_SIZE(ek_nand_partition), +}; + +static struct sam9_smc_config __initdata ek_nand_smc_config = { + .ncs_read_setup = 0, + .nrd_setup = 1, + .ncs_write_setup = 0, + .nwe_setup = 1, + + .ncs_read_pulse = 3, + .nrd_pulse = 3, + .ncs_write_pulse = 3, + .nwe_pulse = 3, + + .read_cycle = 5, + .write_cycle = 5, + + .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE, + .tdf_cycles = 2, +}; + +static void __init ek_add_device_nand(void) +{ + ek_nand_data.bus_width_16 = board_have_nand_16bit(); + /* setup bus-width (8 or 16) */ + if (ek_nand_data.bus_width_16) + ek_nand_smc_config.mode |= AT91_SMC_DBW_16; + else + ek_nand_smc_config.mode |= AT91_SMC_DBW_8; + + /* configure chip-select 3 (NAND) */ + sam9_smc_configure(0, 3, &ek_nand_smc_config); + + at91_add_device_nand(&ek_nand_data); +} + + +/* + * MCI (SD/MMC) + */ +static struct at91_mmc_data __initdata ek_mmc_data = { + .slot_b = 1, + .wire4 = 1, + .det_pin = -EINVAL, + .wp_pin = -EINVAL, + .vcc_pin = -EINVAL, +}; + + +/* + * LEDs + */ +static struct gpio_led ek_leds[] = { + { + .name = "gsm", + .gpio = AT91_PIN_PA31, + .active_low = 1, + .default_trigger = "none", + }, + { + .name = "status", + .gpio = AT91_PIN_PB8, + .active_low = 1, + .default_trigger = "none", + }, + { + .name = "data", + .gpio = AT91_PIN_PA24, + .active_low = 1, + .default_trigger = "none", + }, + { + .name = "power", + .gpio = AT91_PIN_PA30, + .active_low = 1, + .default_trigger = "default-on", + } +}; + +/* + * GPIOs + */ + +static void __init ek_export_gpios(void) +{ + /* Bluetooth Reset Pin */ + + gpio_request(AT91_PIN_PA23, "BT_RST"); + barrier(); + gpio_direction_output(AT91_PIN_PA23, 0); + gpio_export(AT91_PIN_PA23, false); + + /* RF Reset Pin */ + gpio_request(AT91_PIN_PC6, "RF_RST"); + barrier(); + gpio_direction_output(AT91_PIN_PC6, 1); + gpio_export(AT91_PIN_PC6, false); + + /* RF IRQ Pin */ + gpio_request(AT91_PIN_PC8, "BT_IRQ"); + barrier(); + gpio_direction_input(AT91_PIN_PC8); + gpio_export(AT91_PIN_PC8, false); + + /* GSM Power Control Pin */ + gpio_request(AT91_PIN_PB9, "GSM_PWR"); + barrier(); + gpio_direction_output(AT91_PIN_PB9, 1); + gpio_export(AT91_PIN_PB9, false); +} + + +static void __init ek_board_init(void) +{ + /* Serial */ + /* DBGU on ttyS0. (Rx & Tx only) */ + at91_register_uart(0, 0, 0); + + /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ + at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS + | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD + | ATMEL_UART_RI); + + /* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */ + at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS); + at91_add_device_serial(); + /* USB Host */ + at91_add_device_usbh(&ek_usbh_data); + /* USB Device */ + at91_add_device_udc(&ek_udc_data); + /* SPI */ + at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices)); + /* NAND */ + ek_add_device_nand(); + /* Ethernet */ + at91_add_device_eth(&ek_macb_data); + /* MMC */ + at91_add_device_mmc(0, &ek_mmc_data); + /* LEDs */ + at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds)); + /* GPIOs */ + ek_export_gpios(); +} + +MACHINE_START(AT91SAM9260EK, "MR1002") + /* Maintainer: Atmel */ + .timer = &at91sam926x_timer, + .map_io = at91_map_io, + .init_early = ek_init_early, + .init_irq = at91_init_irq_default, + .init_machine = ek_board_init, +MACHINE_END diff -Nur --exclude-from linux-3.5.4/Documentation/dontdiff linux-3.5.4/arch/arm/mach-at91/Kconfig linux-3.5.4-MR1002/arch/arm/mach-at91/Kconfig --- linux-3.5.4/arch/arm/mach-at91/Kconfig 2012-09-15 00:28:08.000000000 +0200 +++ linux-3.5.4-MR1002/arch/arm/mach-at91/Kconfig 2012-09-18 10:09:00.939287142 +0200 @@ -251,6 +251,12 @@ comment "AT91SAM9260 Variants" +config MACH_GEU09 + bool "GEU-09 Board" + depends on ARCH_AT91SAM9260 + help + Select this if you are using GEU-09 Board + comment "AT91SAM9260 / AT91SAM9XE Board Type" config MACH_AT91SAM9260EK diff -Nur --exclude-from linux-3.5.4/Documentation/dontdiff linux-3.5.4/arch/arm/mach-at91/Makefile linux-3.5.4-MR1002/arch/arm/mach-at91/Makefile --- linux-3.5.4/arch/arm/mach-at91/Makefile 2012-09-15 00:28:08.000000000 +0200 +++ linux-3.5.4-MR1002/arch/arm/mach-at91/Makefile 2012-09-18 10:10:16.191290784 +0200 @@ -50,6 +50,7 @@ obj-$(CONFIG_MACH_RSI_EWS) += board-rsi-ews.o # AT91SAM9260 board-specific support +obj-$(CONFIG_MACH_GEU09) += board-geu09.o obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o obj-$(CONFIG_MACH_CAM60) += board-cam60.o obj-$(CONFIG_MACH_SAM9_L9260) += board-sam9-l9260.o diff -Nur --exclude-from linux-3.5.4/Documentation/dontdiff linux-3.5.4/Documentation/dontdiff linux-3.5.4-MR1002/Documentation/dontdiff --- linux-3.5.4/Documentation/dontdiff 2012-09-18 15:31:01.401950265 +0200 +++ linux-3.5.4-MR1002/Documentation/dontdiff 2012-09-15 00:28:08.000000000 +0200 @@ -258,5 +258,3 @@ zImage* zconf.hash.c zoffset.h -ashldi3.S -lib1funcs.S