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

Commit 7538ec7d authored by Nicolas Ferre's avatar Nicolas Ferre
Browse files

ARM: at91: remove no-MMU at91x40 support 



As there is currently no-one to take care of this old !MMU target and as its
support in recent kernels is a bit rotten, remove this at91x40 support and the
board file associated with it (at91eb01).
There are modern ARM !MMU in Mainline now so this target is not interesting for
building tests anymore. It would be better to start from these modern ARM !MMU
platforms to reintroduce at91x40 support if needed.

Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent cac7f242

arch/arm/configs/at91x40_defconfig

deleted100644 → 0
+0 −48
Original line number Original line Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_EMBEDDED=y

# CONFIG_HOTPLUG is not set

# CONFIG_ELF_CORE is not set

# CONFIG_FUTEX is not set

# CONFIG_TIMERFD is not set

# CONFIG_VM_EVENT_COUNTERS is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

# CONFIG_MMU is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91X40=y

CONFIG_MACH_AT91EB01=y

CONFIG_AT91_EARLY_USART0=y

CONFIG_CPU_ARM7TDMI=y

CONFIG_SET_MEM_PARAM=y

CONFIG_DRAM_BASE=0x01000000

CONFIG_DRAM_SIZE=0x00400000

CONFIG_FLASH_MEM_BASE=0x01400000

CONFIG_PROCESSOR_ID=0x14000040

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_BINFMT_FLAT=y

# CONFIG_SUSPEND is not set

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_RAM=y

CONFIG_MTD_ROM=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_DEVKMEM is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT2_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_ROMFS_FS=y

# CONFIG_ENABLE_MUST_CHECK is not set

arch/arm/mach-at91/Kconfig

+3 −17
Original line number Original line Diff line number Diff line
@@ -18,18 +18,14 @@ config HAVE_AT91_DBGU2 
config AT91_USE_OLD_CLK

config AT91_USE_OLD_CLK

	bool

	bool





config AT91_PMC_UNIT

	bool

	default !ARCH_AT91X40



config COMMON_CLK_AT91

config COMMON_CLK_AT91

	bool

	bool

	default AT91_PMC_UNIT && USE_OF && !AT91_USE_OLD_CLK

	default USE_OF && !AT91_USE_OLD_CLK

	select COMMON_CLK

	select COMMON_CLK





config OLD_CLK_AT91

config OLD_CLK_AT91

	bool

	bool

	default AT91_PMC_UNIT && AT91_USE_OLD_CLK

	default AT91_USE_OLD_CLK





config OLD_IRQ_AT91

config OLD_IRQ_AT91

	bool

	bool
@@ -65,16 +61,6 @@ choice 




	prompt "Core type"

	prompt "Core type"





config ARCH_AT91X40

	bool "ARM7 AT91X40"

	depends on !MMU

	select CPU_ARM7TDMI

	select ARCH_USES_GETTIMEOFFSET

	select OLD_IRQ_AT91



	help

	  Select this if you are using one of Atmel's AT91X40 SoC.



config SOC_SAM_V4_V5

config SOC_SAM_V4_V5

	bool "ARM9 AT91SAM9/AT91RM9200"

	bool "ARM9 AT91SAM9/AT91RM9200"

	help

	help
@@ -199,7 +185,7 @@ config SOC_AT91SAM9N12 
endif # SOC_SAM_V4_V5

endif # SOC_SAM_V4_V5









if SOC_SAM_V4_V5 || ARCH_AT91X40

if SOC_SAM_V4_V5

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

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

endif

endif

arch/arm/mach-at91/Kconfig.non_dt

+0 −17
Original line number Original line Diff line number Diff line
@@ -5,7 +5,6 @@ config HAVE_AT91_DATAFLASH_CARD 




choice

choice

	prompt "Atmel AT91 Processor Devices for non DT boards"

	prompt "Atmel AT91 Processor Devices for non DT boards"

	depends on !ARCH_AT91X40





config ARCH_AT91_NONE

config ARCH_AT91_NONE

	bool "None"

	bool "None"
@@ -317,22 +316,6 @@ endif 




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

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





if ARCH_AT91X40



comment "AT91X40 Board Type"



config MACH_AT91EB01

	bool "Atmel AT91EB01 Evaluation Kit"

	help

	  Select this if you are using Atmel's AT91EB01 Evaluation Kit.

	  It is also a popular target for simulators such as GDB's

	  ARM simulator (commonly known as the ARMulator) and the

	  Skyeye simulator.



