[ARM] 4478/1: AT91: Convert AT91RM9200 to use atmel_spi driver

Convert the AT91RM9200 platform-setup code to use the new atmel_spi
driver (and manually-driven chip-selects), instead of the legacy
AT91-only SPI stack.

The AT91SAM9 processors are already using the atmel_spi driver.

Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by Andrew Victor and committed by Russell King c06911c0 9a79b227

+3 -7
+3 -7
arch/arm/mach-at91/at91rm9200_devices.c
··· 477 * SPI 478 * -------------------------------------------------------------------- */ 479 480 - #if defined(CONFIG_SPI_AT91) || defined(CONFIG_SPI_AT91_MODULE) || defined(CONFIG_AT91_SPI) || defined(CONFIG_AT91_SPI_MODULE) 481 static u64 spi_dmamask = 0xffffffffUL; 482 483 static struct resource spi_resources[] = { ··· 494 }; 495 496 static struct platform_device at91rm9200_spi_device = { 497 - .name = "at91_spi", 498 .id = 0, 499 .dev = { 500 .dma_mask = &spi_dmamask, ··· 522 else 523 cs_pin = spi_standard_cs[devices[i].chip_select]; 524 525 - #ifdef CONFIG_SPI_AT91_MANUAL_CS 526 at91_set_gpio_output(cs_pin, 1); 527 - #else 528 - at91_set_A_periph(cs_pin, 0); 529 - #endif 530 531 /* pass chip-select pin to driver */ 532 devices[i].controller_data = (void *) cs_pin; 533 } 534 535 spi_register_board_info(devices, nr_devices); 536 - at91_clock_associate("spi_clk", &at91rm9200_spi_device.dev, "spi"); 537 platform_device_register(&at91rm9200_spi_device); 538 } 539 #else
··· 477 * SPI 478 * -------------------------------------------------------------------- */ 479 480 + #if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE) 481 static u64 spi_dmamask = 0xffffffffUL; 482 483 static struct resource spi_resources[] = { ··· 494 }; 495 496 static struct platform_device at91rm9200_spi_device = { 497 + .name = "atmel_spi", 498 .id = 0, 499 .dev = { 500 .dma_mask = &spi_dmamask, ··· 522 else 523 cs_pin = spi_standard_cs[devices[i].chip_select]; 524 525 + /* enable chip-select pin */ 526 at91_set_gpio_output(cs_pin, 1); 527 528 /* pass chip-select pin to driver */ 529 devices[i].controller_data = (void *) cs_pin; 530 } 531 532 spi_register_board_info(devices, nr_devices); 533 platform_device_register(&at91rm9200_spi_device); 534 } 535 #else