From: Bartlomiej Zolnierkiewicz Date: Thu, 24 Jul 2008 20:53:27 +0000 (+0200) Subject: ide-generic: fix ide_default_io_base() for m32r X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ac32f3238c1d95a6ebea2c312160dbdbd61bf91c;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git ide-generic: fix ide_default_io_base() for m32r Fix ide_default_io_base() to match ide_default_irq(). Cc: Hirokazu Takata Signed-off-by: Bartlomiej Zolnierkiewicz --- diff --git a/include/asm-m32r/ide.h b/include/asm-m32r/ide.h index 1e7f6474d130..72798d624221 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; }