Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5341110f authored by Nicolas Ferre's avatar Nicolas Ferre
Browse files

ARM: at91: remove at91rm9200 legacy board support 



Second part of at91rm9200 legacy !DT removal. This is the core !DT support
removal for this Atmel SoC.
Note that from now on, the Kconfig.non_dt file and its specialized options are
completely removed.
Use the Device Tree for running this board with newer kernels.

Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarBoris BREZILLON <boris.brezillon@free-electrons.com>
parent 37a0186f

arch/arm/configs/at91rm9200_defconfig

deleted100644 → 0
+0 −161
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_USER_NS=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_MODULES=y

CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91RM9200=y

CONFIG_MACH_ONEARM=y

CONFIG_MACH_AT91RM9200EK=y

CONFIG_MACH_CSB337=y

CONFIG_MACH_CSB637=y

CONFIG_MACH_CARMEVA=y

CONFIG_MACH_ATEB9200=y

CONFIG_MACH_KB9200=y

CONFIG_MACH_PICOTUX2XX=y

CONFIG_MACH_KAFA=y

CONFIG_MACH_ECBAT91=y

CONFIG_MACH_YL9200=y

CONFIG_MACH_CPUAT91=y

CONFIG_MACH_ECO920=y

CONFIG_MTD_AT91_DATAFLASH_CARD=y

CONFIG_AT91_TIMER_HZ=100

# CONFIG_ARM_THUMB is not set

CONFIG_PCCARD=y

CONFIG_AT91_CF=y

CONFIG_AEABI=y

# CONFIG_COMPACTION is not set

CONFIG_ZBOOT_ROM_TEXT=0x10000000

CONFIG_ZBOOT_ROM_BSS=0x20040000

CONFIG_KEXEC=y

CONFIG_AUTO_ZRELADDR=y

CONFIG_FPE_NWFPE=y

CONFIG_BINFMT_MISC=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=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_DIAG is not set

CONFIG_IPV6=y

CONFIG_IPV6_PRIVACY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_COMPLEX_MAPPINGS=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PLATRAM=y

CONFIG_MTD_DATAFLASH=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ATMEL=y

CONFIG_MTD_NAND_PLATFORM=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_NETDEVICES=y

CONFIG_MII=y

CONFIG_ARM_AT91_ETHER=y

CONFIG_DAVICOM_PHY=y

CONFIG_SMSC_PHY=y

CONFIG_MICREL_PHY=y

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=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_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_AT91RM9200_WATCHDOG=y

CONFIG_FB=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_TILEBLITTING=y

CONFIG_FB_S1D13XXX=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

# CONFIG_BACKLIGHT_GENERIC is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FONTS=y

CONFIG_LOGO=y

CONFIG_USB=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_GADGET=y

CONFIG_USB_AT91=y

CONFIG_USB_G_SERIAL=y

CONFIG_MMC=y

CONFIG_MMC_ATMELMCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_GPIO=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_AT91RM9200=y

CONFIG_EXT4_FS=y

CONFIG_AUTOFS4_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_UBIFS_FS=y

CONFIG_UBIFS_FS_ADVANCED_COMPR=y

CONFIG_NFS_FS=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_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

# CONFIG_FTRACE is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

CONFIG_CRYPTO_PCBC=y

CONFIG_CRYPTO_SHA1=y

CONFIG_XZ_DEC_ARMTHUMB=y

arch/arm/mach-at91/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -185,11 +185,6 @@ config SOC_AT91SAM9N12 
# ----------------------------------------------------------

endif # SOC_SAM_V4_V5





if SOC_SAM_V4_V5

source arch/arm/mach-at91/Kconfig.non_dt

endif



comment "Generic Board Type"



config MACH_AT91RM9200_DT

arch/arm/mach-at91/Kconfig.non_dt

deleted100644 → 0
+0 −114
Original line number Diff line number Diff line 
menu "Atmel Non-DT world"



config HAVE_AT91_DATAFLASH_CARD

	bool



choice

	prompt "Atmel AT91 Processor Devices for non DT boards"



config ARCH_AT91_NONE

	bool "None"



config ARCH_AT91RM9200

	bool "AT91RM9200"

	select SOC_AT91RM9200

	select AT91_USE_OLD_CLK

	select OLD_IRQ_AT91



