|
@@ -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
|
|
|
*/
|
|
@@ -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
|
|
@@ -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
|