Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755726AbaKSKis (ORCPT ); Wed, 19 Nov 2014 05:38:48 -0500 Received: from eusmtp01.atmel.com ([212.144.249.243]:37946 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753708AbaKSKiq (ORCPT ); Wed, 19 Nov 2014 05:38:46 -0500 Message-ID: <546C7330.5040802@atmel.com> Date: Wed, 19 Nov 2014 11:38:40 +0100 From: Nicolas Ferre Organization: atmel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: CC: , Jean-Christophe PLAGNIOL-VILLARD , Boris BREZILLON , Alexandre Belloni , Ludovic Desroches Subject: Re: [PATCH 1/4] ARM: at91: remove at91sam9263 legacy board support References: In-Reply-To: X-Enigmail-Version: 1.5.2 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 19/11/2014 11:31, Nicolas Ferre : > Remove legacy support for at91sam9rl boards. Typo, please read "at91sam9263 boards". Already corrected in the at91-3.19-cleanup branch. Sorry for the noise. > This include board files removal plus all legacy code for non DT boards > support. > Use the Device Tree for running this board with newer kernels. > > Signed-off-by: Nicolas Ferre > --- > arch/arm/configs/at91sam9263_defconfig | 151 --- > arch/arm/mach-at91/Kconfig.non_dt | 21 - > arch/arm/mach-at91/Makefile | 4 - > arch/arm/mach-at91/at91sam9263.c | 399 -------- > arch/arm/mach-at91/at91sam9263_devices.c | 1538 ------------------------------ > arch/arm/mach-at91/board-sam9263ek.c | 493 ---------- > 6 files changed, 2606 deletions(-) > delete mode 100644 arch/arm/configs/at91sam9263_defconfig > delete mode 100644 arch/arm/mach-at91/at91sam9263_devices.c > delete mode 100644 arch/arm/mach-at91/board-sam9263ek.c > > diff --git a/arch/arm/configs/at91sam9263_defconfig b/arch/arm/configs/at91sam9263_defconfig > deleted file mode 100644 > index 8b671c977b81..000000000000 > --- a/arch/arm/configs/at91sam9263_defconfig > +++ /dev/null > @@ -1,151 +0,0 @@ > -# CONFIG_LOCALVERSION_AUTO is not set > -# CONFIG_SWAP is not set > -CONFIG_SYSVIPC=y > -CONFIG_IKCONFIG=y > -CONFIG_IKCONFIG_PROC=y > -CONFIG_LOG_BUF_SHIFT=14 > -CONFIG_NAMESPACES=y > -CONFIG_EMBEDDED=y > -CONFIG_SLAB=y > -CONFIG_MODULES=y > -CONFIG_MODULE_UNLOAD=y > -# CONFIG_BLK_DEV_BSG is not set > -# CONFIG_IOSCHED_DEADLINE is not set > -# CONFIG_IOSCHED_CFQ is not set > -CONFIG_ARCH_AT91=y > -CONFIG_ARCH_AT91SAM9263=y > -CONFIG_MACH_AT91SAM9263EK=y > -CONFIG_MTD_AT91_DATAFLASH_CARD=y > -# CONFIG_ARM_THUMB is not set > -CONFIG_AEABI=y > -CONFIG_ZBOOT_ROM_TEXT=0x0 > -CONFIG_ZBOOT_ROM_BSS=0x0 > -CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" > -CONFIG_AUTO_ZRELADDR=y > -CONFIG_NET=y > -CONFIG_PACKET=y > -CONFIG_UNIX=y > -CONFIG_NET_KEY=y > -CONFIG_INET=y > -CONFIG_IP_MULTICAST=y > -CONFIG_IP_ADVANCED_ROUTER=y > -CONFIG_IP_ROUTE_VERBOSE=y > -CONFIG_IP_PNP=y > -CONFIG_IP_PNP_DHCP=y > -CONFIG_IP_PNP_BOOTP=y > -CONFIG_IP_PNP_RARP=y > -CONFIG_NET_IPIP=y > -CONFIG_IP_MROUTE=y > -CONFIG_IP_PIMSM_V1=y > -CONFIG_IP_PIMSM_V2=y > -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set > -# CONFIG_INET_XFRM_MODE_TUNNEL is not set > -# CONFIG_INET_XFRM_MODE_BEET is not set > -# CONFIG_INET_LRO is not set > -# CONFIG_INET_DIAG is not set > -CONFIG_IPV6=y > -# CONFIG_WIRELESS is not set > -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" > -CONFIG_DEVTMPFS=y > -CONFIG_DEVTMPFS_MOUNT=y > -CONFIG_MTD=y > -CONFIG_MTD_CMDLINE_PARTS=y > -CONFIG_MTD_BLOCK=y > -CONFIG_NFTL=y > -CONFIG_NFTL_RW=y > -CONFIG_MTD_DATAFLASH=y > -CONFIG_MTD_BLOCK2MTD=y > -CONFIG_MTD_NAND=y > -CONFIG_MTD_NAND_ATMEL=y > -CONFIG_MTD_UBI=y > -CONFIG_MTD_UBI_GLUEBI=y > -CONFIG_BLK_DEV_LOOP=y > -CONFIG_BLK_DEV_RAM=y > -CONFIG_BLK_DEV_RAM_SIZE=8192 > -CONFIG_ATMEL_TCLIB=y > -CONFIG_SCSI=y > -CONFIG_BLK_DEV_SD=y > -CONFIG_NETDEVICES=y > -CONFIG_MACB=y > -CONFIG_SMSC_PHY=y > -# CONFIG_WLAN is not set > -CONFIG_INPUT_POLLDEV=m > -# CONFIG_INPUT_MOUSEDEV is not set > -CONFIG_INPUT_EVDEV=y > -# CONFIG_KEYBOARD_ATKBD is not set > -CONFIG_KEYBOARD_GPIO=y > -# CONFIG_INPUT_MOUSE is not set > -CONFIG_INPUT_TOUCHSCREEN=y > -CONFIG_TOUCHSCREEN_ADS7846=y > -# CONFIG_LEGACY_PTYS is not set > -CONFIG_SERIAL_ATMEL=y > -CONFIG_SERIAL_ATMEL_CONSOLE=y > -CONFIG_HW_RANDOM=y > -CONFIG_I2C=y > -CONFIG_I2C_CHARDEV=y > -CONFIG_I2C_GPIO=y > -CONFIG_SPI=y > -CONFIG_SPI_ATMEL=y > -CONFIG_GPIO_SYSFS=y > -CONFIG_POWER_SUPPLY=y > -CONFIG_POWER_RESET=y > -# CONFIG_HWMON is not set > -CONFIG_WATCHDOG=y > -CONFIG_WATCHDOG_NOWAYOUT=y > -CONFIG_AT91SAM9X_WATCHDOG=y > -CONFIG_FB=y > -CONFIG_FB_ATMEL=y > -CONFIG_BACKLIGHT_LCD_SUPPORT=y > -CONFIG_LCD_CLASS_DEVICE=y > -CONFIG_BACKLIGHT_CLASS_DEVICE=y > -CONFIG_FRAMEBUFFER_CONSOLE=y > -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y > -CONFIG_LOGO=y > -CONFIG_SOUND=y > -CONFIG_SND=y > -CONFIG_SND_SEQUENCER=y > -CONFIG_SND_MIXER_OSS=y > -CONFIG_SND_PCM_OSS=y > -# CONFIG_SND_SUPPORT_OLD_API is not set > -# CONFIG_SND_VERBOSE_PROCFS is not set > -# CONFIG_SND_DRIVERS is not set > -# CONFIG_SND_ARM is not set > -CONFIG_SND_ATMEL_AC97C=y > -# CONFIG_SND_SPI is not set > -CONFIG_SND_USB_AUDIO=m > -CONFIG_USB=y > -CONFIG_USB_MON=y > -CONFIG_USB_OHCI_HCD=y > -CONFIG_USB_STORAGE=y > -CONFIG_USB_GADGET=y > -CONFIG_USB_ATMEL_USBA=y > -CONFIG_USB_G_SERIAL=y > -CONFIG_MMC=y > -CONFIG_SDIO_UART=m > -CONFIG_MMC_ATMELMCI=m > -CONFIG_NEW_LEDS=y > -CONFIG_LEDS_CLASS=y > -CONFIG_LEDS_GPIO=y > -CONFIG_LEDS_PWM=y > -CONFIG_LEDS_TRIGGERS=y > -CONFIG_LEDS_TRIGGER_HEARTBEAT=y > -CONFIG_RTC_CLASS=y > -CONFIG_RTC_DRV_AT91SAM9=y > -CONFIG_PWM=y > -CONFIG_PWM_ATMEL=y > -CONFIG_EXT4_FS=y > -CONFIG_VFAT_FS=y > -CONFIG_TMPFS=y > -CONFIG_UBIFS_FS=y > -CONFIG_UBIFS_FS_ADVANCED_COMPR=y > -CONFIG_NFS_FS=y > -CONFIG_NFS_V3_ACL=y > -CONFIG_NFS_V4=y > -CONFIG_ROOT_NFS=y > -CONFIG_NLS_CODEPAGE_437=y > -CONFIG_NLS_CODEPAGE_850=y > -CONFIG_NLS_ISO8859_1=y > -CONFIG_NLS_UTF8=y > -CONFIG_DEBUG_USER=y > -CONFIG_XZ_DEC=y > -CONFIG_FONTS=y > diff --git a/arch/arm/mach-at91/Kconfig.non_dt b/arch/arm/mach-at91/Kconfig.non_dt > index 22963a829e5c..a9458234ab23 100644 > --- a/arch/arm/mach-at91/Kconfig.non_dt > +++ b/arch/arm/mach-at91/Kconfig.non_dt > @@ -27,12 +27,6 @@ config ARCH_AT91SAM9261 > select AT91_USE_OLD_CLK > select OLD_IRQ_AT91 > > -config ARCH_AT91SAM9263 > - bool "AT91SAM9263" > - select SOC_AT91SAM9263 > - select AT91_USE_OLD_CLK > - select OLD_IRQ_AT91 > - > endchoice > > config ARCH_AT91SAM9G20 > @@ -260,21 +254,6 @@ endif > > # ---------------------------------------------------------- > > -if ARCH_AT91SAM9263 > - > -comment "AT91SAM9263 Board Type" > - > -config MACH_AT91SAM9263EK > - bool "Atmel AT91SAM9263-EK Evaluation Kit" > - select HAVE_AT91_DATAFLASH_CARD > - help > - Select this if you are using Atmel's AT91SAM9263-EK Evaluation Kit. > - > - > -endif > - > -# ---------------------------------------------------------- > - > comment "AT91 Board Options" > > config MTD_AT91_DATAFLASH_CARD > diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile > index ae8aa1a898e8..e0361357e018 100644 > --- a/arch/arm/mach-at91/Makefile > +++ b/arch/arm/mach-at91/Makefile > @@ -23,7 +23,6 @@ obj-$(CONFIG_SOC_SAMA5D4) += sama5d4.o > obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200_devices.o > obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260_devices.o > obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261_devices.o > -obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263_devices.o > > # AT91RM9200 board-specific support > obj-$(CONFIG_MACH_ONEARM) += board-1arm.o > @@ -52,9 +51,6 @@ obj-$(CONFIG_MACH_FLEXIBITY) += board-flexibity.o > obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o > obj-$(CONFIG_MACH_AT91SAM9G10EK) += board-sam9261ek.o > > -# AT91SAM9263 board-specific support > -obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o > - > # AT91SAM9G20 board-specific support > obj-$(CONFIG_MACH_AT91SAM9G20EK) += board-sam9g20ek.o > obj-$(CONFIG_MACH_CPU9G20) += board-cpu9krea.o > diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c > index fbff228cc63e..e7ad14864083 100644 > --- a/arch/arm/mach-at91/at91sam9263.c > +++ b/arch/arm/mach-at91/at91sam9263.c > @@ -10,304 +10,11 @@ > * > */ > > -#include > -#include > -#include > - > -#include > -#include > -#include > -#include > #include > -#include > #include > > -#include "at91_aic.h" > #include "soc.h" > #include "generic.h" > -#include "sam9_smc.h" > -#include "pm.h" > - > -#if defined(CONFIG_OLD_CLK_AT91) > -#include "clock.h" > -/* -------------------------------------------------------------------- > - * Clocks > - * -------------------------------------------------------------------- */ > - > -/* > - * The peripheral clocks. > - */ > -static struct clk pioA_clk = { > - .name = "pioA_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_PIOA, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk pioB_clk = { > - .name = "pioB_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_PIOB, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk pioCDE_clk = { > - .name = "pioCDE_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_PIOCDE, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk usart0_clk = { > - .name = "usart0_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_US0, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk usart1_clk = { > - .name = "usart1_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_US1, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk usart2_clk = { > - .name = "usart2_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_US2, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk mmc0_clk = { > - .name = "mci0_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_MCI0, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk mmc1_clk = { > - .name = "mci1_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_MCI1, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk can_clk = { > - .name = "can_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_CAN, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk twi_clk = { > - .name = "twi_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_TWI, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk spi0_clk = { > - .name = "spi0_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_SPI0, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk spi1_clk = { > - .name = "spi1_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_SPI1, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk ssc0_clk = { > - .name = "ssc0_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_SSC0, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk ssc1_clk = { > - .name = "ssc1_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_SSC1, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk ac97_clk = { > - .name = "ac97_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_AC97C, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk tcb_clk = { > - .name = "tcb_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_TCB, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk pwm_clk = { > - .name = "pwm_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_PWMC, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk macb_clk = { > - .name = "pclk", > - .pmc_mask = 1 << AT91SAM9263_ID_EMAC, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk dma_clk = { > - .name = "dma_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_DMA, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk twodge_clk = { > - .name = "2dge_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_2DGE, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk udc_clk = { > - .name = "udc_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_UDP, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk isi_clk = { > - .name = "isi_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_ISI, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk lcdc_clk = { > - .name = "lcdc_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_LCDC, > - .type = CLK_TYPE_PERIPHERAL, > -}; > -static struct clk ohci_clk = { > - .name = "ohci_clk", > - .pmc_mask = 1 << AT91SAM9263_ID_UHP, > - .type = CLK_TYPE_PERIPHERAL, > -}; > - > -static struct clk *periph_clocks[] __initdata = { > - &pioA_clk, > - &pioB_clk, > - &pioCDE_clk, > - &usart0_clk, > - &usart1_clk, > - &usart2_clk, > - &mmc0_clk, > - &mmc1_clk, > - &can_clk, > - &twi_clk, > - &spi0_clk, > - &spi1_clk, > - &ssc0_clk, > - &ssc1_clk, > - &ac97_clk, > - &tcb_clk, > - &pwm_clk, > - &macb_clk, > - &twodge_clk, > - &udc_clk, > - &isi_clk, > - &lcdc_clk, > - &dma_clk, > - &ohci_clk, > - // irq0 .. irq1 > -}; > - > -static struct clk_lookup periph_clocks_lookups[] = { > - /* One additional fake clock for macb_hclk */ > - CLKDEV_CON_ID("hclk", &macb_clk), > - CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.0", &ssc0_clk), > - CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.1", &ssc1_clk), > - CLKDEV_CON_DEV_ID("pclk", "fff98000.ssc", &ssc0_clk), > - CLKDEV_CON_DEV_ID("pclk", "fff9c000.ssc", &ssc1_clk), > - CLKDEV_CON_DEV_ID("hclk", "at91sam9263-lcdfb.0", &lcdc_clk), > - CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci.0", &mmc0_clk), > - CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci.1", &mmc1_clk), > - CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk), > - CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), > - CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk), > - CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260.0", &twi_clk), > - CLKDEV_CON_DEV_ID(NULL, "at91sam9rl-pwm", &pwm_clk), > - /* fake hclk clock */ > - CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk), > - CLKDEV_CON_ID("pioA", &pioA_clk), > - CLKDEV_CON_ID("pioB", &pioB_clk), > - CLKDEV_CON_ID("pioC", &pioCDE_clk), > - CLKDEV_CON_ID("pioD", &pioCDE_clk), > - CLKDEV_CON_ID("pioE", &pioCDE_clk), > - /* more usart lookup table for DT entries */ > - CLKDEV_CON_DEV_ID("usart", "ffffee00.serial", &mck), > - CLKDEV_CON_DEV_ID("usart", "fff8c000.serial", &usart0_clk), > - CLKDEV_CON_DEV_ID("usart", "fff90000.serial", &usart1_clk), > - CLKDEV_CON_DEV_ID("usart", "fff94000.serial", &usart2_clk), > - /* more tc lookup table for DT entries */ > - CLKDEV_CON_DEV_ID("t0_clk", "fff7c000.timer", &tcb_clk), > - CLKDEV_CON_DEV_ID("hclk", "a00000.ohci", &ohci_clk), > - CLKDEV_CON_DEV_ID("spi_clk", "fffa4000.spi", &spi0_clk), > - CLKDEV_CON_DEV_ID("spi_clk", "fffa8000.spi", &spi1_clk), > - CLKDEV_CON_DEV_ID("mci_clk", "fff80000.mmc", &mmc0_clk), > - CLKDEV_CON_DEV_ID("mci_clk", "fff84000.mmc", &mmc1_clk), > - CLKDEV_CON_DEV_ID(NULL, "fff88000.i2c", &twi_clk), > - CLKDEV_CON_DEV_ID(NULL, "fffff200.gpio", &pioA_clk), > - CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioB_clk), > - CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioCDE_clk), > - CLKDEV_CON_DEV_ID(NULL, "fffff800.gpio", &pioCDE_clk), > - CLKDEV_CON_DEV_ID(NULL, "fffffa00.gpio", &pioCDE_clk), > - CLKDEV_CON_DEV_ID(NULL, "fffb8000.pwm", &pwm_clk), > -}; > - > -static struct clk_lookup usart_clocks_lookups[] = { > - CLKDEV_CON_DEV_ID("usart", "atmel_usart.0", &mck), > - CLKDEV_CON_DEV_ID("usart", "atmel_usart.1", &usart0_clk), > - CLKDEV_CON_DEV_ID("usart", "atmel_usart.2", &usart1_clk), > - CLKDEV_CON_DEV_ID("usart", "atmel_usart.3", &usart2_clk), > -}; > - > -/* > - * The four programmable clocks. > - * You must configure pin multiplexing to bring these signals out. > - */ > -static struct clk pck0 = { > - .name = "pck0", > - .pmc_mask = AT91_PMC_PCK0, > - .type = CLK_TYPE_PROGRAMMABLE, > - .id = 0, > -}; > -static struct clk pck1 = { > - .name = "pck1", > - .pmc_mask = AT91_PMC_PCK1, > - .type = CLK_TYPE_PROGRAMMABLE, > - .id = 1, > -}; > -static struct clk pck2 = { > - .name = "pck2", > - .pmc_mask = AT91_PMC_PCK2, > - .type = CLK_TYPE_PROGRAMMABLE, > - .id = 2, > -}; > -static struct clk pck3 = { > - .name = "pck3", > - .pmc_mask = AT91_PMC_PCK3, > - .type = CLK_TYPE_PROGRAMMABLE, > - .id = 3, > -}; > - > -static void __init at91sam9263_register_clocks(void) > -{ > - int i; > - > - for (i = 0; i < ARRAY_SIZE(periph_clocks); i++) > - clk_register(periph_clocks[i]); > - > - clkdev_add_table(periph_clocks_lookups, > - ARRAY_SIZE(periph_clocks_lookups)); > - clkdev_add_table(usart_clocks_lookups, > - ARRAY_SIZE(usart_clocks_lookups)); > - > - clk_register(&pck0); > - clk_register(&pck1); > - clk_register(&pck2); > - clk_register(&pck3); > -} > -#else > -#define at91sam9263_register_clocks NULL > -#endif > - > -/* -------------------------------------------------------------------- > - * GPIO > - * -------------------------------------------------------------------- */ > - > -static struct at91_gpio_bank at91sam9263_gpio[] __initdata = { > - { > - .id = AT91SAM9263_ID_PIOA, > - .regbase = AT91SAM9263_BASE_PIOA, > - }, { > - .id = AT91SAM9263_ID_PIOB, > - .regbase = AT91SAM9263_BASE_PIOB, > - }, { > - .id = AT91SAM9263_ID_PIOCDE, > - .regbase = AT91SAM9263_BASE_PIOC, > - }, { > - .id = AT91SAM9263_ID_PIOCDE, > - .regbase = AT91SAM9263_BASE_PIOD, > - }, { > - .id = AT91SAM9263_ID_PIOCDE, > - .regbase = AT91SAM9263_BASE_PIOE, > - } > -}; > > /* -------------------------------------------------------------------- > * AT91SAM9263 processor initialization > @@ -319,121 +26,15 @@ static void __init at91sam9263_map_io(void) > at91_init_sram(1, AT91SAM9263_SRAM1_BASE, AT91SAM9263_SRAM1_SIZE); > } > > -static void __init at91sam9263_ioremap_registers(void) > -{ > - at91_ioremap_ramc(0, AT91SAM9263_BASE_SDRAMC0, 512); > - at91_ioremap_ramc(1, AT91SAM9263_BASE_SDRAMC1, 512); > - at91sam926x_ioremap_pit(AT91SAM9263_BASE_PIT); > - at91sam9_ioremap_smc(0, AT91SAM9263_BASE_SMC0); > - at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1); > - at91_ioremap_matrix(AT91SAM9263_BASE_MATRIX); > - at91_pm_set_standby(at91sam9_sdram_standby); > -} > - > static void __init at91sam9263_initialize(void) > { > arm_pm_idle = at91sam9_idle; > > at91_sysirq_mask_rtt(AT91SAM9263_BASE_RTT0); > at91_sysirq_mask_rtt(AT91SAM9263_BASE_RTT1); > - > - /* Register GPIO subsystem */ > - at91_gpio_init(at91sam9263_gpio, 5); > -} > - > -static struct resource rstc_resources[] = { > - [0] = { > - .start = AT91SAM9263_BASE_RSTC, > - .end = AT91SAM9263_BASE_RSTC + SZ_16 - 1, > - .flags = IORESOURCE_MEM, > - }, > - [1] = { > - .start = AT91SAM9263_BASE_SDRAMC0, > - .end = AT91SAM9263_BASE_SDRAMC0 + SZ_512 - 1, > - .flags = IORESOURCE_MEM, > - }, > -}; > - > -static struct platform_device rstc_device = { > - .name = "at91-sam9260-reset", > - .resource = rstc_resources, > - .num_resources = ARRAY_SIZE(rstc_resources), > -}; > - > -static struct resource shdwc_resources[] = { > - [0] = { > - .start = AT91SAM9263_BASE_SHDWC, > - .end = AT91SAM9263_BASE_SHDWC + SZ_16 - 1, > - .flags = IORESOURCE_MEM, > - }, > -}; > - > -static struct platform_device shdwc_device = { > - .name = "at91-poweroff", > - .resource = shdwc_resources, > - .num_resources = ARRAY_SIZE(shdwc_resources), > -}; > - > -static void __init at91sam9263_register_devices(void) > -{ > - platform_device_register(&rstc_device); > - platform_device_register(&shdwc_device); > -} > - > -/* -------------------------------------------------------------------- > - * Interrupt initialization > - * -------------------------------------------------------------------- */ > - > -/* > - * The default interrupt priority levels (0 = lowest, 7 = highest). > - */ > -static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = { > - 7, /* Advanced Interrupt Controller (FIQ) */ > - 7, /* System Peripherals */ > - 1, /* Parallel IO Controller A */ > - 1, /* Parallel IO Controller B */ > - 1, /* Parallel IO Controller C, D and E */ > - 0, > - 0, > - 5, /* USART 0 */ > - 5, /* USART 1 */ > - 5, /* USART 2 */ > - 0, /* Multimedia Card Interface 0 */ > - 0, /* Multimedia Card Interface 1 */ > - 3, /* CAN */ > - 6, /* Two-Wire Interface */ > - 5, /* Serial Peripheral Interface 0 */ > - 5, /* Serial Peripheral Interface 1 */ > - 4, /* Serial Synchronous Controller 0 */ > - 4, /* Serial Synchronous Controller 1 */ > - 5, /* AC97 Controller */ > - 0, /* Timer Counter 0, 1 and 2 */ > - 0, /* Pulse Width Modulation Controller */ > - 3, /* Ethernet */ > - 0, > - 0, /* 2D Graphic Engine */ > - 2, /* USB Device Port */ > - 0, /* Image Sensor Interface */ > - 3, /* LDC Controller */ > - 0, /* DMA Controller */ > - 0, > - 2, /* USB Host port */ > - 0, /* Advanced Interrupt Controller (IRQ0) */ > - 0, /* Advanced Interrupt Controller (IRQ1) */ > -}; > - > -static void __init at91sam9263_init_time(void) > -{ > - at91sam926x_pit_init(NR_IRQS_LEGACY + AT91_ID_SYS); > } > > AT91_SOC_START(at91sam9263) > .map_io = at91sam9263_map_io, > - .default_irq_priority = at91sam9263_default_irq_priority, > - .extern_irq = (1 << AT91SAM9263_ID_IRQ0) | (1 << AT91SAM9263_ID_IRQ1), > - .ioremap_registers = at91sam9263_ioremap_registers, > - .register_clocks = at91sam9263_register_clocks, > - .register_devices = at91sam9263_register_devices, > .init = at91sam9263_initialize, > - .init_time = at91sam9263_init_time, > AT91_SOC_END > diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c > deleted file mode 100644 > index cef0e2f57068..000000000000 > --- a/arch/arm/mach-at91/at91sam9263_devices.c > +++ /dev/null > @@ -1,1538 +0,0 @@ > -/* > - * arch/arm/mach-at91/at91sam9263_devices.c > - * > - * Copyright (C) 2007 Atmel Corporation. > - * > - * 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. > - * > - */ > -#include > -#include > - > -#include > -#include > -#include > -#include > - > -#include > -#include