---

yaml --- r: 132053 b: refs/heads/master c: 6e5f1e1 h: refs/heads/master i: 132051: b3d105f v: v3
git-mirror · Mar 5, 2009 · 1e67950 · 1e67950
1 parent 2443220
commit 1e67950
Show file tree

Hide file tree

Showing 5 changed files with 477 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 849d7130001ab740a5a4778a561049841fdd77c9
+refs/heads/master: 6e5f1e1115bb041993f9f247036996364b4c84d5
diff --git a/trunk/arch/arm/mach-at91/include/mach/board.h b/trunk/arch/arm/mach-at91/include/mach/board.h
@@ -56,6 +56,9 @@ struct at91_cf_data {
 	u8	vcc_pin;		/* power switching */
 	u8	rst_pin;		/* card reset */
 	u8	chipselect;		/* EBI Chip Select number */
+	u8	flags;
+#define AT91_CF_TRUE_IDE	0x01
+#define AT91_IDE_SWAP_A0_A2	0x02
 };
 extern void __init at91_add_device_cf(struct at91_cf_data *data);
 

diff --git a/trunk/drivers/ide/Kconfig b/trunk/drivers/ide/Kconfig
@@ -721,6 +721,11 @@ config BLK_DEV_IDE_TX4939
 	depends on SOC_TX4939
 	select BLK_DEV_IDEDMA_SFF
 
+config BLK_DEV_IDE_AT91
+	tristate "Atmel AT91 (SAM9, CAP9, AT572D940HF) IDE support"
+	depends on ARM && ARCH_AT91 && !ARCH_AT91RM9200 && !ARCH_AT91X40
+	select IDE_TIMINGS
+
 config IDE_ARM
 	tristate "ARM IDE support"
 	depends on ARM && (ARCH_RPC || ARCH_SHARK)

diff --git a/trunk/drivers/ide/Makefile b/trunk/drivers/ide/Makefile
@@ -116,3 +116,4 @@ obj-$(CONFIG_BLK_DEV_IDE_AU1XXX)	+= au1xxx-ide.o
 
 obj-$(CONFIG_BLK_DEV_IDE_TX4938)	+= tx4938ide.o
 obj-$(CONFIG_BLK_DEV_IDE_TX4939)	+= tx4939ide.o
+obj-$(CONFIG_BLK_DEV_IDE_AT91)		+= at91_ide.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -116,3 +116,4 @@ obj-$(CONFIG_BLK_DEV_IDE_AU1XXX) += au1xxx-ide.o

		obj-$(CONFIG_BLK_DEV_IDE_TX4938) += tx4938ide.o
		obj-$(CONFIG_BLK_DEV_IDE_TX4939) += tx4939ide.o
		obj-$(CONFIG_BLK_DEV_IDE_AT91) += at91_ide.o