diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-01-05 17:14:22 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-01-05 17:14:22 +0100 |
| commit | 4209324a74fd234fa44bb18a3331356e41df773a (patch) | |
| tree | 63152c5482ceb45f1440a8c0659b191ee905eaf3 | |
| parent | 0e490050902adaca9b30275ec9a544a786bf2db8 (diff) | |
| download | kernel_samsung_tuna-4209324a74fd234fa44bb18a3331356e41df773a.zip kernel_samsung_tuna-4209324a74fd234fa44bb18a3331356e41df773a.tar.gz kernel_samsung_tuna-4209324a74fd234fa44bb18a3331356e41df773a.tar.bz2 | |
avr32: data param to at32_add_device_mci() must be non-NULL
at32_add_device_mci() will refuse to add the mci device if the data
parameter is NULL. Fix up the favr-32 and hammerhead boards so that this
doesn't happen.
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Cc: Alex Raimondi <mailinglist@miromico.ch>
Cc: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
| -rw-r--r-- | arch/avr32/boards/favr-32/setup.c | 11 | ||||
| -rw-r--r-- | arch/avr32/boards/hammerhead/setup.c | 11 |
2 files changed, 20 insertions, 2 deletions
diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c index 1a12930..745c408 100644 --- a/arch/avr32/boards/favr-32/setup.c +++ b/arch/avr32/boards/favr-32/setup.c @@ -17,6 +17,7 @@ #include <linux/linkage.h> #include <linux/gpio.h> #include <linux/leds.h> +#include <linux/atmel-mci.h> #include <linux/atmel-pwm-bl.h> #include <linux/spi/spi.h> #include <linux/spi/ads7846.h> @@ -79,6 +80,14 @@ static struct spi_board_info __initdata spi1_board_info[] = { }, }; +static struct mci_platform_data __initdata mci0_data = { + .slot[0] = { + .bus_width = 4, + .detect_pin = -ENODEV, + .wp_pin = -ENODEV, + }, +}; + static struct fb_videomode __initdata lb104v03_modes[] = { { .name = "640x480 @ 50", @@ -321,7 +330,7 @@ static int __init favr32_init(void) at32_add_device_pwm(1 << atmel_pwm_bl_pdata.pwm_channel); at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info)); - at32_add_device_mci(0, NULL); + at32_add_device_mci(0, &mci0_data); at32_add_device_usba(0, NULL); at32_add_device_lcdc(0, &favr32_lcdc_data, fbmem_start, fbmem_size, 0); diff --git a/arch/avr32/boards/hammerhead/setup.c b/arch/avr32/boards/hammerhead/setup.c index af45c26..4d2fe82 100644 --- a/arch/avr32/boards/hammerhead/setup.c +++ b/arch/avr32/boards/hammerhead/setup.c @@ -7,6 +7,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ +#include <linux/atmel-mci.h> #include <linux/clk.h> #include <linux/fb.h> #include <linux/etherdevice.h> @@ -86,6 +87,14 @@ struct atmel_lcdfb_info __initdata hammerhead_lcdc_data = { }; #endif +static struct mci_platform_data __initdata mci0_data = { + .slot[0] = { + .bus_width = 4, + .detect_pin = -ENODEV, + .wp_pin = -ENODEV, + }, +}; + struct eth_addr { u8 addr[6]; }; @@ -204,7 +213,7 @@ static int __init hammerhead_init(void) #ifdef CONFIG_BOARD_HAMMERHEAD_FPGA at32_add_device_hh_fpga(); #endif - at32_add_device_mci(0, NULL); + at32_add_device_mci(0, &mci0_data); #ifdef CONFIG_BOARD_HAMMERHEAD_USB at32_add_device_usba(0, NULL); |