endchoice



# ----------------------------------------------------------



if ARCH_AT91RM9200



comment "AT91RM9200 Board Type"



config MACH_ONEARM

	bool "Ajeco 1ARM Single Board Computer"

	help

	  Select this if you are using Ajeco's 1ARM Single Board Computer.

	  <http://www.ajeco.fi/>



config MACH_AT91RM9200EK

	bool "Atmel AT91RM9200-EK Evaluation Kit"

	select HAVE_AT91_DATAFLASH_CARD

	help

	  Select this if you are using Atmel's AT91RM9200-EK Evaluation Kit.

	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3507>



config MACH_CSB337

	bool "Cogent CSB337"

	help

	  Select this if you are using Cogent's CSB337 board.

	  <http://www.cogcomp.com/csb_csb337.htm>



config MACH_CSB637

	bool "Cogent CSB637"

	help

	  Select this if you are using Cogent's CSB637 board.

	  <http://www.cogcomp.com/csb_csb637.htm>



config MACH_CARMEVA

	bool "Conitec ARM&EVA"

	help

	  Select this if you are using Conitec's AT91RM9200-MCU-Module.

	  <http://www.conitec.net/english/linuxboard.php>



config MACH_ATEB9200

	bool "Embest ATEB9200"

	help

	  Select this if you are using Embest's ATEB9200 board.

	  <http://www.embedinfo.com/english/product/ATEB9200.asp>



config MACH_KB9200

	bool "KwikByte KB920x"

	help

	  Select this if you are using KwikByte's KB920x board.

	  <http://www.kwikbyte.com/KB9202.html>



config MACH_PICOTUX2XX

	bool "picotux 200"

	help

	  Select this if you are using a picotux 200.

	  <http://www.picotux.com/>



config MACH_KAFA

	bool "Sperry-Sun KAFA board"

	help

	  Select this if you are using Sperry-Sun's KAFA board.



config MACH_ECBAT91

	bool "emQbit ECB_AT91 SBC"

	select HAVE_AT91_DATAFLASH_CARD

	help

	  Select this if you are using emQbit's ECB_AT91 board.

	  <http://wiki.emqbit.com/free-ecb-at91>



config MACH_YL9200

	bool "ucDragon YL-9200"

	help

	  Select this if you are using the ucDragon YL-9200 board.



config MACH_CPUAT91

	bool "Eukrea CPUAT91"

	help

	  Select this if you are using the Eukrea Electromatique's

	  CPUAT91 board <http://www.eukrea.com/>.



config MACH_ECO920

	bool "eco920"

	help

	  Select this if you are using the eco920 board

endif



# ----------------------------------------------------------



comment "AT91 Board Options"



config MTD_AT91_DATAFLASH_CARD

	bool "Enable DataFlash Card support"

	depends on HAVE_AT91_DATAFLASH_CARD

	help

	  Enable support for the DataFlash card.



endmenu

arch/arm/mach-at91/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ obj-$(CONFIG_SOC_AT91SAM9RL) += at91sam9rl.o 
obj-$(CONFIG_SOC_SAMA5D3)	+= sama5d3.o

obj-$(CONFIG_SOC_SAMA5D4)	+= sama5d4.o



obj-$(CONFIG_ARCH_AT91RM9200)	+= at91rm9200_devices.o



# AT91SAM board with device-tree

obj-$(CONFIG_MACH_AT91RM9200_DT) += board-dt-rm9200.o

obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o

arch/arm/mach-at91/at91rm9200.c

+0 −341
Original line number Diff line number Diff line
@@ -11,296 +11,15 @@ 
 */



#include <linux/module.h>

#include <linux/reboot.h>

#include <linux/clk/at91_pmc.h>



#include <asm/irq.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/system_misc.h>

#include <mach/at91rm9200.h>

#include <mach/at91_st.h>

#include <mach/cpu.h>

#include <mach/hardware.h>



