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

Commit bcf8c7e7 authored by Nicolas Ferre's avatar Nicolas Ferre
Browse files

ARM: at91: remove at91sam9rl legacy board support 



Remove legacy support for at91sam9rl boards.
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: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
[nicolas.ferre@atmel.com: Add sentence about DT]
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 4bf7753b

arch/arm/configs/at91sam9rl_defconfig

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

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=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_AT91SAM9RL=y

CONFIG_MACH_AT91SAM9RLEK=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,17105363 root=/dev/ram0 rw"

CONFIG_AUTO_ZRELADDR=y

CONFIG_NET=y

CONFIG_UNIX=y

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_MTD_DATAFLASH=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ATMEL=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=4

CONFIG_BLK_DEV_RAM_SIZE=24576

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_MOUSEDEV_SCREEN_X=320

CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

# CONFIG_SERIO is not set

CONFIG_SERIAL_ATMEL=y

CONFIG_SERIAL_ATMEL_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_GPIO=y

CONFIG_SPI=y

CONFIG_SPI_ATMEL=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_USB_GADGET=y

CONFIG_USB_ATMEL_USBA=y

CONFIG_MMC=y

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_IIO=y

CONFIG_AT91_ADC=y

CONFIG_PWM=y

CONFIG_PWM_ATMEL=y

CONFIG_EXT4_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_UBIFS_FS=y

CONFIG_CRAMFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_CODEPAGE_850=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_ISO8859_15=y

CONFIG_NLS_UTF8=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

arch/arm/mach-at91/Kconfig.non_dt

+0 −19
Original line number Diff line number Diff line
@@ -33,12 +33,6 @@ config ARCH_AT91SAM9263 
	select AT91_USE_OLD_CLK

	select OLD_IRQ_AT91



config ARCH_AT91SAM9RL

	bool "AT91SAM9RL"

	select SOC_AT91SAM9RL

	select AT91_USE_OLD_CLK

	select OLD_IRQ_AT91



endchoice



config ARCH_AT91SAM9G20
@@ -281,19 +275,6 @@ endif 


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



if ARCH_AT91SAM9RL



comment "AT91SAM9RL Board Type"



config MACH_AT91SAM9RLEK

	bool "Atmel AT91SAM9RL-EK Evaluation Kit"

	help

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



endif



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



comment "AT91 Board Options"



config MTD_AT91_DATAFLASH_CARD

arch/arm/mach-at91/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 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

obj-$(CONFIG_ARCH_AT91SAM9RL)	+= at91sam9rl_devices.o



# AT91RM9200 board-specific support

obj-$(CONFIG_MACH_ONEARM)	+= board-1arm.o
@@ -56,9 +55,6 @@ obj-$(CONFIG_MACH_AT91SAM9G10EK) += board-sam9261ek.o 
# AT91SAM9263 board-specific support

obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o



# AT91SAM9RL board-specific support

obj-$(CONFIG_MACH_AT91SAM9RLEK)	+= board-sam9rlek.o



# AT91SAM9G20 board-specific support

obj-$(CONFIG_MACH_AT91SAM9G20EK) += board-sam9g20ek.o

obj-$(CONFIG_MACH_CPU9G20)	+= board-cpu9krea.o

arch/arm/mach-at91/at91sam9rl.c

+0 −371
Original line number Diff line number Diff line
@@ -9,284 +9,13 @@ 
 * more details.

 */



#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/clk/at91_pmc.h>



#include <asm/proc-fns.h>

#include <asm/irq.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/system_misc.h>

#include <mach/cpu.h>

#include <mach/at91_dbgu.h>

#include <mach/at91sam9rl.h>

#include <mach/hardware.h>



#include "at91_aic.h"

#include "soc.h"

#include "generic.h"

#include "sam9_smc.h"

#include "pm.h"



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

 *  Clocks

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

#if defined(CONFIG_OLD_CLK_AT91)

#include "clock.h"



