[AVR32] Use per-controller spi_board_info structures

Set up one spi_board_info array per controller and pass this to
at32_add_device_spi so that it can set up any GPIO pins for chip
selects based on this information.

Extracted from a patch by David Brownell and adapted slightly.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>

1 files changed, 3 insertions, 6 deletions

diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index d47e39f0e971..5974768a59e5 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -8,7 +8,6 @@
  * published by the Free Software Foundation.
  */
 #include <linux/clk.h>
-#include <linux/device.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -36,12 +35,11 @@ static struct eth_addr __initdata hw_addr[2];
 static struct eth_platform_data __initdata eth_data[2];
 extern struct lcdc_platform_data atstk1000_fb0_data;
 
-static struct spi_board_info spi_board_info[] __initdata = {
+static struct spi_board_info spi0_board_info[] __initdata = {
         {
+                /* QVGA display */
                 .modalias       = "ltv350qv",
-                .controller_data = (void *)GPIO_PIN_PA(4),
                 .max_speed_hz   = 16000000,
-                .bus_num        = 0,
                 .chip_select    = 1,
         },
 };
@@ -149,8 +147,7 @@ static int __init atstk1002_init(void)
 
         set_hw_addr(at32_add_device_eth(0, &eth_data[0]));
 
-        spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
-        at32_add_device_spi(0);
+        at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));
         at32_add_device_lcdc(0, &atstk1000_fb0_data);
 
         return 0;