endif



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



comment "AT91 Board Options"

comment "AT91 Board Options"





config MTD_AT91_DATAFLASH_CARD

config MTD_AT91_DATAFLASH_CARD

arch/arm/mach-at91/Makefile

+0 −4
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261_devices.o 
obj-$(CONFIG_ARCH_AT91SAM9263)	+= at91sam9263_devices.o

obj-$(CONFIG_ARCH_AT91SAM9263)	+= at91sam9263_devices.o

obj-$(CONFIG_ARCH_AT91SAM9RL)	+= at91sam9rl_devices.o

obj-$(CONFIG_ARCH_AT91SAM9RL)	+= at91sam9rl_devices.o

obj-$(CONFIG_ARCH_AT91SAM9G45)	+= at91sam9g45_devices.o

obj-$(CONFIG_ARCH_AT91SAM9G45)	+= at91sam9g45_devices.o

obj-$(CONFIG_ARCH_AT91X40)	+= at91x40.o at91x40_time.o





# AT91RM9200 board-specific support

# AT91RM9200 board-specific support

obj-$(CONFIG_MACH_ONEARM)	+= board-1arm.o

obj-$(CONFIG_MACH_ONEARM)	+= board-1arm.o
@@ -82,9 +81,6 @@ obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o 
# SAMA5 board with device-tree

# SAMA5 board with device-tree

obj-$(CONFIG_MACH_SAMA5_DT) += board-dt-sama5.o

obj-$(CONFIG_MACH_SAMA5_DT) += board-dt-sama5.o





# AT91X40 board-specific support

obj-$(CONFIG_MACH_AT91EB01)	+= board-eb01.o



# Drivers

# Drivers

obj-y				+= leds.o

obj-y				+= leds.o

arch/arm/mach-at91/at91x40.c

deleted100644 → 0
+0 −93
Original line number Original line Diff line number Diff line 
/*

 * arch/arm/mach-at91/at91x40.c

 *

 * (C) Copyright 2007, Greg Ungerer <gerg@snapgear.com>

 * Copyright (C) 2005 SAN People

 *

 * 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 <linux/kernel.h>

#include <linux/init.h>

#include <linux/irq.h>

#include <linux/io.h>

#include <asm/proc-fns.h>

#include <asm/system_misc.h>

#include <asm/mach/arch.h>

#include <mach/at91x40.h>

#include <mach/at91_st.h>

#include <mach/hardware.h>



#include "at91_aic.h"

#include "generic.h"



/*

 * Export the clock functions for the AT91X40. Some external code common

 * to all AT91 family parts relys on this, like the gpio and serial support.

 */

int clk_enable(struct clk *clk)

{

	return 0;

}



void clk_disable(struct clk *clk)

{

}



unsigned long clk_get_rate(struct clk *clk)

{

	return AT91X40_MASTER_CLOCK;

}



static void at91x40_idle(void)

{

	/*

	 * Disable the processor clock.  The processor will be automatically

	 * re-enabled by an interrupt or by a reset.

	 */

	__raw_writel(AT91_PS_CR_CPU, AT91_IO_P2V(AT91_PS_CR));

	cpu_do_idle();

}



void __init at91x40_initialize(unsigned long main_clock)

{

	arm_pm_idle = at91x40_idle;

}



/*

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

 */

static unsigned int at91x40_default_irq_priority[NR_AIC_IRQS] __initdata = {

	7,	/* Advanced Interrupt Controller (FIQ) */

	0,	/* System Peripherals */

	0,	/* USART 0 */

	0,	/* USART 1 */

	2,	/* Timer Counter 0 */

	2,	/* Timer Counter 1 */

	2,	/* Timer Counter 2 */

	0,	/* Watchdog timer */

	0,	/* Parallel IO Controller A */

	0,	/* Reserved */

	0,	/* Reserved */

	0,	/* Reserved */

	0,	/* Reserved */

	0,	/* Reserved */

	0,	/* Reserved */

	0,	/* Reserved */

	0,	/* External IRQ0 */

	0,	/* External IRQ1 */

	0,	/* External IRQ2 */

};



void __init at91x40_init_interrupts(unsigned int priority[NR_AIC_IRQS])

{

	u32  extern_irq = (1 << AT91X40_ID_IRQ0) | (1 << AT91X40_ID_IRQ1)

			| (1 << AT91X40_ID_IRQ2);

	if (!priority)

		priority = at91x40_default_irq_priority;



	at91_aic_init(priority, extern_irq);

}