/*

 * The peripheral clocks.

 */

static struct clk pioA_clk = {

	.name		= "pioA_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_PIOA,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk pioB_clk = {

	.name		= "pioB_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_PIOB,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk pioC_clk = {

	.name		= "pioC_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_PIOC,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk pioD_clk = {

	.name		= "pioD_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_PIOD,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk usart0_clk = {

	.name		= "usart0_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_US0,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk usart1_clk = {

	.name		= "usart1_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_US1,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk usart2_clk = {

	.name		= "usart2_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_US2,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk usart3_clk = {

	.name		= "usart3_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_US3,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk mmc_clk = {

	.name		= "mci_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_MCI,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk twi0_clk = {

	.name		= "twi0_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_TWI0,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk twi1_clk = {

	.name		= "twi1_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_TWI1,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk spi_clk = {

	.name		= "spi_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_SPI,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk ssc0_clk = {

	.name		= "ssc0_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_SSC0,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk ssc1_clk = {

	.name		= "ssc1_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_SSC1,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk tc0_clk = {

	.name		= "tc0_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_TC0,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk tc1_clk = {

	.name		= "tc1_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_TC1,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk tc2_clk = {

	.name		= "tc2_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_TC2,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk pwm_clk = {

	.name		= "pwm_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_PWMC,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk tsc_clk = {

	.name		= "tsc_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_TSC,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk dma_clk = {

	.name		= "dma_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_DMA,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk udphs_clk = {

	.name		= "udphs_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_UDPHS,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk lcdc_clk = {

	.name		= "lcdc_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_LCDC,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk ac97_clk = {

	.name		= "ac97_clk",

	.pmc_mask	= 1 << AT91SAM9RL_ID_AC97C,

	.type		= CLK_TYPE_PERIPHERAL,

};

static struct clk adc_op_clk = {

	.name		= "adc_op_clk",

	.type		= CLK_TYPE_PERIPHERAL,

	.rate_hz	= 1000000,

};



static struct clk *periph_clocks[] __initdata = {

	&pioA_clk,

	&pioB_clk,

	&pioC_clk,

	&pioD_clk,

	&usart0_clk,

	&usart1_clk,

	&usart2_clk,

	&usart3_clk,

	&mmc_clk,

	&twi0_clk,

	&twi1_clk,

	&spi_clk,

	&ssc0_clk,

	&ssc1_clk,

	&tc0_clk,

	&tc1_clk,

	&tc2_clk,

	&pwm_clk,

	&tsc_clk,

	&dma_clk,

	&udphs_clk,

	&lcdc_clk,

	&ac97_clk,

	&adc_op_clk,

	// irq0

};



static struct clk_lookup periph_clocks_lookups[] = {

	CLKDEV_CON_DEV_ID("hclk", "at91sam9rl-lcdfb.0", &lcdc_clk),

	CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc", &utmi_clk),

	CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc", &udphs_clk),

	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("pclk", "at91rm9200_ssc.0", &ssc0_clk),

	CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.1", &ssc1_clk),

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

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

	CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.0", &twi0_clk),

	CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.1", &twi1_clk),

	CLKDEV_CON_DEV_ID(NULL, "at91sam9rl-pwm", &pwm_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),

	/* more lookup table for DT entries */

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

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

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

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

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

	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("mci_clk", "fffa4000.mmc", &mmc_clk),

	CLKDEV_CON_DEV_ID(NULL, "fffa8000.i2c", &twi0_clk),

	CLKDEV_CON_DEV_ID(NULL, "fffac000.i2c", &twi1_clk),

	CLKDEV_CON_DEV_ID(NULL, "fffc8000.pwm", &pwm_clk),

	CLKDEV_CON_DEV_ID(NULL, "ffffc800.pwm", &pwm_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),

	CLKDEV_CON_ID("adc_clk", &tsc_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 two 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 void __init at91sam9rl_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);

}

#endif



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

 *  GPIO

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