#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 udc_clk = {

	.name		= "udc_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_UDP,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk ohci_clk = {

	.name		= "ohci_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_UHP,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk ether_clk = {

	.name		= "ether_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_EMAC,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk mmc_clk = {

	.name		= "mci_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_MCI,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk twi_clk = {

	.name		= "twi_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_TWI,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk usart0_clk = {

	.name		= "usart0_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_US0,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk usart1_clk = {

	.name		= "usart1_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_US1,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk usart2_clk = {

	.name		= "usart2_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_US2,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk usart3_clk = {

	.name		= "usart3_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_US3,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk spi_clk = {

	.name		= "spi_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_SPI,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk pioA_clk = {

	.name		= "pioA_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_PIOA,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk pioB_clk = {

	.name		= "pioB_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_PIOB,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk pioC_clk = {

	.name		= "pioC_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_PIOC,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk pioD_clk = {

	.name		= "pioD_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_PIOD,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk ssc0_clk = {

	.name		= "ssc0_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_SSC0,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk ssc1_clk = {

	.name		= "ssc1_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_SSC1,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk ssc2_clk = {

	.name		= "ssc2_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_SSC2,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk tc0_clk = {

	.name		= "tc0_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_TC0,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk tc1_clk = {

	.name		= "tc1_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_TC1,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk tc2_clk = {

	.name		= "tc2_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_TC2,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk tc3_clk = {

	.name		= "tc3_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_TC3,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk tc4_clk = {

	.name		= "tc4_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_TC4,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk tc5_clk = {

	.name		= "tc5_clk",

	.pmc_mask	= 1 << AT91RM9200_ID_TC5,

	.type		= CLK_TYPE_PERIPHERAL,

};



static struct clk *periph_clocks[] __initdata = {

	&pioA_clk,

	&pioB_clk,

	&pioC_clk,

	&pioD_clk,

	&usart0_clk,

	&usart1_clk,

	&usart2_clk,

	&usart3_clk,

	&mmc_clk,

	&udc_clk,

	&twi_clk,

	&spi_clk,

	&ssc0_clk,

	&ssc1_clk,

	&ssc2_clk,

	&tc0_clk,

	&tc1_clk,

	&tc2_clk,

	&tc3_clk,

	&tc4_clk,

	&tc5_clk,

	&ohci_clk,

	&ether_clk,

	// irq0 .. irq6

};



