Merge branch 'fix/asoc' into for-linus

[pandora-kernel.git] / arch / arm / mach-ixp4xx / coyote-setup.c

diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c
index 13f8a7a..25bf5ad 100644 (file)
--- a/arch/arm/mach-ixp4xx/coyote-setup.c
+++ b/arch/arm/mach-ixp4xx/coyote-setup.c
@@ -19,12 +19,21 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
 
+#define COYOTE_IDE_BASE_PHYS   IXP4XX_EXP_BUS_BASE(3)
+#define COYOTE_IDE_BASE_VIRT   0xFFFE1000
+#define COYOTE_IDE_REGION_SIZE 0x1000
+
+#define COYOTE_IDE_DATA_PORT   0xFFFE10E0
+#define COYOTE_IDE_CTRL_PORT   0xFFFE10FC
+#define COYOTE_IDE_ERROR_PORT  0xFFFE10E2
+#define IRQ_COYOTE_IDE         IRQ_IXP4XX_GPIO5
+
 static struct flash_platform_data coyote_flash_data = {
        .map_name       = "cfi_probe",
        .width          = 2,