static struct at91_gpio_bank at91sam9rl_gpio[] __initdata = {

	{

		.id		= AT91SAM9RL_ID_PIOA,

		.regbase	= AT91SAM9RL_BASE_PIOA,

	}, {

		.id		= AT91SAM9RL_ID_PIOB,

		.regbase	= AT91SAM9RL_BASE_PIOB,

	}, {

		.id		= AT91SAM9RL_ID_PIOC,

		.regbase	= AT91SAM9RL_BASE_PIOC,

	}, {

		.id		= AT91SAM9RL_ID_PIOD,

		.regbase	= AT91SAM9RL_BASE_PIOD,

	}

};



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

 *  AT91SAM9RL processor initialization
@@ -309,107 +38,14 @@ static void __init at91sam9rl_map_io(void) 
	at91_init_sram(0, AT91SAM9RL_SRAM_BASE, sram_size);

}



static void __init at91sam9rl_ioremap_registers(void)

{

	at91_ioremap_ramc(0, AT91SAM9RL_BASE_SDRAMC, 512);

	at91sam926x_ioremap_pit(AT91SAM9RL_BASE_PIT);

	at91sam9_ioremap_smc(0, AT91SAM9RL_BASE_SMC);

	at91_ioremap_matrix(AT91SAM9RL_BASE_MATRIX);

	at91_pm_set_standby(at91sam9_sdram_standby);

}



static void __init at91sam9rl_initialize(void)

{

	arm_pm_idle = at91sam9_idle;



	at91_sysirq_mask_rtc(AT91SAM9RL_BASE_RTC);

	at91_sysirq_mask_rtt(AT91SAM9RL_BASE_RTT);



	/* Register GPIO subsystem */

	at91_gpio_init(at91sam9rl_gpio, 4);

}



static struct resource rstc_resources[] = {

	[0] = {

		.start  = AT91SAM9RL_BASE_RSTC,

		.end    = AT91SAM9RL_BASE_RSTC + SZ_16 - 1,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = AT91SAM9RL_BASE_SDRAMC,

		.end    = AT91SAM9RL_BASE_SDRAMC + 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  = AT91SAM9RL_BASE_SHDWC,

		.end    = AT91SAM9RL_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 at91sam9rl_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 at91sam9rl_default_irq_priority[NR_AIC_IRQS] __initdata = {

	7,	/* Advanced Interrupt Controller */

	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 */

	6,	/* Two-Wire Interface 0 */

	6,	/* Two-Wire Interface 1 */

	5,	/* Serial Peripheral Interface */

	4,	/* Serial Synchronous Controller 0 */

	4,	/* Serial Synchronous Controller 1 */

	0,	/* Timer Counter 0 */

	0,	/* Timer Counter 1 */

	0,	/* Timer Counter 2 */

	0,

	0,	/* Touch Screen Controller */

	0,	/* DMA Controller */

	2,	/* USB Device High speed port */

	2,	/* LCD Controller */

	6,	/* AC97 Controller */

	0,

	0,

	0,

	0,

	0,

	0,

	0,	/* Advanced Interrupt Controller */

};



static void __init at91sam9rl_init_time(void)

{

	at91sam926x_pit_init(NR_IRQS_LEGACY + AT91_ID_SYS);
@@ -417,13 +53,6 @@ static void __init at91sam9rl_init_time(void) 


AT91_SOC_START(at91sam9rl)

	.map_io = at91sam9rl_map_io,

	.default_irq_priority = at91sam9rl_default_irq_priority,

	.extern_irq = (1 << AT91SAM9RL_ID_IRQ0),

	.ioremap_registers = at91sam9rl_ioremap_registers,

#if defined(CONFIG_OLD_CLK_AT91)

	.register_clocks = at91sam9rl_register_clocks,

#endif

	.register_devices = at91sam9rl_register_devices,

	.init = at91sam9rl_initialize,

	.init_time = at91sam9rl_init_time,

AT91_SOC_END