From 4209324a74fd234fa44bb18a3331356e41df773a Mon Sep 17 00:00:00 2001 From: Haavard Skinnemoen Date: Mon, 5 Jan 2009 17:14:22 +0100 Subject: 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 Cc: Alex Raimondi Cc: Hans-Christian Egtvedt --- arch/avr32/boards/hammerhead/setup.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'arch/avr32/boards/hammerhead/setup.c') diff --git a/arch/avr32/boards/hammerhead/setup.c b/arch/avr32/boards/hammerhead/setup.c index af45c26c5ff..4d2fe82b202 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 #include #include #include @@ -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); -- cgit v1.2.3-70-g09d2