From 3e135466745a62b1814edef74c7b4a25e6bda707 Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Mon, 11 Jun 2012 15:38:03 +0200 Subject: ARM: at91: at91 based machines specify their own irq handler at run time SOC_AT91SAM9 selects MULTI_IRQ_HANDLER in order to let machines specify their own IRQ handler at run time. Signed-off-by: Ludovic Desroches Signed-off-by: Nicolas Ferre --- arch/arm/mach-at91/board-flexibity.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/mach-at91/board-flexibity.c') diff --git a/arch/arm/mach-at91/board-flexibity.c b/arch/arm/mach-at91/board-flexibity.c index 47658f78105..6cc83a87d77 100644 --- a/arch/arm/mach-at91/board-flexibity.c +++ b/arch/arm/mach-at91/board-flexibity.c @@ -34,6 +34,7 @@ #include #include +#include #include "generic.h" @@ -160,6 +161,7 @@ MACHINE_START(FLEXIBITY, "Flexibity Connect") /* Maintainer: Maxim Osipov */ .timer = &at91sam926x_timer, .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, -- cgit v1.2.3 From 4cf3326ab5f34a333a46c59d0d3783db9cef13bf Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Mon, 21 May 2012 12:23:27 +0200 Subject: ARM: at91: add atmel-mci support for chips and boards which can use it Since atmel-mci driver supports all atmel mci versions, use it instead of the deprecated at91_mci driver. Platform data and all related configuration are removed. Signed-off-by: Ludovic Desroches [nicolas.ferre@atmel.com: remove at91_mci platform data] Signed-off-by: Nicolas Ferre --- arch/arm/mach-at91/board-flexibity.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'arch/arm/mach-at91/board-flexibity.c') diff --git a/arch/arm/mach-at91/board-flexibity.c b/arch/arm/mach-at91/board-flexibity.c index 47658f78105..23ad652edad 100644 --- a/arch/arm/mach-at91/board-flexibity.c +++ b/arch/arm/mach-at91/board-flexibity.c @@ -74,12 +74,12 @@ static struct spi_board_info flexibity_spi_devices[] = { }; /* MCI (SD/MMC) */ -static struct at91_mmc_data __initdata flexibity_mmc_data = { - .slot_b = 0, - .wire4 = 1, - .det_pin = AT91_PIN_PC9, - .wp_pin = AT91_PIN_PC4, - .vcc_pin = -EINVAL, +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 */ @@ -151,7 +151,7 @@ static void __init flexibity_board_init(void) at91_add_device_spi(flexibity_spi_devices, ARRAY_SIZE(flexibity_spi_devices)); /* MMC */ - at91_add_device_mmc(0, &flexibity_mmc_data); + at91_add_device_mci(0, &flexibity_mci0_data); /* LEDs */ at91_gpio_leds(flexibity_leds, ARRAY_SIZE(flexibity_leds)); } -- cgit v1.2.3 From 43d2f532925cdf7fe1e4c7a48fb555705421eb66 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Tue, 30 Oct 2012 05:14:17 +0800 Subject: arm: at91 move board.h to arch/arm/mach-at91 as this is only used board old style board Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Cc: Nicolas Ferre --- arch/arm/mach-at91/board-flexibity.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-at91/board-flexibity.c') diff --git a/arch/arm/mach-at91/board-flexibity.c b/arch/arm/mach-at91/board-flexibity.c index fa98abacb1b..2df0fe4b8fd 100644 --- a/arch/arm/mach-at91/board-flexibity.c +++ b/arch/arm/mach-at91/board-flexibity.c @@ -33,9 +33,9 @@ #include #include -#include #include +#include "board.h" #include "generic.h" static void __init flexibity_init_early(void) -- cgit v1.2.3 From a510b9bacd365dbf7d20a825f34116b9833dd146 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Tue, 30 Oct 2012 06:41:28 +0800 Subject: arm: at91 move at91_aic.h to arch/arm/mach-at91 as this is only used board old style board old mach code Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Cc: Nicolas Ferre --- arch/arm/mach-at91/board-flexibity.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-at91/board-flexibity.c') diff --git a/arch/arm/mach-at91/board-flexibity.c b/arch/arm/mach-at91/board-flexibity.c index 2df0fe4b8fd..5d44eba0f20 100644 --- a/arch/arm/mach-at91/board-flexibity.c +++ b/arch/arm/mach-at91/board-flexibity.c @@ -33,8 +33,8 @@ #include #include -#include +#include "at91_aic.h" #include "board.h" #include "generic.h" -- cgit v1.2.3