---

yaml --- r: 113198 b: refs/heads/master c: 965ebf3 h: refs/heads/master v: v3
git-mirror · Oct 5, 2008 · bd9dde5 · bd9dde5
1 parent e53ceeb
commit bd9dde5
Show file tree

Hide file tree

Showing 3 changed files with 622 additions and 310 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b918657b7431e4c5c953b8222ae2f4fc1b2576a
+refs/heads/master: 965ebf33ea5afb6386f5b57cc71e6572253746b3
diff --git a/trunk/arch/avr32/include/asm/atmel-mci.h b/trunk/arch/avr32/include/asm/atmel-mci.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_AVR32_ATMEL_MCI_H
 #define __ASM_AVR32_ATMEL_MCI_H
 
+#define ATMEL_MCI_MAX_NR_SLOTS	2
+
 /**
  * struct mci_slot_pdata - board-specific per-slot configuration
  * @bus_width: Number of data lines wired up the slot
@@ -11,6 +13,10 @@
  * set to 0. The other fields are ignored in this case.
  *
  * Any pins that aren't available should be set to a negative value.
+ *
+ * Note that support for multiple slots is experimental -- some cards
+ * might get upset if we don't get the clock management exactly right.
+ * But in most cases, it should work just fine.
  */
 struct mci_slot_pdata {
 	unsigned int		bus_width;
@@ -23,7 +29,7 @@ struct mci_slot_pdata {
  * @slot: Per-slot configuration data.
  */
 struct mci_platform_data {
-	struct mci_slot_pdata	slot[2];
+	struct mci_slot_pdata	slot[ATMEL_MCI_MAX_NR_SLOTS];
 };
 
 #endif /* __ASM_AVR32_ATMEL_MCI_H */