summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-24 22:53:27 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-24 22:53:27 +0200
commitac32f3238c1d95a6ebea2c312160dbdbd61bf91c (patch)
tree92ac5f6b95a292d11782c1faec81dde8acc9af70
parentb0a62817961796f6dcef5f316134d8bc7279bf6e (diff)
downloadop-kernel-dev-ac32f3238c1d95a6ebea2c312160dbdbd61bf91c.zip
op-kernel-dev-ac32f3238c1d95a6ebea2c312160dbdbd61bf91c.tar.gz
ide-generic: fix ide_default_io_base() for m32r
Fix ide_default_io_base() to match ide_default_irq(). Cc: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--include/asm-m32r/ide.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-m32r/ide.h b/include/asm-m32r/ide.h
index 1e7f647..72798d6 100644
--- a/include/asm-m32r/ide.h
+++ b/include/asm-m32r/ide.h
@@ -52,12 +52,20 @@ static __inline__ int ide_default_irq(unsigned long base)
static __inline__ unsigned long ide_default_io_base(int index)
{
switch (index) {
+#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) \
+ || defined(CONFIG_PLAT_OPSPUT)
+ case 0: return 0x1f0;
+#elif defined(CONFIG_PLAT_MAPPI3)
+ case 0: return 0x1f0;
+ case 1: return 0x170;
+#else
case 0: return 0x1f0;
case 1: return 0x170;
case 2: return 0x1e8;
case 3: return 0x168;
case 4: return 0x1e0;
case 5: return 0x160;
+#endif
default:
return 0;
}
OpenPOWER on IntegriCloud