static struct clk_lookup periph_clocks_lookups[] = {

	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk),

	CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk),

	CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk),

	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk),

	CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk),

	CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_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", "at91rm9200_ssc.2", &ssc2_clk),

	CLKDEV_CON_DEV_ID("pclk", "fffd0000.ssc", &ssc0_clk),

	CLKDEV_CON_DEV_ID("pclk", "fffd4000.ssc", &ssc1_clk),

	CLKDEV_CON_DEV_ID("pclk", "fffd8000.ssc", &ssc2_clk),

	CLKDEV_CON_DEV_ID(NULL, "i2c-at91rm9200.0", &twi_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", &pioC_clk),

	CLKDEV_CON_ID("pioD", &pioD_clk),

	/* usart lookup table for DT entries */

	CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck),

	CLKDEV_CON_DEV_ID("usart", "fffc0000.serial", &usart0_clk),

	CLKDEV_CON_DEV_ID("usart", "fffc4000.serial", &usart1_clk),

	CLKDEV_CON_DEV_ID("usart", "fffc8000.serial", &usart2_clk),

	CLKDEV_CON_DEV_ID("usart", "fffcc000.serial", &usart3_clk),

	/* tc lookup table for DT entries */

	CLKDEV_CON_DEV_ID("t0_clk", "fffa0000.timer", &tc0_clk),

	CLKDEV_CON_DEV_ID("t1_clk", "fffa0000.timer", &tc1_clk),

	CLKDEV_CON_DEV_ID("t2_clk", "fffa0000.timer", &tc2_clk),

	CLKDEV_CON_DEV_ID("t0_clk", "fffa4000.timer", &tc3_clk),

	CLKDEV_CON_DEV_ID("t1_clk", "fffa4000.timer", &tc4_clk),

	CLKDEV_CON_DEV_ID("t2_clk", "fffa4000.timer", &tc5_clk),

	CLKDEV_CON_DEV_ID("mci_clk", "fffb4000.mmc", &mmc_clk),

	CLKDEV_CON_DEV_ID("emac_clk", "fffbc000.ethernet", &ether_clk),

	CLKDEV_CON_DEV_ID(NULL, "fffb8000.i2c", &twi_clk),

	CLKDEV_CON_DEV_ID("hclk", "300000.ohci", &ohci_clk),

	CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioA_clk),

	CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioB_clk),

	CLKDEV_CON_DEV_ID(NULL, "fffff800.gpio", &pioC_clk),

	CLKDEV_CON_DEV_ID(NULL, "fffffa00.gpio", &pioD_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),

	CLKDEV_CON_DEV_ID("usart", "atmel_usart.4", &usart3_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 at91rm9200_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 at91rm9200_register_clocks NULL

#endif



/* --------------------------------------------------------------------

 *  GPIO

 * -------------------------------------------------------------------- */



static struct at91_gpio_bank at91rm9200_gpio[] __initdata = {

	{

		.id		= AT91RM9200_ID_PIOA,

		.regbase	= AT91RM9200_BASE_PIOA,

	}, {

		.id		= AT91RM9200_ID_PIOB,

		.regbase	= AT91RM9200_BASE_PIOB,

	}, {

		.id		= AT91RM9200_ID_PIOC,

		.regbase	= AT91RM9200_BASE_PIOC,

	}, {

		.id		= AT91RM9200_ID_PIOD,

		.regbase	= AT91RM9200_BASE_PIOD,

	}

};



static void at91rm9200_idle(void)

{
@@ -329,74 +48,14 @@ static void __init at91rm9200_map_io(void) 
	at91_init_sram(0, AT91RM9200_SRAM_BASE, AT91RM9200_SRAM_SIZE);

}



static void __init at91rm9200_ioremap_registers(void)

{

	at91rm9200_ioremap_st(AT91RM9200_BASE_ST);

	at91_ioremap_ramc(0, AT91RM9200_BASE_MC, 256);

	at91_pm_set_standby(at91rm9200_standby);

}



static void __init at91rm9200_initialize(void)

{

	arm_pm_idle = at91rm9200_idle;

	arm_pm_restart = at91rm9200_restart;



	/* Initialize GPIO subsystem */

	at91_gpio_init(at91rm9200_gpio,

		cpu_is_at91rm9200_bga() ? AT91RM9200_BGA : AT91RM9200_PQFP);

}





/* --------------------------------------------------------------------

 *  Interrupt initialization

 * -------------------------------------------------------------------- */



/*

 * The default interrupt priority levels (0 = lowest, 7 = highest).

 */

static unsigned int at91rm9200_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 */

	1,	/* Parallel IO Controller D */

	5,	/* USART 0 */

	5,	/* USART 1 */

	5,	/* USART 2 */

	5,	/* USART 3 */

	0,	/* Multimedia Card Interface */

	2,	/* USB Device Port */

	6,	/* Two-Wire Interface */

	5,	/* Serial Peripheral Interface */

	4,	/* Serial Synchronous Controller 0 */

	4,	/* Serial Synchronous Controller 1 */

	4,	/* Serial Synchronous Controller 2 */

	0,	/* Timer Counter 0 */

	0,	/* Timer Counter 1 */

	0,	/* Timer Counter 2 */

	0,	/* Timer Counter 3 */

	0,	/* Timer Counter 4 */

	0,	/* Timer Counter 5 */

	2,	/* USB Host port */

	3,	/* Ethernet MAC */

	0,	/* Advanced Interrupt Controller (IRQ0) */

	0,	/* Advanced Interrupt Controller (IRQ1) */

	0,	/* Advanced Interrupt Controller (IRQ2) */

	0,	/* Advanced Interrupt Controller (IRQ3) */

	0,	/* Advanced Interrupt Controller (IRQ4) */

	0,	/* Advanced Interrupt Controller (IRQ5) */

	0	/* Advanced Interrupt Controller (IRQ6) */

};



AT91_SOC_START(at91rm9200)

	.map_io = at91rm9200_map_io,

	.default_irq_priority = at91rm9200_default_irq_priority,

	.extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1)

		    | (1 << AT91RM9200_ID_IRQ2) | (1 << AT91RM9200_ID_IRQ3)

		    | (1 << AT91RM9200_ID_IRQ4) | (1 << AT91RM9200_ID_IRQ5)

		    | (1 << AT91RM9200_ID_IRQ6),

	.ioremap_registers = at91rm9200_ioremap_registers,

	.register_clocks = at91rm9200_register_clocks,

	.init = at91rm9200_initialize,

AT91_SOC_END