Skip to content

Commit

Permalink
AT91: at91sam9261ek board: remove warnings related to use of SPI or S…
Browse files Browse the repository at this point in the history
…D/MMC

The sd/mmc data structure is not used if SPI is selected. The configuration
of PIO on the board prevent from using both interfaces at the same time
(board dependent).
Remove the warnings at compilation time adding a preprocessor condition.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
  • Loading branch information
Nicolas Ferre committed Sep 10, 2010
1 parent 1879c45 commit 64d72bb
Showing 1 changed file with 19 additions and 11 deletions.
30 changes: 19 additions & 11 deletions arch/arm/mach-at91/board-sam9261ek.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,17 +168,6 @@ static struct at91_udc_data __initdata ek_udc_data = {
};


/*
* MCI (SD/MMC)
*/
static struct at91_mmc_data __initdata ek_mmc_data = {
.wire4 = 1,
// .det_pin = ... not connected
// .wp_pin = ... not connected
// .vcc_pin = ... not connected
};


/*
* NAND flash
*/
Expand Down Expand Up @@ -247,6 +236,10 @@ static void __init ek_add_device_nand(void)
at91_add_device_nand(&ek_nand_data);
}

/*
* SPI related devices
*/
#if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)

/*
* ADS7846 Touchscreen
Expand Down Expand Up @@ -357,6 +350,21 @@ static struct spi_board_info ek_spi_devices[] = {
#endif
};

#else /* CONFIG_SPI_ATMEL_* */

/*
* MCI (SD/MMC)
* spi0 and mmc/sd share the same PIO pins: cannot be used at the same time
*/
static struct at91_mmc_data __initdata ek_mmc_data = {
.wire4 = 1,
// .det_pin = ... not connected
// .wp_pin = ... not connected
// .vcc_pin = ... not connected
};

#endif /* CONFIG_SPI_ATMEL_* */


/*
* LCD Controller
Expand Down

0 comments on commit 64d72bb

Please sign in to comment.