ARM: at91: remove at91sam9260/at91sam9g20 legacy boards files
authorNicolas Ferre <nicolas.ferre@atmel.com>
Wed, 19 Nov 2014 09:30:41 +0000 (10:30 +0100)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Wed, 19 Nov 2014 10:39:22 +0000 (11:39 +0100)
Remove old board files that use at91sam9260 or at91sam9g20 Atmel SoCs. The
device tree is mature on these SoCs. It must be used now.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
13 files changed:
arch/arm/mach-at91/Makefile
arch/arm/mach-at91/board-afeb-9260v1.c [deleted file]
arch/arm/mach-at91/board-cam60.c [deleted file]
arch/arm/mach-at91/board-cpu9krea.c [deleted file]
arch/arm/mach-at91/board-flexibity.c [deleted file]
arch/arm/mach-at91/board-gsia18s.c [deleted file]
arch/arm/mach-at91/board-pcontrol-g20.c [deleted file]
arch/arm/mach-at91/board-sam9-l9260.c [deleted file]
arch/arm/mach-at91/board-sam9260ek.c [deleted file]
arch/arm/mach-at91/board-sam9g20ek.c [deleted file]
arch/arm/mach-at91/board-snapper9260.c [deleted file]
arch/arm/mach-at91/board-stamp9g20.c [deleted file]
arch/arm/mach-at91/stamp9g20.h [deleted file]

index e0361357e018d9aa959d7af20f310d10d2ae090d..88d49248fc5ce9f4c9ff51806fbbfc033b34533a 100644 (file)
@@ -39,29 +39,10 @@ obj-$(CONFIG_MACH_YL9200)   += board-yl-9200.o
 obj-$(CONFIG_MACH_CPUAT91)     += board-cpuat91.o
 obj-$(CONFIG_MACH_ECO920)      += board-eco920.o
 
-# AT91SAM9260 board-specific support
-obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o
-obj-$(CONFIG_MACH_CAM60)       += board-cam60.o
-obj-$(CONFIG_MACH_SAM9_L9260)  += board-sam9-l9260.o
-obj-$(CONFIG_MACH_AFEB9260)    += board-afeb-9260v1.o
-obj-$(CONFIG_MACH_CPU9260)     += board-cpu9krea.o
-obj-$(CONFIG_MACH_FLEXIBITY)   += board-flexibity.o
-
 # AT91SAM9261 board-specific support
 obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o
 obj-$(CONFIG_MACH_AT91SAM9G10EK) += board-sam9261ek.o
 
-# AT91SAM9G20 board-specific support
-obj-$(CONFIG_MACH_AT91SAM9G20EK) += board-sam9g20ek.o
-obj-$(CONFIG_MACH_CPU9G20)     += board-cpu9krea.o
-obj-$(CONFIG_MACH_STAMP9G20)   += board-stamp9g20.o
-obj-$(CONFIG_MACH_PORTUXG20)   += board-stamp9g20.o
-obj-$(CONFIG_MACH_PCONTROL_G20)        += board-pcontrol-g20.o board-stamp9g20.o
-obj-$(CONFIG_MACH_GSIA18S)     += board-gsia18s.o board-stamp9g20.o
-
-# AT91SAM9260/AT91SAM9G20 board-specific support
-obj-$(CONFIG_MACH_SNAPPER_9260)        += board-snapper9260.o
-
 # AT91SAM board with device-tree
 obj-$(CONFIG_MACH_AT91RM9200_DT) += board-dt-rm9200.o
 obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o
diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c
deleted file mode 100644 (file)
index e76e35c..0000000
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * linux/arch/arm/mach-at91/board-afeb-9260v1.c
- *
- *  Copyright (C) 2005 SAN People
- *  Copyright (C) 2006 Atmel
- *  Copyright (C) 2008 Sergey Lapin
- *
- * A custom board designed as open hardware; PCBs and various information
- * is available at http://groups.google.com/group/arm9fpga-evolution-board/
- * Subversion repository: svn://194.85.238.22/home/users/george/svn/arm9eb
- *
- * 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 <linux/types.h>
-#include <linux/gpio.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/spi/spi.h>
-#include <linux/clk.h>
-#include <linux/dma-mapping.h>
-
-#include <mach/hardware.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/irq.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
-
-#include "at91_aic.h"
-#include "board.h"
-#include "generic.h"
-#include "gpio.h"
-
-
-static void __init afeb9260_init_early(void)
-{
-       /* Initialize processor: 18.432 MHz crystal */
-       at91_initialize(18432000);
-}
-
-/*
- * USB Host port
- */
-static struct at91_usbh_data __initdata afeb9260_usbh_data = {
-       .ports          = 1,
-       .vbus_pin       = {-EINVAL, -EINVAL},
-       .overcurrent_pin= {-EINVAL, -EINVAL},
-};
-
-/*
- * USB Device port
- */
-static struct at91_udc_data __initdata afeb9260_udc_data = {
-       .vbus_pin       = AT91_PIN_PC5,
-       .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
-};
-
-
-
-/*
- * SPI devices.
- */
-static struct spi_board_info afeb9260_spi_devices[] = {
-       {       /* DataFlash chip */
-               .modalias       = "mtd_dataflash",
-               .chip_select    = 1,
-               .max_speed_hz   = 15 * 1000 * 1000,
-               .bus_num        = 0,
-       },
-};
-
-
-/*
- * MACB Ethernet device
- */
-static struct macb_platform_data __initdata afeb9260_macb_data = {
-       .phy_irq_pin    = AT91_PIN_PA9,
-       .is_rmii        = 0,
-};
-
-
-/*
- * NAND flash
- */
-static struct mtd_partition __initdata afeb9260_nand_partition[] = {
-       {
-               .name   = "bootloader",
-               .offset = 0,
-               .size   = (640 * SZ_1K),
-       },
-       {
-               .name   = "kernel",
-               .offset = MTDPART_OFS_NXTBLK,
-               .size   = SZ_2M,
-       },
-       {
-               .name   = "rootfs",
-               .offset = MTDPART_OFS_NXTBLK,
-               .size   = MTDPART_SIZ_FULL,
-       },
-};
-
-static struct atmel_nand_data __initdata afeb9260_nand_data = {
-       .ale            = 21,
-       .cle            = 22,
-       .rdy_pin        = AT91_PIN_PC13,
-       .enable_pin     = AT91_PIN_PC14,
-       .bus_width_16   = 0,
-       .ecc_mode       = NAND_ECC_SOFT,
-       .parts          = afeb9260_nand_partition,
-       .num_parts      = ARRAY_SIZE(afeb9260_nand_partition),
-       .det_pin        = -EINVAL,
-};
-
-
-/*
- * MCI (SD/MMC)
- */
-static struct mci_platform_data __initdata afeb9260_mci0_data = {
-       .slot[1] = {
-               .bus_width      = 4,
-               .detect_pin     = AT91_PIN_PC9,
-               .wp_pin         = AT91_PIN_PC4,
-       },
-};
-
-
-
-static struct i2c_board_info __initdata afeb9260_i2c_devices[] = {
-       {
-               I2C_BOARD_INFO("tlv320aic23", 0x1a),
-       }, {
-               I2C_BOARD_INFO("fm3130", 0x68),
-       }, {
-               I2C_BOARD_INFO("24c64", 0x50),
-       },
-};
-
-/*
- * IDE (CF True IDE mode)
- */
-static struct at91_cf_data afeb9260_cf_data = {
-       .chipselect = 4,
-       .irq_pin    = AT91_PIN_PA6,
-       .det_pin        = -EINVAL,
-       .vcc_pin        = -EINVAL,
-       .rst_pin    = AT91_PIN_PA7,
-       .flags      = AT91_CF_TRUE_IDE,
-};
-
-static void __init afeb9260_board_init(void)
-{
-       at91_register_devices();
-
-       /* 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(&afeb9260_usbh_data);
-       /* USB Device */
-       at91_add_device_udc(&afeb9260_udc_data);
-       /* SPI */
-       at91_add_device_spi(afeb9260_spi_devices,
-                       ARRAY_SIZE(afeb9260_spi_devices));
-       /* NAND */
-       at91_add_device_nand(&afeb9260_nand_data);
-       /* Ethernet */
-       at91_add_device_eth(&afeb9260_macb_data);
-
-       /* Standard function's pin assignments are not
-        * appropriate for us and generic code provide
-        * no API to configure these pins any other way */
-       at91_set_B_periph(AT91_PIN_PA10, 0);    /* ETX2 */
-       at91_set_B_periph(AT91_PIN_PA11, 0);    /* ETX3 */
-       /* MMC */
-       at91_add_device_mci(0, &afeb9260_mci0_data);
-       /* I2C */
-       at91_add_device_i2c(afeb9260_i2c_devices,
-                       ARRAY_SIZE(afeb9260_i2c_devices));
-       /* Audio */
-       at91_add_device_ssc(AT91SAM9260_ID_SSC, ATMEL_SSC_TX);
-       /* IDE */
-       at91_add_device_cf(&afeb9260_cf_data);
-}
-
-MACHINE_START(AFEB9260, "Custom afeb9260 board")
-       /* Maintainer: Sergey Lapin <slapin@ossfans.org> */
-       .init_time      = at91_init_time,
-       .map_io         = at91_map_io,
-       .handle_irq     = at91_aic_handle_irq,
-       .init_early     = afeb9260_init_early,
-       .init_irq       = at91_init_irq_default,
-       .init_machine   = afeb9260_board_init,
-MACHINE_END
-
diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c
deleted file mode 100644 (file)
index ae827dd..0000000
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * KwikByte CAM60 (KB9260)
- *
- * based on 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 <linux/types.h>
-#include <linux/gpio.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/flash.h>
-
-#include <mach/hardware.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/irq.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
-
-#include <mach/at91sam9_smc.h>
-
-#include "at91_aic.h"
-#include "board.h"
-#include "sam9_smc.h"
-#include "generic.h"
-#include "gpio.h"
-
-
-static void __init cam60_init_early(void)
-{
-       /* Initialize processor: 10 MHz crystal */
-       at91_initialize(10000000);
-}
-
-/*
- * USB Host
- */
-static struct at91_usbh_data __initdata cam60_usbh_data = {
-       .ports          = 1,
-       .vbus_pin       = {-EINVAL, -EINVAL},
-       .overcurrent_pin= {-EINVAL, -EINVAL},
-};
-
-
-/*
- * SPI devices.
- */
-#if defined(CONFIG_MTD_DATAFLASH)
-static struct mtd_partition cam60_spi_partitions[] = {
-       {
-               .name   = "BOOT1",
-               .offset = 0,
-               .size   = 4 * 1056,
-       },
-       {
-               .name   = "BOOT2",
-               .offset = MTDPART_OFS_NXTBLK,
-               .size   = 256 * 1056,
-       },
-       {
-               .name   = "kernel",
-               .offset = MTDPART_OFS_NXTBLK,
-               .size   = 2222 * 1056,
-       },
-       {
-               .name   = "file system",
-               .offset = MTDPART_OFS_NXTBLK,
-               .size   = MTDPART_SIZ_FULL,
-       },
-};
-
-static struct flash_platform_data cam60_spi_flash_platform_data = {
-       .name           = "spi_flash",
-       .parts          = cam60_spi_partitions,
-       .nr_parts       = ARRAY_SIZE(cam60_spi_partitions)
-};
-#endif
-
-static struct spi_board_info cam60_spi_devices[] __initdata = {
-#if defined(CONFIG_MTD_DATAFLASH)
-       {       /* DataFlash chip */
-               .modalias       = "mtd_dataflash",
-               .chip_select    = 0,
-               .max_speed_hz   = 15 * 1000 * 1000,
-               .bus_num        = 0,
-               .platform_data  = &cam60_spi_flash_platform_data
-       },
-#endif
-};
-
-
-/*
- * MACB Ethernet device
- */
-static struct macb_platform_data cam60_macb_data __initdata = {
-       .phy_irq_pin    = AT91_PIN_PB5,
-       .is_rmii        = 0,
-};
-
-
-/*
- * NAND Flash
- */
-static struct mtd_partition __initdata cam60_nand_partition[] = {
-       {
-               .name   = "nand_fs",
-               .offset = 0,
-               .size   = MTDPART_SIZ_FULL,
-       },
-};
-
-static struct atmel_nand_data __initdata cam60_nand_data = {
-       .ale            = 21,
-       .cle            = 22,
-       .det_pin        = -EINVAL,
-       .rdy_pin        = AT91_PIN_PA9,
-       .enable_pin     = AT91_PIN_PA7,
-       .ecc_mode       = NAND_ECC_SOFT,
-       .parts          = cam60_nand_partition,
-       .num_parts      = ARRAY_SIZE(cam60_nand_partition),
-};
-
-static struct sam9_smc_config __initdata cam60_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 | AT91_SMC_DBW_8,
-       .tdf_cycles             = 2,
-};
-
-static void __init cam60_add_device_nand(void)
-{
-       /* configure chip-select 3 (NAND) */
-       sam9_smc_configure(0, 3, &cam60_nand_smc_config);
-
-       at91_add_device_nand(&cam60_nand_data);
-}
-
-
-static void __init cam60_board_init(void)
-{
-       at91_register_devices();
-
-       /* Serial */
-       /* DBGU on ttyS0. (Rx & Tx only) */
-       at91_register_uart(0, 0, 0);
-       at91_add_device_serial();
-       /* SPI */
-       at91_add_device_spi(cam60_spi_devices, ARRAY_SIZE(cam60_spi_devices));
-       /* Ethernet */
-       at91_add_device_eth(&cam60_macb_data);
-       /* USB Host */
-       /* enable USB power supply circuit */
-       at91_set_gpio_output(AT91_PIN_PB18, 1);
-       at91_add_device_usbh(&cam60_usbh_data);
-       /* NAND */
-       cam60_add_device_nand();
-}
-
-MACHINE_START(CAM60, "KwikByte CAM60")
-       /* Maintainer: KwikByte */
-       .init_time      = at91_init_time,
-       .map_io         = at91_map_io,
-       .handle_irq     = at91_aic_handle_irq,
-       .init_early     = cam60_init_early,
-       .init_irq       = at91_init_irq_default,
-       .init_machine   = cam60_board_init,
-MACHINE_END
diff --git a/arch/arm/mach-at91/board-cpu9krea.c b/arch/arm/mach-at91/board-cpu9krea.c
deleted file mode 100644 (file)
index 731c831..0000000
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- * linux/arch/arm/mach-at91/board-cpu9krea.c
- *
- *  Copyright (C) 2005 SAN People
- *  Copyright (C) 2006 Atmel
- *  Copyright (C) 2009 Eric Benard - eric@eukrea.com
- *
- * 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 <linux/types.h>
-#include <linux/gpio.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-#include <linux/mtd/physmap.h>
-
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/irq.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
-
-#include <mach/hardware.h>
-#include <mach/at91sam9_smc.h>
-#include <mach/at91sam9260_matrix.h>
-#include <mach/at91_matrix.h>
-
-#include "at91_aic.h"
-#include "board.h"
-#include "sam9_smc.h"
-#include "generic.h"
-#include "gpio.h"
-
-static void __init cpu9krea_init_early(void)
-{
-       /* Initialize processor: 18.432 MHz crystal */
-       at91_initialize(18432000);
-}
-
-/*
- * USB Host port
- */
-static struct at91_usbh_data __initdata cpu9krea_usbh_data = {
-       .ports          = 2,
-       .vbus_pin       = {-EINVAL, -EINVAL},
-       .overcurrent_pin= {-EINVAL, -EINVAL},
-};
-
-/*
- * USB Device port
- */
-static struct at91_udc_data __initdata cpu9krea_udc_data = {
-       .vbus_pin       = AT91_PIN_PC8,
-       .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
-};
-
-/*
- * MACB Ethernet device
- */
-static struct macb_platform_data __initdata cpu9krea_macb_data = {
-       .phy_irq_pin    = -EINVAL,
-       .is_rmii        = 1,
-};
-
-/*
- * NAND flash
- */
-static struct atmel_nand_data __initdata cpu9krea_nand_data = {
-       .ale            = 21,
-       .cle            = 22,
-       .rdy_pin        = AT91_PIN_PC13,
-       .enable_pin     = AT91_PIN_PC14,
-       .bus_width_16   = 0,
-       .det_pin        = -EINVAL,
-       .ecc_mode       = NAND_ECC_SOFT,
-};
-
-#ifdef CONFIG_MACH_CPU9260
-static struct sam9_smc_config __initdata cpu9krea_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 | AT91_SMC_DBW_8,
-       .tdf_cycles             = 2,
-};
-#else
-static struct sam9_smc_config __initdata cpu9krea_nand_smc_config = {
-       .ncs_read_setup         = 0,
-       .nrd_setup              = 2,
-       .ncs_write_setup        = 0,
-       .nwe_setup              = 2,
-
-       .ncs_read_pulse         = 4,
-       .nrd_pulse              = 4,
-       .ncs_write_pulse        = 4,
-       .nwe_pulse              = 4,
-
-       .read_cycle             = 7,
-       .write_cycle            = 7,
-
-       .mode                   = AT91_SMC_READMODE | AT91_SMC_WRITEMODE
-               | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_8,
-       .tdf_cycles             = 3,
-};
-#endif
-
-static void __init cpu9krea_add_device_nand(void)
-{
-       sam9_smc_configure(0, 3, &cpu9krea_nand_smc_config);
-       at91_add_device_nand(&cpu9krea_nand_data);
-}
-
-/*
- * NOR flash
- */
-static struct physmap_flash_data cpuat9260_nor_data = {
-       .width          = 2,
-};
-
-#define NOR_BASE       AT91_CHIPSELECT_0
-#define NOR_SIZE       SZ_64M
-
-static struct resource nor_flash_resources[] = {
-       {
-               .start  = NOR_BASE,
-               .end    = NOR_BASE + NOR_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       }
-};
-
-static struct platform_device cpu9krea_nor_flash = {
-       .name           = "physmap-flash",
-       .id             = 0,
-       .dev            = {
-               .platform_data  = &cpuat9260_nor_data,
-       },
-       .resource       = nor_flash_resources,
-       .num_resources  = ARRAY_SIZE(nor_flash_resources),
-};
-
-#ifdef CONFIG_MACH_CPU9260
-static struct sam9_smc_config __initdata cpu9krea_nor_smc_config = {
-       .ncs_read_setup         = 0,
-       .nrd_setup              = 1,
-       .ncs_write_setup        = 0,
-       .nwe_setup              = 1,
-
-       .ncs_read_pulse         = 10,
-       .nrd_pulse              = 10,
-       .ncs_write_pulse        = 6,
-       .nwe_pulse              = 6,
-
-       .read_cycle             = 12,
-       .write_cycle            = 8,
-
-       .mode                   = AT91_SMC_READMODE | AT91_SMC_WRITEMODE
-                       | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_BAT_WRITE
-                       | AT91_SMC_DBW_16,
-       .tdf_cycles             = 2,
-};
-#else
-static struct sam9_smc_config __initdata cpu9krea_nor_smc_config = {
-       .ncs_read_setup         = 0,
-       .nrd_setup              = 1,
-       .ncs_write_setup        = 0,
-       .nwe_setup              = 1,
-
-       .ncs_read_pulse         = 13,
-       .nrd_pulse              = 13,
-       .ncs_write_pulse        = 8,
-       .nwe_pulse              = 8,
-
-       .read_cycle             = 15,
-       .write_cycle            = 10,
-
-       .mode                   = AT91_SMC_READMODE | AT91_SMC_WRITEMODE
-                       | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_BAT_WRITE
-                       | AT91_SMC_DBW_16,
-       .tdf_cycles             = 2,
-};
-#endif
-
-static __init void cpu9krea_add_device_nor(void)
-{
-       unsigned long csa;
-
-       csa = at91_matrix_read(AT91_MATRIX_EBICSA);
-       at91_matrix_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_VDDIOMSEL_3_3V);
-
-       /* configure chip-select 0 (NOR) */
-       sam9_smc_configure(0, 0, &cpu9krea_nor_smc_config);
-
-       platform_device_register(&cpu9krea_nor_flash);
-}
-
-/*
- * LEDs
- */
-static struct gpio_led cpu9krea_leds[] = {
-       {       /* LED1 */
-               .name                   = "LED1",
-               .gpio                   = AT91_PIN_PC11,
-               .active_low             = 1,
-               .default_trigger        = "timer",
-       },
-       {       /* LED2 */
-               .name                   = "LED2",
-               .gpio                   = AT91_PIN_PC12,
-               .active_low             = 1,
-               .default_trigger        = "heartbeat",
-       },
-       {       /* LED3 */
-               .name                   = "LED3",
-               .gpio                   = AT91_PIN_PC7,
-               .active_low             = 1,
-               .default_trigger        = "none",
-       },
-       {       /* LED4 */
-               .name                   = "LED4",
-               .gpio                   = AT91_PIN_PC9,
-               .active_low             = 1,
-               .default_trigger        = "none",
-       }
-};
-
-static struct i2c_board_info __initdata cpu9krea_i2c_devices[] = {
-       {
-               I2C_BOARD_INFO("ds1339", 0x68),
-       },
-};
-
-/*
- * GPIO Buttons
- */
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
-static struct gpio_keys_button cpu9krea_buttons[] = {
-       {
-               .gpio           = AT91_PIN_PC3,
-               .code           = BTN_0,
-               .desc           = "BP1",
-               .active_low     = 1,
-               .wakeup         = 1,
-       },
-       {
-               .gpio           = AT91_PIN_PB20,
-               .code           = BTN_1,
-               .desc           = "BP2",
-               .active_low     = 1,
-               .wakeup         = 1,
-       }
-};
-
-static struct gpio_keys_platform_data cpu9krea_button_data = {
-       .buttons        = cpu9krea_buttons,
-       .nbuttons       = ARRAY_SIZE(cpu9krea_buttons),
-};
-
-static struct platform_device cpu9krea_button_device = {
-       .name           = "gpio-keys",
-       .id             = -1,
-       .num_resources  = 0,
-       .dev            = {
-               .platform_data  = &cpu9krea_button_data,
-       }
-};
-
-static void __init cpu9krea_add_device_buttons(void)
-{
-       at91_set_gpio_input(AT91_PIN_PC3, 1);   /* BP1 */
-       at91_set_deglitch(AT91_PIN_PC3, 1);
-       at91_set_gpio_input(AT91_PIN_PB20, 1);  /* BP2 */
-       at91_set_deglitch(AT91_PIN_PB20, 1);
-
-       platform_device_register(&cpu9krea_button_device);
-}
-#else
-static void __init cpu9krea_add_device_buttons(void)
-{
-}
-#endif
-
-/*
- * MCI (SD/MMC)
- */
-static struct mci_platform_data __initdata cpu9krea_mci0_data = {
-       .slot[0] = {
-               .bus_width      = 4,
-               .detect_pin     = AT91_PIN_PA29,
-               .wp_pin         = -EINVAL,
-       },
-};
-
-static void __init cpu9krea_board_init(void)
-{
-       at91_register_devices();
-
-       /* NOR */
-       cpu9krea_add_device_nor();
-       /* Serial */
-       /* DGBU 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);
-
-       /* USART2 on ttyS3. (Rx, Tx, RTS, CTS) */
-       at91_register_uart(AT91SAM9260_ID_US2, 3, ATMEL_UART_CTS |
-               ATMEL_UART_RTS);
-
-       /* USART3 on ttyS4. (Rx, Tx) */
-       at91_register_uart(AT91SAM9260_ID_US3, 4, 0);
-
-       /* USART4 on ttyS5. (Rx, Tx) */
-       at91_register_uart(AT91SAM9260_ID_US4, 5, 0);
-
-       /* USART5 on ttyS6. (Rx, Tx) */
-       at91_register_uart(AT91SAM9260_ID_US5, 6, 0);
-       at91_add_device_serial();
-       /* USB Host */
-       at91_add_device_usbh(&cpu9krea_usbh_data);
-       /* USB Device */
-       at91_add_device_udc(&cpu9krea_udc_data);
-       /* NAND */
-       cpu9krea_add_device_nand();
-       /* Ethernet */
-       at91_add_device_eth(&cpu9krea_macb_data);
-       /* MMC */
-       at91_add_device_mci(0, &cpu9krea_mci0_data);
-       /* I2C */
-       at91_add_device_i2c(cpu9krea_i2c_devices,
-               ARRAY_SIZE(cpu9krea_i2c_devices));
-       /* LEDs */
-       at91_gpio_leds(cpu9krea_leds, ARRAY_SIZE(cpu9krea_leds));
-       /* Push Buttons */
-       cpu9krea_add_device_buttons();
-}
-
-#ifdef CONFIG_MACH_CPU9260
-MACHINE_START(CPUAT9260, "Eukrea CPU9260")
-#else
-MACHINE_START(CPUAT9G20, "Eukrea CPU9G20")
-#endif
-       /* Maintainer: Eric Benard - EUKREA Electromatique */
-       .init_time      = at91_init_time,
-       .map_io         = at91_map_io,
-       .handle_irq     = at91_aic_handle_irq,
-       .init_early     = cpu9krea_init_early,
-       .init_irq       = at91_init_irq_default,
-       .init_machine   = cpu9krea_board_init,
-MACHINE_END
diff --git a/arch/arm/mach-at91/board-flexibity.c b/arch/arm/mach-at91/board-flexibity.c
deleted file mode 100644 (file)
index a6aa4a2..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * linux/arch/arm/mach-at91/board-flexibity.c
- *
- *  Copyright (C) 2010-2011 Flexibity
- *  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 <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/spi/spi.h>
-#include <linux/input.h>
-#include <linux/gpio.h>
-
-#include <asm/mach-types.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
-
-#include <mach/hardware.h>
-
-#include "at91_aic.h"
-#include "board.h"
-#include "generic.h"
-#include "gpio.h"
-
-static void __init flexibity_init_early(void)
-{
-       /* Initialize processor: 18.432 MHz crystal */
-       at91_initialize(18432000);
-}
-
-/* USB Host port */
-static struct at91_usbh_data __initdata flexibity_usbh_data = {
-       .ports          = 2,
-       .vbus_pin       = {-EINVAL, -EINVAL},
-       .overcurrent_pin= {-EINVAL, -EINVAL},
-};
-
-/* USB Device port */
-static struct at91_udc_data __initdata flexibity_udc_data = {
-       .vbus_pin       = AT91_PIN_PC5,
-       .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
-};
-
-/* I2C devices */
-static struct i2c_board_info __initdata flexibity_i2c_devices[] = {
-       {
-               I2C_BOARD_INFO("ds1307", 0x68),
-       },
-};
-
-/* SPI devices */
-static struct spi_board_info flexibity_spi_devices[] = {
-       {       /* DataFlash chip */
-               .modalias       = "mtd_dataflash",
-               .chip_select    = 1,
-               .max_speed_hz   = 15 * 1000 * 1000,
-               .bus_num        = 0,
-       },
-};
-
-/* MCI (SD/MMC) */
-static struct mci_platform_data __initdata flexibity_mci0_data = {
-       .slot[0] = {
-               .bus_width      = 4,
-               .detect_pin     = AT91_PIN_PC9,
-               .wp_pin         = AT91_PIN_PC4,
-       },
-};
-
-/* LEDs */
-static struct gpio_led flexibity_leds[] = {
-       {
-               .name                   = "usb1:green",
-               .gpio                   = AT91_PIN_PA12,
-               .active_low             = 1,
-               .default_trigger        = "default-on",
-       },
-       {
-               .name                   = "usb1:red",
-               .gpio                   = AT91_PIN_PA13,
-               .active_low             = 1,
-               .default_trigger        = "default-on",
-       },
-       {
-               .name                   = "usb2:green",
-               .gpio                   = AT91_PIN_PB26,
-               .active_low             = 1,
-               .default_trigger        = "default-on",
-       },
-       {
-               .name                   = "usb2:red",
-               .gpio                   = AT91_PIN_PB27,
-               .active_low             = 1,
-               .default_trigger        = "default-on",
-       },
-       {
-               .name                   = "usb3:green",
-               .gpio                   = AT91_PIN_PC8,
-               .active_low             = 1,
-               .default_trigger        = "default-on",
-       },
-       {
-               .name                   = "usb3:red",
-               .gpio                   = AT91_PIN_PC6,
-               .active_low             = 1,
-               .default_trigger        = "default-on",
-       },
-       {
-               .name                   = "usb4:green",
-               .gpio                   = AT91_PIN_PB4,
-               .active_low             = 1,
-               .default_trigger        = "default-on",
-       },
-       {
-               .name                   = "usb4:red",
-               .gpio                   = AT91_PIN_PB5,
-               .active_low             = 1,
-               .default_trigger        = "default-on",
-       }
-};
-
-static void __init flexibity_board_init(void)
-{
-       at91_register_devices();
-
-       /* Serial */
-       /* DBGU on ttyS0. (Rx & Tx only) */
-       at91_register_uart(0, 0, 0);
-       at91_add_device_serial();
-       /* USB Host */
-       at91_add_device_usbh(&flexibity_usbh_data);
-       /* USB Device */
-       at91_add_device_udc(&flexibity_udc_data);
-       /* I2C */
-       at91_add_device_i2c(flexibity_i2c_devices,
-               ARRAY_SIZE(flexibity_i2c_devices));
-       /* SPI */
-       at91_add_device_spi(flexibity_spi_devices,
-               ARRAY_SIZE(flexibity_spi_devices));
-       /* MMC */
-       at91_add_device_mci(0, &flexibity_mci0_data);
-       /* LEDs */
-       at91_gpio_leds(flexibity_leds, ARRAY_SIZE(flexibity_leds));
-}
-
-MACHINE_START(FLEXIBITY, "Flexibity Connect")
-       /* Maintainer: Maxim Osipov */
-       .init_time      = at91_init_time,
-       .map_io         = at91_map_io,
-       .handle_irq     = at91_aic_handle_irq,
-       .init_early     = flexibity_init_early,
-       .init_irq       = at91_init_irq_default,
-       .init_machine   = flexibity_board_init,
-MACHINE_END
diff --git a/arch/arm/mach-at91/board-gsia18s.c b/arch/arm/mach-at91/board-gsia18s.c
deleted file mode 100644 (file)
index bf5cc55..0000000
+++ /dev/null
@@ -1,585 +0,0 @@
-/*
- *  Copyright (C) 2010 Christian Glindkamp <christian.glindkamp@taskit.de>
- *                     taskit GmbH
- *                2010 Igor Plyatov <plyatov@gmail.com>
- *                     GeoSIG Ltd
- *
- * 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 <linux/platform_device.h>
-#include <linux/gpio.h>
-#include <linux/w1-gpio.h>
-#include <linux/i2c.h>
-#include <linux/i2c/pcf857x.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#include <mach/at91sam9_smc.h>
-#include <mach/hardware.h>
-
-#include "at91_aic.h"
-#include "board.h"
-#include "sam9_smc.h"
-#include "generic.h"
-#include "gsia18s.h"
-#include "stamp9g20.h"
-#include "gpio.h"
-
-static void __init gsia18s_init_early(void)
-{
-       stamp9g20_init_early();
-}
-
-/*
- * Two USB Host ports
- */
-static struct at91_usbh_data __initdata usbh_data = {
-       .ports          = 2,
-       .vbus_pin       = {-EINVAL, -EINVAL},
-       .overcurrent_pin= {-EINVAL, -EINVAL},
-};
-
-/*
- * USB Device port
- */
-static struct at91_udc_data __initdata udc_data = {
-       .vbus_pin       = AT91_PIN_PA22,
-       .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
-};
-
-/*
- * MACB Ethernet device
- */
-static struct macb_platform_data __initdata macb_data = {
-       .phy_irq_pin    = AT91_PIN_PA28,
-       .is_rmii        = 1,
-};
-
-/*
- * LEDs and GPOs
- */
-static struct gpio_led gpio_leds[] = {
-       {
-               .name                   = "gpo:spi1reset",
-               .gpio                   = AT91_PIN_PC1,
-               .active_low             = 0,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_OFF,
-       },
-       {
-               .name                   = "gpo:trig_net_out",
-               .gpio                   = AT91_PIN_PB20,
-               .active_low             = 0,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_OFF,
-       },
-       {
-               .name                   = "gpo:trig_net_dir",
-               .gpio                   = AT91_PIN_PB19,
-               .active_low             = 0,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_OFF,
-       },
-       {
-               .name                   = "gpo:charge_dis",
-               .gpio                   = AT91_PIN_PC2,
-               .active_low             = 0,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_OFF,
-       },
-       {
-               .name                   = "led:event",
-               .gpio                   = AT91_PIN_PB17,
-               .active_low             = 1,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_OFF,
-       },
-       {
-               .name                   = "led:lan",
-               .gpio                   = AT91_PIN_PB18,
-               .active_low             = 1,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_OFF,
-       },
-       {
-               .name                   = "led:error",
-               .gpio                   = AT91_PIN_PB16,
-               .active_low             = 1,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_ON,
-       }
-};
-
-static struct gpio_led_platform_data gpio_led_info = {
-       .leds           = gpio_leds,
-       .num_leds       = ARRAY_SIZE(gpio_leds),
-};
-
-static struct platform_device leds = {
-       .name   = "leds-gpio",
-       .id     = 0,
-       .dev    = {
-               .platform_data  = &gpio_led_info,
-       }
-};
-
-static void __init gsia18s_leds_init(void)
-{
-       platform_device_register(&leds);
-}
-
-/* PCF8574 0x20 GPIO - U1 on the GS_IA18-CB_V3 board */
-static struct gpio_led pcf_gpio_leds1[] = {
-       { /* bit 0 */
-               .name                   = "gpo:hdc_power",
-               .gpio                   = PCF_GPIO_HDC_POWER,
-               .active_low             = 0,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_OFF,
-       },
-       { /* bit 1 */
-               .name                   = "gpo:wifi_setup",
-               .gpio                   = PCF_GPIO_WIFI_SETUP,
-               .active_low             = 1,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_OFF,
-       },
-       { /* bit 2 */
-               .name                   = "gpo:wifi_enable",
-               .gpio                   = PCF_GPIO_WIFI_ENABLE,
-               .active_low             = 1,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_OFF,
-       },
-       { /* bit 3      */
-               .name                   = "gpo:wifi_reset",
-               .gpio                   = PCF_GPIO_WIFI_RESET,
-               .active_low             = 1,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_ON,
-       },
-       /* bit 4 used as GPI    */
-       { /* bit 5 */
-               .name                   = "gpo:gps_setup",
-               .gpio                   = PCF_GPIO_GPS_SETUP,
-               .active_low             = 1,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_OFF,
-       },
-       { /* bit 6 */
-               .name                   = "gpo:gps_standby",
-               .gpio                   = PCF_GPIO_GPS_STANDBY,
-               .active_low             = 0,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_ON,
-       },
-       { /* bit 7 */
-               .name                   = "gpo:gps_power",
-               .gpio                   = PCF_GPIO_GPS_POWER,
-               .active_low             = 0,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_OFF,
-       }
-};
-
-static struct gpio_led_platform_data pcf_gpio_led_info1 = {
-       .leds           = pcf_gpio_leds1,
-       .num_leds       = ARRAY_SIZE(pcf_gpio_leds1),
-};
-
-static struct platform_device pcf_leds1 = {
-       .name   = "leds-gpio", /* GS_IA18-CB_board */
-       .id     = 1,
-       .dev    = {
-               .platform_data  = &pcf_gpio_led_info1,
-       }
-};
-
-/* PCF8574 0x22 GPIO - U1 on the GS_2G_OPT1-A_V0 board (Alarm) */
-static struct gpio_led pcf_gpio_leds2[] = {
-       { /* bit 0 */
-               .name                   = "gpo:alarm_1",
-               .gpio                   = PCF_GPIO_ALARM1,
-               .active_low             = 1,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_OFF,
-       },
-       { /* bit 1 */
-               .name                   = "gpo:alarm_2",
-               .gpio                   = PCF_GPIO_ALARM2,
-               .active_low             = 1,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_OFF,
-       },
-       { /* bit 2 */
-               .name                   = "gpo:alarm_3",
-               .gpio                   = PCF_GPIO_ALARM3,
-               .active_low             = 1,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_OFF,
-       },
-       { /* bit 3 */
-               .name                   = "gpo:alarm_4",
-               .gpio                   = PCF_GPIO_ALARM4,
-               .active_low             = 1,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_OFF,
-       },
-       /* bits 4, 5, 6 not used */
-       { /* bit 7 */
-               .name                   = "gpo:alarm_v_relay_on",
-               .gpio                   = PCF_GPIO_ALARM_V_RELAY_ON,
-               .active_low             = 0,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_OFF,
-       },
-};
-
-static struct gpio_led_platform_data pcf_gpio_led_info2 = {
-       .leds           = pcf_gpio_leds2,
-       .num_leds       = ARRAY_SIZE(pcf_gpio_leds2),
-};
-
-static struct platform_device pcf_leds2 = {
-       .name   = "leds-gpio",
-       .id     = 2,
-       .dev    = {
-               .platform_data  = &pcf_gpio_led_info2,
-       }
-};
-
-/* PCF8574 0x24 GPIO U1 on the GS_2G-OPT23-A_V0 board (Modem) */
-static struct gpio_led pcf_gpio_leds3[] = {
-       { /* bit 0 */
-               .name                   = "gpo:modem_power",
-               .gpio                   = PCF_GPIO_MODEM_POWER,
-               .active_low             = 1,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_OFF,
-       },
-               /* bits 1 and 2 not used */
-       { /* bit 3 */
-               .name                   = "gpo:modem_reset",
-               .gpio                   = PCF_GPIO_MODEM_RESET,
-               .active_low             = 1,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_ON,
-       },
-               /* bits 4, 5 and 6 not used */
-       { /* bit 7 */
-               .name                   = "gpo:trx_reset",
-               .gpio                   = PCF_GPIO_TRX_RESET,
-               .active_low             = 1,
-               .default_trigger        = "none",
-               .default_state          = LEDS_GPIO_DEFSTATE_ON,
-       }
-};
-
-static struct gpio_led_platform_data pcf_gpio_led_info3 = {
-       .leds           = pcf_gpio_leds3,
-       .num_leds       = ARRAY_SIZE(pcf_gpio_leds3),
-};
-
-static struct platform_device pcf_leds3 = {
-       .name   = "leds-gpio",
-       .id     = 3,
-       .dev    = {
-               .platform_data  = &pcf_gpio_led_info3,
-       }
-};
-
-static void __init gsia18s_pcf_leds_init(void)
-{
-       platform_device_register(&pcf_leds1);
-       platform_device_register(&pcf_leds2);
-       platform_device_register(&pcf_leds3);
-}
-
-/*
- * SPI busses.
- */
-static struct spi_board_info gsia18s_spi_devices[] = {
-       { /* User accessible spi0, cs0 used for communication with MSP RTC */
-               .modalias       = "spidev",
-               .bus_num        = 0,
-               .chip_select    = 0,
-               .max_speed_hz   = 580000,
-               .mode           = SPI_MODE_1,
-       },
-       { /* User accessible spi1, cs0 used for communication with int. DSP */
-               .modalias       = "spidev",
-               .bus_num        = 1,
-               .chip_select    = 0,
-               .max_speed_hz   = 5600000,
-               .mode           = SPI_MODE_0,
-       },
-       { /* User accessible spi1, cs1 used for communication with ext. DSP */
-               .modalias       = "spidev",
-               .bus_num        = 1,
-               .chip_select    = 1,
-               .max_speed_hz   = 5600000,
-               .mode           = SPI_MODE_0,
-       },
-       { /* User accessible spi1, cs2 used for communication with ext. DSP */
-               .modalias       = "spidev",
-               .bus_num        = 1,
-               .chip_select    = 2,
-               .max_speed_hz   = 5600000,
-               .mode           = SPI_MODE_0,
-       },
-       { /* User accessible spi1, cs3 used for communication with ext. DSP */
-               .modalias       = "spidev",
-               .bus_num        = 1,
-               .chip_select    = 3,
-               .max_speed_hz   = 5600000,
-               .mode           = SPI_MODE_0,
-       }
-};
-
-/*
- * GPI Buttons
- */
-static struct gpio_keys_button buttons[] = {
-       {
-               .gpio           = GPIO_TRIG_NET_IN,
-               .code           = BTN_1,
-               .desc           = "TRIG_NET_IN",
-               .type           = EV_KEY,
-               .active_low     = 0,
-               .wakeup         = 1,
-       },
-       { /* SW80 on the GS_IA18_S-MN board*/
-               .gpio           = GPIO_CARD_UNMOUNT_0,
-               .code           = BTN_2,
-               .desc           = "Card umount 0",
-               .type           = EV_KEY,
-               .active_low     = 1,
-               .wakeup         = 1,
-       },
-       { /* SW79 on the GS_IA18_S-MN board*/
-               .gpio           = GPIO_CARD_UNMOUNT_1,
-               .code           = BTN_3,
-               .desc           = "Card umount 1",
-               .type           = EV_KEY,
-               .active_low     = 1,
-               .wakeup         = 1,
-       },
-       { /* SW280 on the GS_IA18-CB board*/
-               .gpio           = GPIO_KEY_POWER,
-               .code           = KEY_POWER,
-               .desc           = "Power Off Button",
-               .type           = EV_KEY,
-               .active_low     = 0,
-               .wakeup         = 1,
-       }
-};
-
-static struct gpio_keys_platform_data button_data = {
-       .buttons        = buttons,
-       .nbuttons       = ARRAY_SIZE(buttons),
-};
-
-static struct platform_device button_device = {
-       .name           = "gpio-keys",
-       .id             = -1,
-       .num_resources  = 0,
-       .dev            = {
-               .platform_data  = &button_data,
-       }
-};
-
-static void __init gsia18s_add_device_buttons(void)
-{
-       at91_set_gpio_input(GPIO_TRIG_NET_IN, 1);
-       at91_set_deglitch(GPIO_TRIG_NET_IN, 1);
-       at91_set_gpio_input(GPIO_CARD_UNMOUNT_0, 1);
-       at91_set_deglitch(GPIO_CARD_UNMOUNT_0, 1);
-       at91_set_gpio_input(GPIO_CARD_UNMOUNT_1, 1);
-       at91_set_deglitch(GPIO_CARD_UNMOUNT_1, 1);
-       at91_set_gpio_input(GPIO_KEY_POWER, 0);
-       at91_set_deglitch(GPIO_KEY_POWER, 1);
-
-       platform_device_register(&button_device);
-}
-
-/*
- * I2C
- */
-static int pcf8574x_0x20_setup(struct i2c_client *client, int gpio,
-                               unsigned int ngpio, void *context)
-{
-       int status;
-
-       status = gpio_request(gpio + PCF_GPIO_ETH_DETECT, "eth_det");
-       if (status < 0) {
-               pr_err("error: can't request GPIO%d\n",
-                       gpio + PCF_GPIO_ETH_DETECT);
-               return status;
-       }
-       status = gpio_direction_input(gpio + PCF_GPIO_ETH_DETECT);
-       if (status < 0) {
-               pr_err("error: can't setup GPIO%d as input\n",
-                       gpio + PCF_GPIO_ETH_DETECT);
-               return status;
-       }
-       status = gpio_export(gpio + PCF_GPIO_ETH_DETECT, false);
-       if (status < 0) {
-               pr_err("error: can't export GPIO%d\n",
-                       gpio + PCF_GPIO_ETH_DETECT);
-               return status;
-       }
-       status = gpio_sysfs_set_active_low(gpio + PCF_GPIO_ETH_DETECT, 1);
-       if (status < 0) {
-               pr_err("error: gpio_sysfs_set active_low(GPIO%d, 1)\n",
-                       gpio + PCF_GPIO_ETH_DETECT);
-               return status;
-       }
-
-       return 0;
-}
-
-static int pcf8574x_0x20_teardown(struct i2c_client *client, int gpio,
-                                       unsigned ngpio, void *context)
-{
-       gpio_free(gpio + PCF_GPIO_ETH_DETECT);
-       return 0;
-}
-
-static struct pcf857x_platform_data pcf20_pdata = {
-       .gpio_base      = GS_IA18_S_PCF_GPIO_BASE0,
-       .n_latch        = (1 << 4),
-       .setup          = pcf8574x_0x20_setup,
-       .teardown       = pcf8574x_0x20_teardown,
-};
-
-static struct pcf857x_platform_data pcf22_pdata = {
-       .gpio_base      = GS_IA18_S_PCF_GPIO_BASE1,
-};
-
-static struct pcf857x_platform_data pcf24_pdata = {
-       .gpio_base      = GS_IA18_S_PCF_GPIO_BASE2,
-};
-
-static struct i2c_board_info __initdata gsia18s_i2c_devices[] = {
-       { /* U1 on the GS_IA18-CB_V3 board */
-               I2C_BOARD_INFO("pcf8574", 0x20),
-               .platform_data = &pcf20_pdata,
-       },
-       { /* U1 on the GS_2G_OPT1-A_V0 board (Alarm) */
-               I2C_BOARD_INFO("pcf8574", 0x22),
-               .platform_data = &pcf22_pdata,
-       },
-       { /* U1 on the GS_2G-OPT23-A_V0 board (Modem) */
-               I2C_BOARD_INFO("pcf8574", 0x24),
-               .platform_data = &pcf24_pdata,
-       },
-       { /* U161 on the GS_IA18_S-MN board */
-               I2C_BOARD_INFO("24c1024", 0x50),
-       },
-       { /* U162 on the GS_IA18_S-MN board */
-               I2C_BOARD_INFO("24c01", 0x53),
-       },
-};
-
-/*
- * Compact Flash
- */
-static struct at91_cf_data __initdata gsia18s_cf1_data = {
-       .irq_pin        = AT91_PIN_PA27,
-       .det_pin        = AT91_PIN_PB30,
-       .vcc_pin        = -EINVAL,
-       .rst_pin        = AT91_PIN_PB31,
-       .chipselect     = 5,
-       .flags          = AT91_CF_TRUE_IDE,
-};
-
-/* Power Off by RTC */
-static void gsia18s_power_off(void)
-{
-       pr_notice("Power supply will be switched off automatically now or after 60 seconds without ArmDAS.\n");
-       at91_set_gpio_output(AT91_PIN_PA25, 1);
-       /* Spin to death... */
-       while (1)
-               ;
-}
-
-static int __init gsia18s_power_off_init(void)
-{
-       pm_power_off = gsia18s_power_off;
-       return 0;
-}
-
-/* ---------------------------------------------------------------------------*/
-
-static void __init gsia18s_board_init(void)
-{
-       /*
-        * USART0 on ttyS1 (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI).
-        * Used for Internal Analog Modem.
-        */
-       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, CTS, RTS).
-        * Used for GPS or WiFi or Data stream.
-        */
-       at91_register_uart(AT91SAM9260_ID_US1, 2,
-                               ATMEL_UART_CTS | ATMEL_UART_RTS);
-       /*
-        * USART2 on ttyS3 (Rx, Tx, CTS, RTS).
-        * Used for External Modem.
-        */
-       at91_register_uart(AT91SAM9260_ID_US2, 3,
-                               ATMEL_UART_CTS | ATMEL_UART_RTS);
-       /*
-        * USART3 on ttyS4 (Rx, Tx, RTS).
-        * Used for RS-485.
-        */
-       at91_register_uart(AT91SAM9260_ID_US3, 4, ATMEL_UART_RTS);
-
-       /*
-        * USART4 on ttyS5 (Rx, Tx).
-        * Used for TRX433 Radio Module.
-        */
-       at91_register_uart(AT91SAM9260_ID_US4, 5, 0);
-       stamp9g20_board_init();
-       at91_add_device_usbh(&usbh_data);
-       at91_add_device_udc(&udc_data);
-       at91_add_device_eth(&macb_data);
-       gsia18s_leds_init();
-       gsia18s_pcf_leds_init();
-       gsia18s_add_device_buttons();
-       at91_add_device_i2c(gsia18s_i2c_devices,
-                               ARRAY_SIZE(gsia18s_i2c_devices));
-       at91_add_device_cf(&gsia18s_cf1_data);
-       at91_add_device_spi(gsia18s_spi_devices,
-                               ARRAY_SIZE(gsia18s_spi_devices));
-       gsia18s_power_off_init();
-}
-
-MACHINE_START(GSIA18S, "GS_IA18_S")
-       .init_time      = at91_init_time,
-       .map_io         = at91_map_io,
-       .handle_irq     = at91_aic_handle_irq,
-       .init_early     = gsia18s_init_early,
-       .init_irq       = at91_init_irq_default,
-       .init_machine   = gsia18s_board_init,
-MACHINE_END
diff --git a/arch/arm/mach-at91/board-pcontrol-g20.c b/arch/arm/mach-at91/board-pcontrol-g20.c
deleted file mode 100644 (file)
index 9c26b94..0000000
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- *  Copyright (C) 2010 Christian Glindkamp <christian.glindkamp@taskit.de>
- *                     taskit GmbH
- *
- * 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
- */
-/*
- * copied and adjusted from board-stamp9g20.c
- * by Peter Gsellmann <pgsellmann@portner-elektronik.at>
- */
-
-#include <linux/mm.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-#include <linux/w1-gpio.h>
-
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#include <mach/at91sam9_smc.h>
-#include <mach/hardware.h>
-
-#include "at91_aic.h"
-#include "board.h"
-#include "sam9_smc.h"
-#include "generic.h"
-#include "stamp9g20.h"
-#include "gpio.h"
-
-
-static void __init pcontrol_g20_init_early(void)
-{
-       stamp9g20_init_early();
-}
-
-static struct sam9_smc_config __initdata pcontrol_smc_config[2] = { {
-       .ncs_read_setup         = 16,
-       .nrd_setup              = 18,
-       .ncs_write_setup        = 16,
-       .nwe_setup              = 18,
-
-       .ncs_read_pulse         = 63,
-       .nrd_pulse              = 55,
-       .ncs_write_pulse        = 63,
-       .nwe_pulse              = 55,
-
-       .read_cycle             = 127,
-       .write_cycle            = 127,
-
-       .mode                   = AT91_SMC_READMODE | AT91_SMC_WRITEMODE
-                       | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_BAT_SELECT
-                       | AT91_SMC_DBW_8 | AT91_SMC_PS_4
-                       | AT91_SMC_TDFMODE,
-       .tdf_cycles             = 3,
-}, {
-       .ncs_read_setup         = 0,
-       .nrd_setup              = 0,
-       .ncs_write_setup        = 0,
-       .nwe_setup              = 1,
-
-       .ncs_read_pulse         = 8,
-       .nrd_pulse              = 8,
-       .ncs_write_pulse        = 5,
-       .nwe_pulse              = 4,
-
-       .read_cycle             = 8,
-       .write_cycle            = 7,
-
-       .mode                   = AT91_SMC_READMODE | AT91_SMC_WRITEMODE
-                       | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_BAT_SELECT
-                       | AT91_SMC_DBW_16 | AT91_SMC_PS_8
-                       | AT91_SMC_TDFMODE,
-       .tdf_cycles             = 1,
-} };
-
-static void __init add_device_pcontrol(void)
-{
-       /* configure chip-select 4 (IO compatible to 8051  X4 ) */
-       sam9_smc_configure(0, 4, &pcontrol_smc_config[0]);
-       /* configure chip-select 7 (FerroRAM 256KiBx16bit MR2A16A  D4 ) */
-       sam9_smc_configure(0, 7, &pcontrol_smc_config[1]);
-}
-
-
-/*
- * USB Host port
- */
-static struct at91_usbh_data __initdata usbh_data = {
-       .ports          = 2,
-       .vbus_pin       = {-EINVAL, -EINVAL},
-       .overcurrent_pin= {-EINVAL, -EINVAL},
-};
-
-
-/*
- * USB Device port
- */
-static struct at91_udc_data __initdata pcontrol_g20_udc_data = {
-       .vbus_pin       = AT91_PIN_PA22,        /* Detect +5V bus voltage */
-       .pullup_pin     = AT91_PIN_PA4,         /* K-state, active low */
-};
-
-
-/*
- * MACB Ethernet device
- */
-static struct macb_platform_data __initdata macb_data = {
-       .phy_irq_pin    = AT91_PIN_PA28,
-       .is_rmii        = 1,
-};
-
-
-/*
- * I2C devices: eeprom and phy/switch
- */
-static struct i2c_board_info __initdata pcontrol_g20_i2c_devices[] = {
-{              /* D7  address width=2, 8KiB */
-       I2C_BOARD_INFO("24c64", 0x50)
-}, {           /* D8  address width=1, 1 byte has 32 bits! */
-       I2C_BOARD_INFO("lan9303", 0x0a)
-}, };
-
-
-/*
- * LEDs
- */
-static struct gpio_led pcontrol_g20_leds[] = {
-       {
-               .name                   = "LED1",       /* red  H5 */
-               .gpio                   = AT91_PIN_PB18,
-               .active_low             = 1,
-               .default_trigger        = "none",       /* supervisor */
-       }, {
-               .name                   = "LED2",       /* yellow  H7 */
-               .gpio                   = AT91_PIN_PB19,
-               .active_low             = 1,
-               .default_trigger        = "mmc0",       /* SD-card activity */
-       }, {
-               .name                   = "LED3",       /* green  H2 */
-               .gpio                   = AT91_PIN_PB20,
-               .active_low             = 1,
-               .default_trigger        = "heartbeat",  /* blinky */
-       }, {
-               .name                   = "LED4",       /* red  H3 */
-               .gpio                   = AT91_PIN_PC6,
-               .active_low             = 1,
-               .default_trigger        = "none",       /* connection lost */
-       }, {
-               .name                   = "LED5",       /* yellow  H6 */
-               .gpio                   = AT91_PIN_PC7,
-               .active_low             = 1,
-               .default_trigger        = "none",       /* unsent data */
-       }, {
-               .name                   = "LED6",       /* green  H1 */
-               .gpio                   = AT91_PIN_PC9,
-               .active_low             = 1,
-               .default_trigger        = "none",       /* snafu */
-       }
-};
-
-
-/*
- * SPI devices
- */
-static struct spi_board_info pcontrol_g20_spi_devices[] = {
-       {
-               .modalias       = "spidev",     /* HMI port  X4 */
-               .chip_select    = 1,
-               .max_speed_hz   = 50 * 1000 * 1000,
-               .bus_num        = 0,
-       }, {
-               .modalias       = "spidev",     /* piggyback  A2 */
-               .chip_select    = 0,
-               .max_speed_hz   = 50 * 1000 * 1000,
-               .bus_num        = 1,
-       },
-};
-
-
-static void __init pcontrol_g20_board_init(void)
-{
-       /* USART0 on ttyS1. (Rx, Tx, CTS, RTS) piggyback  A2 */
-       at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS
-                                               | ATMEL_UART_RTS);
-
-       /* USART1 on ttyS2. (Rx, Tx, CTS, RTS) isolated RS485  X5 */
-       at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS
-                                               | ATMEL_UART_RTS);
-
-       /* USART2 on ttyS3. (Rx, Tx)  9bit-Bus  Multidrop-mode  X4 */
-       at91_register_uart(AT91SAM9260_ID_US4, 3, 0);
-       stamp9g20_board_init();
-       at91_add_device_usbh(&usbh_data);
-       at91_add_device_eth(&macb_data);
-       at91_add_device_i2c(pcontrol_g20_i2c_devices,
-               ARRAY_SIZE(pcontrol_g20_i2c_devices));
-       add_device_pcontrol();
-       at91_add_device_spi(pcontrol_g20_spi_devices,
-               ARRAY_SIZE(pcontrol_g20_spi_devices));
-       at91_add_device_udc(&pcontrol_g20_udc_data);
-       at91_gpio_leds(pcontrol_g20_leds,
-               ARRAY_SIZE(pcontrol_g20_leds));
-       /* piggyback  A2 */
-       at91_set_gpio_output(AT91_PIN_PB31, 1);
-}
-
-
-MACHINE_START(PCONTROL_G20, "PControl G20")
-       /* Maintainer: pgsellmann@portner-elektronik.at */
-       .init_time      = at91_init_time,
-       .map_io         = at91_map_io,
-       .handle_irq     = at91_aic_handle_irq,
-       .init_early     = pcontrol_g20_init_early,
-       .init_irq       = at91_init_irq_default,
-       .init_machine   = pcontrol_g20_board_init,
-MACHINE_END
diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c
deleted file mode 100644 (file)
index c2166e3..0000000
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * linux/arch/arm/mach-at91/board-sam9-l9260.c
- *
- *  Copyright (C) 2005 SAN People
- *  Copyright (C) 2006 Atmel
- *  Copyright (C) 2007 Olimex Ltd
- *
- * 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 <linux/types.h>
-#include <linux/gpio.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/spi/spi.h>
-
-#include <mach/hardware.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/irq.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
-
-#include <mach/at91sam9_smc.h>
-
-#include "at91_aic.h"
-#include "board.h"
-#include "sam9_smc.h"
-#include "generic.h"
-#include "gpio.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_PC5,
-       .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
-};
-
-
-/*
- * SPI devices.
- */
-static struct spi_board_info ek_spi_devices[] = {
-#if !IS_ENABLED(CONFIG_MMC_ATMELMCI)
-       {       /* DataFlash chip */
-               .modalias       = "mtd_dataflash",
-               .chip_select    = 1,
-               .max_speed_hz   = 15 * 1000 * 1000,
-               .bus_num        = 0,
-       },
-#if defined(CONFIG_MTD_AT91_DATAFLASH_CARD)
-       {       /* DataFlash card */
-               .modalias       = "mtd_dataflash",
-               .chip_select    = 0,
-               .max_speed_hz   = 15 * 1000 * 1000,
-               .bus_num        = 0,
-       },
-#endif
-#endif
-};
-
-
-/*
- * 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   = "Bootloader Area",
-               .offset = 0,
-               .size   = 10 * SZ_1M,
-       },
-       {
-               .name   = "User Area",
-               .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,
-       .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 | AT91_SMC_DBW_8,
-       .tdf_cycles             = 2,
-};
-
-static void __init ek_add_device_nand(void)
-{
-       /* 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 mci_platform_data __initdata ek_mci0_data = {
-       .slot[1] = {
-               .bus_width      = 4,
-               .detect_pin     = AT91_PIN_PC8,
-               .wp_pin         = AT91_PIN_PC4,
-       },
-};
-
-/*
- * LEDs
- */
-static struct gpio_led ek_leds[] = {
-       {       /* D1 */
-               .name                   = "led1",
-               .gpio                   = AT91_PIN_PA9,
-               .active_low             = 1,
-               .default_trigger        = "heartbeat",
-       },
-       {       /* D2 */
-               .name                   = "led2",
-               .gpio                   = AT91_PIN_PA6,
-               .active_low             = 1,
-               .default_trigger        = "timer",
-       }
-};
-
-static void __init ek_board_init(void)
-{
-       at91_register_devices();
-
-       /* 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, CTS, RTS) */
-       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_mci(0, &ek_mci0_data);
-       /* I2C */
-       at91_add_device_i2c(NULL, 0);
-       /* LEDs */
-       at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
-}
-
-MACHINE_START(SAM9_L9260, "Olimex SAM9-L9260")
-       /* Maintainer: Olimex */
-       .init_time      = at91_init_time,
-       .map_io         = at91_map_io,
-       .handle_irq     = at91_aic_handle_irq,
-       .init_early     = ek_init_early,
-       .init_irq       = at91_init_irq_default,
-       .init_machine   = ek_board_init,
-MACHINE_END
diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c
deleted file mode 100644 (file)
index bf8a946..0000000
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * 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 <linux/types.h>
-#include <linux/gpio.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/at73c213.h>
-#include <linux/clk.h>
-#include <linux/platform_data/at24.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/irq.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
-
-#include <mach/hardware.h>
-#include <mach/at91sam9_smc.h>
-#include <mach/system_rev.h>
-
-#include "at91_aic.h"
-#include "board.h"
-#include "sam9_smc.h"
-#include "generic.h"
-#include "gpio.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_PC5,
-       .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
-};
-
-
-/*
- * Audio
- */
-static struct at73c213_board_info at73c213_data = {
-       .ssc_id         = 0,
-       .shortname      = "AT91SAM9260-EK external DAC",
-};
-
-#if defined(CONFIG_SND_AT73C213) || defined(CONFIG_SND_AT73C213_MODULE)
-static void __init at73c213_set_clk(struct at73c213_board_info *info)
-{
-       struct clk *pck0;
-       struct clk *plla;
-
-       pck0 = clk_get(NULL, "pck0");
-       plla = clk_get(NULL, "plla");
-
-       /* AT73C213 MCK Clock */
-       at91_set_B_periph(AT91_PIN_PC1, 0);     /* PCK0 */
-
-       clk_set_parent(pck0, plla);
-       clk_put(plla);
-
-       info->dac_clk = pck0;
-}
-#else
-static void __init at73c213_set_clk(struct at73c213_board_info *info) {}
-#endif
-
-/*
- * SPI devices.
- */
-static struct spi_board_info ek_spi_devices[] = {
-#if !IS_ENABLED(CONFIG_MMC_ATMELMCI)
-       {       /* DataFlash chip */
-               .modalias       = "mtd_dataflash",
-               .chip_select    = 1,
-               .max_speed_hz   = 15 * 1000 * 1000,
-               .bus_num        = 0,
-       },
-#if defined(CONFIG_MTD_AT91_DATAFLASH_CARD)
-       {       /* DataFlash card */
-               .modalias       = "mtd_dataflash",
-               .chip_select    = 0,
-               .max_speed_hz   = 15 * 1000 * 1000,
-               .bus_num        = 0,
-       },
-#endif
-#endif
-#if defined(CONFIG_SND_AT73C213) || defined(CONFIG_SND_AT73C213_MODULE)
-       {       /* AT73C213 DAC */
-               .modalias       = "at73c213",
-               .chip_select    = 0,
-               .max_speed_hz   = 10 * 1000 * 1000,
-               .bus_num        = 1,
-               .mode           = SPI_MODE_1,
-               .platform_data  = &at73c213_data,
-       },
-#endif
-};
-
-
-/*
- * MACB Ethernet device
- */
-static struct macb_platform_data __initdata ek_macb_data = {
-       .phy_irq_pin    = AT91_PIN_PA7,
-       .is_rmii        = 1,
-};
-
-
-/*
- * NAND flash
- */
-static struct mtd_partition __initdata ek_nand_partition[] = {
-       {
-               .name   = "Partition 1",
-               .offset = 0,
-               .size   = SZ_256K,
-       },
-       {
-               .name   = "Partition 2",
-               .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   = 1,
-       .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 mci_platform_data __initdata ek_mci0_data = {
-       .slot[1] = {
-               .bus_width      = 4,
-               .detect_pin     = -EINVAL,
-               .wp_pin         = -EINVAL,
-       },
-};
-
-
-/*
- * LEDs
- */
-static struct gpio_led ek_leds[] = {
-       {       /* "bottom" led, green, userled1 to be defined */
-               .name                   = "ds5",
-               .gpio                   = AT91_PIN_PA6,
-               .active_low             = 1,
-               .default_trigger        = "none",
-       },
-       {       /* "power" led, yellow */
-               .name                   = "ds1",
-               .gpio                   = AT91_PIN_PA9,
-               .default_trigger        = "heartbeat",
-       }
-};
-
-/*
- * I2C devices
- */
-static struct at24_platform_data at24c512 = {
-       .byte_len       = SZ_512K / 8,
-       .page_size      = 128,
-       .flags          = AT24_FLAG_ADDR16,
-};
-
-static struct i2c_board_info __initdata ek_i2c_devices[] = {
-       {
-               I2C_BOARD_INFO("24c512", 0x50),
-               .platform_data = &at24c512,
-       },
-       /* more devices can be added using expansion connectors */
-};
-
-
-/*
- * GPIO Buttons
- */
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
-static struct gpio_keys_button ek_buttons[] = {
-       {
-               .gpio           = AT91_PIN_PA30,
-               .code           = BTN_3,
-               .desc           = "Button 3",
-               .active_low     = 1,
-               .wakeup         = 1,
-       },
-       {
-               .gpio           = AT91_PIN_PA31,
-               .code           = BTN_4,
-               .desc           = "Button 4",
-               .active_low     = 1,
-               .wakeup         = 1,
-       }
-};
-
-static struct gpio_keys_platform_data ek_button_data = {
-       .buttons        = ek_buttons,
-       .nbuttons       = ARRAY_SIZE(ek_buttons),
-};
-
-static struct platform_device ek_button_device = {
-       .name           = "gpio-keys",
-       .id             = -1,
-       .num_resources  = 0,
-       .dev            = {
-               .platform_data  = &ek_button_data,
-       }
-};
-
-static void __init ek_add_device_buttons(void)
-{
-       at91_set_gpio_input(AT91_PIN_PA30, 1);  /* btn3 */
-       at91_set_deglitch(AT91_PIN_PA30, 1);
-       at91_set_gpio_input(AT91_PIN_PA31, 1);  /* btn4 */
-       at91_set_deglitch(AT91_PIN_PA31, 1);
-
-       platform_device_register(&ek_button_device);
-}
-#else
-static void __init ek_add_device_buttons(void) {}
-#endif
-
-
-static void __init ek_board_init(void)
-{
-       at91_register_devices();
-
-       /* 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_mci(0, &ek_mci0_data);
-       /* I2C */
-       at91_add_device_i2c(ek_i2c_devices, ARRAY_SIZE(ek_i2c_devices));
-       /* SSC (to AT73C213) */
-       at73c213_set_clk(&at73c213_data);
-       at91_add_device_ssc(AT91SAM9260_ID_SSC, ATMEL_SSC_TX);
-       /* LEDs */
-       at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
-       /* Push Buttons */
-       ek_add_device_buttons();
-}
-
-MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK")
-       /* Maintainer: Atmel */
-       .init_time      = at91_init_time,
-       .map_io         = at91_map_io,
-       .handle_irq     = at91_aic_handle_irq,
-       .init_early     = ek_init_early,
-       .init_irq       = at91_init_irq_default,
-       .init_machine   = ek_board_init,
-MACHINE_END
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c
deleted file mode 100644 (file)
index 49f0752..0000000
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- *  Copyright (C) 2005 SAN People
- *  Copyright (C) 2008 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 <linux/types.h>
-#include <linux/gpio.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/at73c213.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-#include <linux/clk.h>
-#include <linux/regulator/machine.h>
-#include <linux/regulator/fixed.h>
-#include <linux/regulator/consumer.h>
-
-#include <linux/platform_data/at91_adc.h>
-
-#include <mach/hardware.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/irq.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
-
-#include <mach/at91sam9_smc.h>
-#include <mach/system_rev.h>
-
-#include "at91_aic.h"
-#include "board.h"
-#include "sam9_smc.h"
-#include "generic.h"
-#include "gpio.h"
-
-/*
- * board revision encoding
- * bit 0:
- *     0 => 1 sd/mmc slot
- *     1 => 2 sd/mmc slots connectors (board from revision C)
- */
-#define HAVE_2MMC      (1 << 0)
-static int inline ek_have_2mmc(void)
-{
-       return machine_is_at91sam9g20ek_2mmc() || (system_rev & HAVE_2MMC);
-}
-
-
-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_PC5,
-       .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
-};
-
-
-/*
- * SPI devices.
- */
-static struct spi_board_info ek_spi_devices[] = {
-#if !IS_ENABLED(CONFIG_MMC_ATMELMCI)
-       {       /* DataFlash chip */
-               .modalias       = "mtd_dataflash",
-               .chip_select    = 1,
-               .max_speed_hz   = 15 * 1000 * 1000,
-               .bus_num        = 0,
-       },
-#if defined(CONFIG_MTD_AT91_DATAFLASH_CARD)
-       {       /* DataFlash card */
-               .modalias       = "mtd_dataflash",
-               .chip_select    = 0,
-               .max_speed_hz   = 15 * 1000 * 1000,
-               .bus_num        = 0,
-       },
-#endif
-#endif
-};
-
-
-/*
- * MACB Ethernet device
- */
-static struct macb_platform_data __initdata ek_macb_data = {
-       .phy_irq_pin    = AT91_PIN_PA7,
-       .is_rmii        = 1,
-};
-
-static void __init ek_add_device_macb(void)
-{
-       if (ek_have_2mmc())
-               ek_macb_data.phy_irq_pin = AT91_PIN_PB0;
-
-       at91_add_device_eth(&ek_macb_data);
-}
-
-/*
- * NAND flash
- */
-static struct mtd_partition __initdata ek_nand_partition[] = {
-       {
-               .name   = "Bootstrap",
-               .offset = 0,
-               .size   = 4 * SZ_1M,
-       },
-       {
-               .name   = "Partition 1",
-               .offset = MTDPART_OFS_NXTBLK,
-               .size   = 60 * SZ_1M,
-       },
-       {
-               .name   = "Partition 2",
-               .offset = MTDPART_OFS_NXTBLK,
-               .size   = MTDPART_SIZ_FULL,
-       },
-};
-
-/* det_pin is not connected */
-static struct atmel_nand_data __initdata ek_nand_data = {
-       .ale            = 21,
-       .cle            = 22,
-       .rdy_pin        = AT91_PIN_PC13,
-       .enable_pin     = AT91_PIN_PC14,
-       .det_pin        = -EINVAL,
-       .ecc_mode       = NAND_ECC_SOFT,
-       .on_flash_bbt   = 1,
-       .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              = 2,
-       .ncs_write_setup        = 0,
-       .nwe_setup              = 2,
-
-       .ncs_read_pulse         = 4,
-       .nrd_pulse              = 4,
-       .ncs_write_pulse        = 4,
-       .nwe_pulse              = 4,
-
-       .read_cycle             = 7,
-       .write_cycle            = 7,
-
-       .mode                   = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE,
-       .tdf_cycles             = 3,
-};
-
-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)
- * wp_pin and vcc_pin are not connected
- */
-static struct mci_platform_data __initdata ek_mmc_data = {
-       .slot[1] = {
-               .bus_width      = 4,
-               .detect_pin     = AT91_PIN_PC9,
-               .wp_pin         = -EINVAL,
-       },
-
-};
-
-static void __init ek_add_device_mmc(void)
-{
-       if (ek_have_2mmc()) {
-               ek_mmc_data.slot[0].bus_width = 4;
-               ek_mmc_data.slot[0].detect_pin = AT91_PIN_PC2;
-               ek_mmc_data.slot[0].wp_pin = -1;
-       }
-       at91_add_device_mci(0, &ek_mmc_data);
-}
-
-/*
- * LEDs
- */
-static struct gpio_led ek_leds[] = {
-       {       /* "bottom" led, green, userled1 to be defined */
-               .name                   = "ds5",
-               .gpio                   = AT91_PIN_PA6,
-               .active_low             = 1,
-               .default_trigger        = "none",
-       },
-       {       /* "power" led, yellow */
-               .name                   = "ds1",
-               .gpio                   = AT91_PIN_PA9,
-               .default_trigger        = "heartbeat",
-       }
-};
-
-static void __init ek_add_device_gpio_leds(void)
-{
-       if (ek_have_2mmc()) {
-               ek_leds[0].gpio = AT91_PIN_PB8;
-               ek_leds[1].gpio = AT91_PIN_PB9;
-       }
-
-       at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
-}
-
-/*
- * GPIO Buttons
- */
-#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
-static struct gpio_keys_button ek_buttons[] = {
-       {
-               .gpio           = AT91_PIN_PA30,
-               .code           = BTN_3,
-               .desc           = "Button 3",
-               .active_low     = 1,
-               .wakeup         = 1,
-       },
-       {
-               .gpio           = AT91_PIN_PA31,
-               .code           = BTN_4,
-               .desc           = "Button 4",
-               .active_low     = 1,
-               .wakeup         = 1,
-       }
-};
-
-static struct gpio_keys_platform_data ek_button_data = {
-       .buttons        = ek_buttons,
-       .nbuttons       = ARRAY_SIZE(ek_buttons),
-};
-
-static struct platform_device ek_button_device = {
-       .name           = "gpio-keys",
-       .id             = -1,
-       .num_resources  = 0,
-       .dev            = {
-               .platform_data  = &ek_button_data,
-       }
-};
-
-static void __init ek_add_device_buttons(void)
-{
-       at91_set_gpio_input(AT91_PIN_PA30, 1);  /* btn3 */
-       at91_set_deglitch(AT91_PIN_PA30, 1);
-       at91_set_gpio_input(AT91_PIN_PA31, 1);  /* btn4 */
-       at91_set_deglitch(AT91_PIN_PA31, 1);
-
-       platform_device_register(&ek_button_device);
-}
-#else
-static void __init ek_add_device_buttons(void) {}
-#endif
-
-/*
- * ADCs
- */
-
-static struct at91_adc_data ek_adc_data = {
-       .channels_used = BIT(0) | BIT(1) | BIT(2) | BIT(3),
-       .use_external_triggers = true,
-       .vref = 3300,
-};
-
-#if defined(CONFIG_REGULATOR_FIXED_VOLTAGE) || defined(CONFIG_REGULATOR_FIXED_VOLTAGE_MODULE)
-static struct regulator_consumer_supply ek_audio_consumer_supplies[] = {
-       REGULATOR_SUPPLY("AVDD", "0-001b"),
-       REGULATOR_SUPPLY("HPVDD", "0-001b"),
-       REGULATOR_SUPPLY("DBVDD", "0-001b"),
-       REGULATOR_SUPPLY("DCVDD", "0-001b"),
-};
-
-static struct regulator_init_data ek_avdd_reg_init_data = {
-       .constraints    = {
-               .name   = "3V3",
-               .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-       },
-       .consumer_supplies = ek_audio_consumer_supplies,
-       .num_consumer_supplies = ARRAY_SIZE(ek_audio_consumer_supplies),
-};
-
-static struct fixed_voltage_config ek_vdd_pdata = {
-       .supply_name    = "board-3V3",
-       .microvolts     = 3300000,
-       .gpio           = -EINVAL,
-       .enabled_at_boot = 0,
-       .init_data      = &ek_avdd_reg_init_data,
-};
-static struct platform_device ek_voltage_regulator = {
-       .name           = "reg-fixed-voltage",
-       .id             = -1,
-       .num_resources  = 0,
-       .dev            = {
-               .platform_data  = &ek_vdd_pdata,
-       },
-};
-static void __init ek_add_regulators(void)
-{
-       platform_device_register(&ek_voltage_regulator);
-}
-#else
-static void __init ek_add_regulators(void) {}
-#endif
-
-
-static struct i2c_board_info __initdata ek_i2c_devices[] = {
-        {
-                I2C_BOARD_INFO("24c512", 0x50)
-        },
-        {
-                I2C_BOARD_INFO("wm8731", 0x1b)
-        },
-};
-
-static struct platform_device sam9g20ek_audio_device = {
-       .name   = "at91sam9g20ek-audio",
-       .id     = -1,
-};
-
-static void __init ek_add_device_audio(void)
-{
-       platform_device_register(&sam9g20ek_audio_device);
-}
-
-
-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 */
-       ek_add_device_macb();
-       /* Regulators */
-       ek_add_regulators();
-       /* MMC */
-       ek_add_device_mmc();
-       /* I2C */
-       at91_add_device_i2c(ek_i2c_devices, ARRAY_SIZE(ek_i2c_devices));
-       /* LEDs */
-       ek_add_device_gpio_leds();
-       /* Push Buttons */
-       ek_add_device_buttons();
-       /* ADCs */
-       at91_add_device_adc(&ek_adc_data);
-       /* PCK0 provides MCLK to the WM8731 */
-       at91_set_B_periph(AT91_PIN_PC1, 0);
-       /* SSC (for WM8731) */
-       at91_add_device_ssc(AT91SAM9260_ID_SSC, ATMEL_SSC_TX);
-       ek_add_device_audio();
-}
-
-MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK")
-       /* Maintainer: Atmel */
-       .init_time      = at91_init_time,
-       .map_io         = at91_map_io,
-       .handle_irq     = at91_aic_handle_irq,
-       .init_early     = ek_init_early,
-       .init_irq       = at91_init_irq_default,
-       .init_machine   = ek_board_init,
-MACHINE_END
-
-MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod")
-       /* Maintainer: Atmel */
-       .init_time      = at91_init_time,
-       .map_io         = at91_map_io,
-       .handle_irq     = at91_aic_handle_irq,
-       .init_early     = ek_init_early,
-       .init_irq       = at91_init_irq_default,
-       .init_machine   = ek_board_init,
-MACHINE_END
diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c
deleted file mode 100644 (file)
index b4aff84..0000000
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * linux/arch/arm/mach-at91/board-snapper9260.c
- *
- *  Copyright (C) 2010 Bluewater System Ltd
- *
- * Author: Andre Renaud <andre@bluewatersys.com>
- * Author: Ryan Mallon
- *
- * 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 <linux/init.h>
-#include <linux/gpio.h>
-#include <linux/platform_device.h>
-#include <linux/spi/spi.h>
-#include <linux/platform_data/pca953x.h>
-
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#include <mach/hardware.h>
-#include <mach/at91sam9_smc.h>
-
-#include "at91_aic.h"
-#include "board.h"
-#include "sam9_smc.h"
-#include "generic.h"
-#include "gpio.h"
-
-#define SNAPPER9260_IO_EXP_GPIO(x)     (NR_BUILTIN_GPIO + (x))
-
-static void __init snapper9260_init_early(void)
-{
-       at91_initialize(18432000);
-}
-
-static struct at91_usbh_data __initdata snapper9260_usbh_data = {
-       .ports          = 2,
-       .vbus_pin       = {-EINVAL, -EINVAL},
-       .overcurrent_pin= {-EINVAL, -EINVAL},
-};
-
-static struct at91_udc_data __initdata snapper9260_udc_data = {
-       .vbus_pin               = SNAPPER9260_IO_EXP_GPIO(5),
-       .vbus_active_low        = 1,
-       .vbus_polled            = 1,
-       .pullup_pin             = -EINVAL,
-};
-
-static struct macb_platform_data snapper9260_macb_data = {
-       .phy_irq_pin    = -EINVAL,
-       .is_rmii        = 1,
-};
-
-static struct mtd_partition __initdata snapper9260_nand_partitions[] = {
-       {
-               .name   = "Preboot",
-               .offset = 0,
-               .size   = SZ_128K,
-       },
-       {
-               .name   = "Bootloader",
-               .offset = MTDPART_OFS_APPEND,
-               .size   = SZ_256K,
-       },
-       {
-               .name   = "Environment",
-               .offset = MTDPART_OFS_APPEND,
-               .size   = SZ_128K,
-       },
-       {
-               .name   = "Kernel",
-               .offset = MTDPART_OFS_APPEND,
-               .size   = SZ_4M,
-       },
-       {
-               .name   = "Filesystem",
-               .offset = MTDPART_OFS_APPEND,
-               .size   = MTDPART_SIZ_FULL,
-       },
-};
-
-static struct atmel_nand_data __initdata snapper9260_nand_data = {
-       .ale            = 21,
-       .cle            = 22,
-       .rdy_pin        = AT91_PIN_PC13,
-       .parts          = snapper9260_nand_partitions,
-       .num_parts      = ARRAY_SIZE(snapper9260_nand_partitions),
-       .bus_width_16   = 0,
-       .enable_pin     = -EINVAL,
-       .det_pin        = -EINVAL,
-       .ecc_mode       = NAND_ECC_SOFT,
-};
-
-static struct sam9_smc_config __initdata snapper9260_nand_smc_config = {
-       .ncs_read_setup         = 0,
-       .nrd_setup              = 0,
-       .ncs_write_setup        = 0,
-       .nwe_setup              = 0,
-
-       .ncs_read_pulse         = 5,
-       .nrd_pulse              = 2,
-       .ncs_write_pulse        = 5,
-       .nwe_pulse              = 2,
-
-       .read_cycle             = 7,
-       .write_cycle            = 7,
-
-       .mode                   = (AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
-                                  AT91_SMC_EXNWMODE_DISABLE),
-       .tdf_cycles             = 1,
-};
-
-static struct pca953x_platform_data snapper9260_io_expander_data = {
-       .gpio_base              = SNAPPER9260_IO_EXP_GPIO(0),
-};
-
-static struct i2c_board_info __initdata snapper9260_i2c_devices[] = {
-       {
-               /* IO expander */
-               I2C_BOARD_INFO("max7312", 0x28),
-               .platform_data = &snapper9260_io_expander_data,
-       },
-       {
-               /* Audio codec */
-               I2C_BOARD_INFO("tlv320aic23", 0x1a),
-       },
-};
-
-static struct i2c_board_info __initdata snapper9260_i2c_isl1208 = {
-               /* RTC */
-               I2C_BOARD_INFO("isl1208", 0x6f),
-};
-
-static void __init snapper9260_add_device_nand(void)
-{
-       at91_set_A_periph(AT91_PIN_PC14, 0);
-       sam9_smc_configure(0, 3, &snapper9260_nand_smc_config);
-       at91_add_device_nand(&snapper9260_nand_data);
-}
-
-static void __init snapper9260_board_init(void)
-{
-       at91_register_devices();
-
-       at91_add_device_i2c(snapper9260_i2c_devices,
-                           ARRAY_SIZE(snapper9260_i2c_devices));
-
-       snapper9260_i2c_isl1208.irq = gpio_to_irq(AT91_PIN_PA31);
-       i2c_register_board_info(0, &snapper9260_i2c_isl1208, 1);
-
-       /* Debug on ttyS0 */
-       at91_register_uart(0, 0, 0);
-
-       at91_register_uart(AT91SAM9260_ID_US0, 1,
-                          ATMEL_UART_CTS | ATMEL_UART_RTS);
-       at91_register_uart(AT91SAM9260_ID_US1, 2,
-                          ATMEL_UART_CTS | ATMEL_UART_RTS);
-       at91_register_uart(AT91SAM9260_ID_US2, 3, 0);
-       at91_add_device_serial();
-       at91_add_device_usbh(&snapper9260_usbh_data);
-       at91_add_device_udc(&snapper9260_udc_data);
-       at91_add_device_eth(&snapper9260_macb_data);
-       at91_add_device_ssc(AT91SAM9260_ID_SSC, (ATMEL_SSC_TF | ATMEL_SSC_TK |
-                                                ATMEL_SSC_TD | ATMEL_SSC_RD));
-       snapper9260_add_device_nand();
-}
-
-MACHINE_START(SNAPPER_9260, "Bluewater Systems Snapper 9260/9G20 module")
-       .init_time      = at91_init_time,
-       .map_io         = at91_map_io,
-       .handle_irq     = at91_aic_handle_irq,
-       .init_early     = snapper9260_init_early,
-       .init_irq       = at91_init_irq_default,
-       .init_machine   = snapper9260_board_init,
-MACHINE_END
-
-
diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c
deleted file mode 100644 (file)
index e825641..0000000
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- *  Copyright (C) 2010 Christian Glindkamp <christian.glindkamp@taskit.de>
- *                     taskit GmbH
- *
- * 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 <linux/mm.h>
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-#include <linux/w1-gpio.h>
-
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#include <mach/at91sam9_smc.h>
-#include <mach/hardware.h>
-
-#include "at91_aic.h"
-#include "board.h"
-#include "sam9_smc.h"
-#include "generic.h"
-#include "gpio.h"
-
-
-void __init stamp9g20_init_early(void)
-{
-       /* Initialize processor: 18.432 MHz crystal */
-       at91_initialize(18432000);
-}
-
-/*
- * NAND flash
- */
-static struct atmel_nand_data __initdata nand_data = {
-       .ale            = 21,
-       .cle            = 22,
-       .rdy_pin        = AT91_PIN_PC13,
-       .enable_pin     = AT91_PIN_PC14,
-       .bus_width_16   = 0,
-       .det_pin        = -EINVAL,
-       .ecc_mode       = NAND_ECC_SOFT,
-};
-
-static struct sam9_smc_config __initdata nand_smc_config = {
-       .ncs_read_setup         = 0,
-       .nrd_setup              = 2,
-       .ncs_write_setup        = 0,
-       .nwe_setup              = 2,
-
-       .ncs_read_pulse         = 4,
-       .nrd_pulse              = 4,
-       .ncs_write_pulse        = 4,
-       .nwe_pulse              = 4,
-
-       .read_cycle             = 7,
-       .write_cycle            = 7,
-
-       .mode                   = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_8,
-       .tdf_cycles             = 3,
-};
-
-static void __init add_device_nand(void)
-{
-       /* configure chip-select 3 (NAND) */
-       sam9_smc_configure(0, 3, &nand_smc_config);
-
-       at91_add_device_nand(&nand_data);
-}
-
-
-/*
- * MCI (SD/MMC)
- * det_pin, wp_pin and vcc_pin are not connected
- */
-static struct mci_platform_data __initdata mmc_data = {
-       .slot[0] = {
-               .bus_width      = 4,
-               .detect_pin     = -1,
-               .wp_pin         = -1,
-       },
-};
-
-
-/*
- * USB Host port
- */
-static struct at91_usbh_data __initdata usbh_data = {
-       .ports          = 2,
-       .vbus_pin       = {-EINVAL, -EINVAL},
-       .overcurrent_pin= {-EINVAL, -EINVAL},
-};
-
-
-/*
- * USB Device port
- */
-static struct at91_udc_data __initdata portuxg20_udc_data = {
-       .vbus_pin       = AT91_PIN_PC7,
-       .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
-};
-
-static struct at91_udc_data __initdata stamp9g20evb_udc_data = {
-       .vbus_pin       = AT91_PIN_PA22,
-       .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
-};
-
-
-/*
- * MACB Ethernet device
- */
-static struct macb_platform_data __initdata macb_data = {
-       .phy_irq_pin    = AT91_PIN_PA28,
-       .is_rmii        = 1,
-};
-
-
-/*
- * LEDs
- */
-static struct gpio_led portuxg20_leds[] = {
-       {
-               .name                   = "LED2",
-               .gpio                   = AT91_PIN_PC5,
-               .default_trigger        = "none",
-       }, {
-               .name                   = "LED3",
-               .gpio                   = AT91_PIN_PC4,
-               .default_trigger        = "none",
-       }, {
-               .name                   = "LED4",
-               .gpio                   = AT91_PIN_PC10,
-               .default_trigger        = "heartbeat",
-       }
-};
-
-static struct gpio_led stamp9g20evb_leds[] = {
-       {
-               .name                   = "D8",
-               .gpio                   = AT91_PIN_PB18,
-               .active_low             = 1,
-               .default_trigger        = "none",
-       }, {
-               .name                   = "D9",
-               .gpio                   = AT91_PIN_PB19,
-               .active_low             = 1,
-               .default_trigger        = "none",
-       }, {
-               .name                   = "D10",
-               .gpio                   = AT91_PIN_PB20,
-               .active_low             = 1,
-               .default_trigger        = "heartbeat",
-       }
-};
-
-
-/*
- * SPI devices
- */
-static struct spi_board_info portuxg20_spi_devices[] = {
-       {
-               .modalias       = "spidev",
-               .chip_select    = 0,
-               .max_speed_hz   = 1 * 1000 * 1000,
-               .bus_num        = 0,
-       }, {
-               .modalias       = "spidev",
-               .chip_select    = 0,
-               .max_speed_hz   = 1 * 1000 * 1000,
-               .bus_num        = 1,
-       },
-};
-
-
-/*
- * Dallas 1-Wire
- */
-static struct w1_gpio_platform_data w1_gpio_pdata = {
-       .pin            = AT91_PIN_PA29,
-       .is_open_drain  = 1,
-       .ext_pullup_enable_pin  = -EINVAL,
-};
-
-static struct platform_device w1_device = {
-       .name                   = "w1-gpio",
-       .id                     = -1,
-       .dev.platform_data      = &w1_gpio_pdata,
-};
-
-void add_w1(void)
-{
-       at91_set_GPIO_periph(w1_gpio_pdata.pin, 1);
-       at91_set_multi_drive(w1_gpio_pdata.pin, 1);
-       platform_device_register(&w1_device);
-}
-
-
-void __init stamp9g20_board_init(void)
-{
-       /* Serial */
-       /* DGBU on ttyS0. (Rx & Tx only) */
-       at91_register_uart(0, 0, 0);
-       at91_add_device_serial();
-       /* NAND */
-       add_device_nand();
-       /* MMC */
-       at91_add_device_mci(0, &mmc_data);
-       /* W1 */
-       add_w1();
-}
-
-static void __init portuxg20_board_init(void)
-{
-       /* 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, CTS, RTS) */
-       at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
-
-       /* USART2 on ttyS3. (Rx, Tx, CTS, RTS) */
-       at91_register_uart(AT91SAM9260_ID_US2, 3, ATMEL_UART_CTS | ATMEL_UART_RTS);
-
-       /* USART4 on ttyS5. (Rx, Tx only) */
-       at91_register_uart(AT91SAM9260_ID_US4, 5, 0);
-
-       /* USART5 on ttyS6. (Rx, Tx only) */
-       at91_register_uart(AT91SAM9260_ID_US5, 6, 0);
-       stamp9g20_board_init();
-       /* USB Host */
-       at91_add_device_usbh(&usbh_data);
-       /* USB Device */
-       at91_add_device_udc(&portuxg20_udc_data);
-       /* Ethernet */
-       at91_add_device_eth(&macb_data);
-       /* I2C */
-       at91_add_device_i2c(NULL, 0);
-       /* SPI */
-       at91_add_device_spi(portuxg20_spi_devices, ARRAY_SIZE(portuxg20_spi_devices));
-       /* LEDs */
-       at91_gpio_leds(portuxg20_leds, ARRAY_SIZE(portuxg20_leds));
-}
-
-static void __init stamp9g20evb_board_init(void)
-{
-       /* 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);
-       stamp9g20_board_init();
-       /* USB Host */
-       at91_add_device_usbh(&usbh_data);
-       /* USB Device */
-       at91_add_device_udc(&stamp9g20evb_udc_data);
-       /* Ethernet */
-       at91_add_device_eth(&macb_data);
-       /* I2C */
-       at91_add_device_i2c(NULL, 0);
-       /* LEDs */
-       at91_gpio_leds(stamp9g20evb_leds, ARRAY_SIZE(stamp9g20evb_leds));
-}
-
-MACHINE_START(PORTUXG20, "taskit PortuxG20")
-       /* Maintainer: taskit GmbH */
-       .init_time      = at91_init_time,
-       .map_io         = at91_map_io,
-       .handle_irq     = at91_aic_handle_irq,
-       .init_early     = stamp9g20_init_early,
-       .init_irq       = at91_init_irq_default,
-       .init_machine   = portuxg20_board_init,
-MACHINE_END
-
-MACHINE_START(STAMP9G20, "taskit Stamp9G20")
-       /* Maintainer: taskit GmbH */
-       .init_time      = at91_init_time,
-       .map_io         = at91_map_io,
-       .handle_irq     = at91_aic_handle_irq,
-       .init_early     = stamp9g20_init_early,
-       .init_irq       = at91_init_irq_default,
-       .init_machine   = stamp9g20evb_board_init,
-MACHINE_END
diff --git a/arch/arm/mach-at91/stamp9g20.h b/arch/arm/mach-at91/stamp9g20.h
deleted file mode 100644 (file)
index f62c0ab..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __MACH_STAMP9G20_H
-#define __MACH_STAMP9G20_H
-
-void stamp9g20_init_early(void);
-void stamp9g20_board_init(void);
-
-#endif