Hello Ralf,
I also made a patch for v2.6.
Please apply this patch to CVS tree.
Thanks,
Yoichi
On Fri, 25 Jul 2003 15:47:35 +0900
Yoichi Yuasa <yuasa@hh.iij4u.or.jp> wrote:
> Hello Ralf,
>
> I made a patch about IDE common routine for NEC VR41xx.
>
> Please apply this patch to v2.4 CVS tree.
>
> Yoichi
>
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/casio-e55/Makefile linux/arch/mips/vr41xx/casio-e55/Makefile
--- linux.orig/arch/mips/vr41xx/casio-e55/Makefile Sat Jun 14 00:32:27 2003
+++ linux/arch/mips/vr41xx/casio-e55/Makefile Tue Jul 29 23:35:49 2003
@@ -3,5 +3,3 @@
#
obj-y += init.o setup.o
-
-obj-$(CONFIG_IDE) += ide-e55.o
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/casio-e55/ide-e55.c linux/arch/mips/vr41xx/casio-e55/ide-e55.c
--- linux.orig/arch/mips/vr41xx/casio-e55/ide-e55.c Fri Oct 4 01:57:50 2002
+++ linux/arch/mips/vr41xx/casio-e55/ide-e55.c Thu Jan 1 09:00:00 1970
@@ -1,99 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * IDE routines for typical pc-like standard configurations
- * for the CASIO CASSIOPEIA E-55/65.
- *
- * Copyright (C) 1998, 1999, 2001 by Ralf Baechle
- */
-/*
- * Changes:
- * Yoichi Yuasa <yuasa@hh.iij4u.or.jp> Sun, 24 Feb 2002
- * - Added CASIO CASSIOPEIA E-55/65 support.
- */
-#include <linux/sched.h>
-#include <linux/ide.h>
-#include <linux/ioport.h>
-#include <linux/hdreg.h>
-#include <asm/ptrace.h>
-#include <asm/hdreg.h>
-
-static int e55_ide_default_irq(ide_ioreg_t base)
-{
- return 40;
-}
-
-static ide_ioreg_t e55_ide_default_io_base(int index)
-{
- switch (index) {
- case 0: return 0xc1f0;
- case 1: return 0xc170;
- case 2: return 0xc1e8;
- case 3: return 0xc168;
- case 4: return 0xc1e0;
- case 5: return 0xc160;
- }
- return 0;
-}
-
-static void e55_ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port,
- ide_ioreg_t ctrl_port, int *irq)
-{
- ide_ioreg_t reg = data_port;
- int i;
-
- for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
- hw->io_ports[i] = reg;
- reg += 1;
- }
- if (ctrl_port) {
- hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
- } else {
- hw->io_ports[IDE_CONTROL_OFFSET] = hw->io_ports[IDE_DATA_OFFSET] + 0x206;
- }
- if (irq != NULL)
- *irq = 0;
- hw->io_ports[IDE_IRQ_OFFSET] = 0;
-}
-
-static int e55_ide_request_irq(unsigned int irq,
- void (*handler)(int,void *, struct pt_regs *),
- unsigned long flags, const char *device,
- void *dev_id)
-{
- return request_irq(irq, handler, flags, device, dev_id);
-}
-
-static void e55_ide_free_irq(unsigned int irq, void *dev_id)
-{
- free_irq(irq, dev_id);
-}
-
-static int e55_ide_check_region(ide_ioreg_t from, unsigned int extent)
-{
- return check_region(from, extent);
-}
-
-static void e55_ide_request_region(ide_ioreg_t from, unsigned int extent,
- const char *name)
-{
- request_region(from, extent, name);
-}
-
-static void e55_ide_release_region(ide_ioreg_t from, unsigned int extent)
-{
- release_region(from, extent);
-}
-
-struct ide_ops e55_ide_ops = {
- &e55_ide_default_irq,
- &e55_ide_default_io_base,
- &e55_ide_init_hwif_ports,
- &e55_ide_request_irq,
- &e55_ide_free_irq,
- &e55_ide_check_region,
- &e55_ide_request_region,
- &e55_ide_release_region
-};
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/casio-e55/setup.c linux/arch/mips/vr41xx/casio-e55/setup.c
--- linux.orig/arch/mips/vr41xx/casio-e55/setup.c Thu Nov 7 21:37:26 2002
+++ linux/arch/mips/vr41xx/casio-e55/setup.c Tue Jul 29 23:38:53 2003
@@ -31,10 +31,6 @@
extern void * __rd_start, * __rd_end;
#endif
-#ifdef CONFIG_BLK_DEV_IDE
-extern struct ide_ops e55_ide_ops;
-#endif
-
void __init casio_e55_setup(void)
{
set_io_port_base(IO_PORT_BASE);
@@ -60,8 +56,8 @@
conswitchp = &dummy_con;
#endif
-#ifdef CONFIG_BLK_DEV_IDE
- ide_ops = &e55_ide_ops;
+#if defined(CONFIG_IDE) || defined(CONFIG_IDE_MODULE)
+ ide_ops = &vr41xx_ide_ops;
#endif
vr41xx_bcu_init();
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/common/Makefile linux/arch/mips/vr41xx/common/Makefile
--- linux.orig/arch/mips/vr41xx/common/Makefile Sat Jun 14 00:32:27 2003
+++ linux/arch/mips/vr41xx/common/Makefile Tue Jul 29 23:38:07 2003
@@ -6,5 +6,6 @@
obj-$(CONFIG_SERIAL_8250) += serial.o
obj-$(CONFIG_VR41XX_TIME_C) += time.o
obj-$(CONFIG_VRC4173) += vrc4173.o
+obj-$(subst m,y,$(CONFIG_IDE)) += ide.o
EXTRA_AFLAGS := $(CFLAGS)
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/common/ide.c linux/arch/mips/vr41xx/common/ide.c
--- linux.orig/arch/mips/vr41xx/common/ide.c Thu Jan 1 09:00:00 1970
+++ linux/arch/mips/vr41xx/common/ide.c Tue Jul 29 23:37:42 2003
@@ -0,0 +1,50 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * IDE routines for NEC VR4100 series standard configurations.
+ *
+ * Copyright (C) 1998, 1999, 2001 by Ralf Baechle
+ * Copyright (C) 2003 Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
+ */
+#include <linux/hdreg.h>
+#include <linux/ide.h>
+
+#include <asm/hdreg.h>
+
+static int vr41xx_ide_default_irq(ide_ioreg_t base)
+{
+ return 0;
+}
+
+static ide_ioreg_t vr41xx_ide_default_io_base(int index)
+{
+ return 0;
+}
+
+static void vr41xx_ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port,
+ ide_ioreg_t ctrl_port, int *irq)
+{
+ ide_ioreg_t reg = data_port;
+ int i;
+
+ for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
+ hw->io_ports[i] = reg;
+ reg += 1;
+ }
+ if (ctrl_port) {
+ hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
+ } else {
+ hw->io_ports[IDE_CONTROL_OFFSET] = hw->io_ports[IDE_DATA_OFFSET] + 0x206;
+ }
+ if (irq != NULL)
+ *irq = 0;
+ hw->io_ports[IDE_IRQ_OFFSET] = 0;
+}
+
+struct ide_ops vr41xx_ide_ops = {
+ .ide_default_irq = &vr41xx_ide_default_irq,
+ .ide_default_io_base = &vr41xx_ide_default_io_base,
+ .ide_init_hwif_ports = &vr41xx_ide_init_hwif_ports
+};
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/ibm-workpad/Makefile linux/arch/mips/vr41xx/ibm-workpad/Makefile
--- linux.orig/arch/mips/vr41xx/ibm-workpad/Makefile Sat Jun 14 00:32:27 2003
+++ linux/arch/mips/vr41xx/ibm-workpad/Makefile Tue Jul 29 23:36:13 2003
@@ -3,4 +3,3 @@
#
obj-y += init.o setup.o
-obj-$(CONFIG_IDE) += ide-workpad.o
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/ibm-workpad/ide-workpad.c linux/arch/mips/vr41xx/ibm-workpad/ide-workpad.c
--- linux.orig/arch/mips/vr41xx/ibm-workpad/ide-workpad.c Fri Oct 4 01:57:50 2002
+++ linux/arch/mips/vr41xx/ibm-workpad/ide-workpad.c Thu Jan 1 09:00:00 1970
@@ -1,98 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * IDE routines for typical pc-like standard configurations for the IBM WorkPad z50.
- *
- * Copyright (C) 1998, 1999, 2001 by Ralf Baechle
- */
-/*
- * Changes:
- * Yoichi Yuasa <yuasa@hh.iij4u.or.jp> Sun, 24 Feb 2002
- * - Added IBM WorkPad z50 support.
- */
-#include <linux/sched.h>
-#include <linux/ide.h>
-#include <linux/ioport.h>
-#include <linux/hdreg.h>
-#include <asm/ptrace.h>
-#include <asm/hdreg.h>
-
-static int workpad_ide_default_irq(ide_ioreg_t base)
-{
- return 49;
-}
-
-static ide_ioreg_t workpad_ide_default_io_base(int index)
-{
- switch (index) {
- case 0: return 0x1f0;
- case 1: return 0x170;
- case 2: return 0x1e8;
- case 3: return 0x168;
- case 4: return 0x1e0;
- case 5: return 0x160;
- }
- return 0;
-}
-
-static void workpad_ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port,
- ide_ioreg_t ctrl_port, int *irq)
-{
- ide_ioreg_t reg = data_port;
- int i;
-
- for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
- hw->io_ports[i] = reg;
- reg += 1;
- }
- if (ctrl_port) {
- hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
- } else {
- hw->io_ports[IDE_CONTROL_OFFSET] = hw->io_ports[IDE_DATA_OFFSET] + 0x206;
- }
- if (irq != NULL)
- *irq = 0;
- hw->io_ports[IDE_IRQ_OFFSET] = 0;
-}
-
-static int workpad_ide_request_irq(unsigned int irq,
- void (*handler)(int,void *, struct pt_regs *),
- unsigned long flags, const char *device,
- void *dev_id)
-{
- return request_irq(irq, handler, SA_SHIRQ, device, dev_id);
-}
-
-static void workpad_ide_free_irq(unsigned int irq, void *dev_id)
-{
- free_irq(irq, dev_id);
-}
-
-static int workpad_ide_check_region(ide_ioreg_t from, unsigned int extent)
-{
- return check_region(from, extent);
-}
-
-static void workpad_ide_request_region(ide_ioreg_t from, unsigned int extent,
- const char *name)
-{
- request_region(from, extent, name);
-}
-
-static void workpad_ide_release_region(ide_ioreg_t from, unsigned int extent)
-{
- release_region(from, extent);
-}
-
-struct ide_ops workpad_ide_ops = {
- &workpad_ide_default_irq,
- &workpad_ide_default_io_base,
- &workpad_ide_init_hwif_ports,
- &workpad_ide_request_irq,
- &workpad_ide_free_irq,
- &workpad_ide_check_region,
- &workpad_ide_request_region,
- &workpad_ide_release_region
-};
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/ibm-workpad/setup.c linux/arch/mips/vr41xx/ibm-workpad/setup.c
--- linux.orig/arch/mips/vr41xx/ibm-workpad/setup.c Thu Nov 7 21:37:26 2002
+++ linux/arch/mips/vr41xx/ibm-workpad/setup.c Tue Jul 29 23:39:15 2003
@@ -31,10 +31,6 @@
extern void * __rd_start, * __rd_end;
#endif
-#ifdef CONFIG_BLK_DEV_IDE
-extern struct ide_ops workpad_ide_ops;
-#endif
-
void __init ibm_workpad_setup(void)
{
set_io_port_base(IO_PORT_BASE);
@@ -60,8 +56,8 @@
conswitchp = &dummy_con;
#endif
-#ifdef CONFIG_BLK_DEV_IDE
- ide_ops = &workpad_ide_ops;
+#if defined(CONFIG_IDE) || defined(CONFIG_IDE_MODULE)
+ ide_ops = &vr41xx_ide_ops;
#endif
vr41xx_bcu_init();
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/nec-eagle/Makefile linux/arch/mips/vr41xx/nec-eagle/Makefile
--- linux.orig/arch/mips/vr41xx/nec-eagle/Makefile Sat Jun 14 00:32:27 2003
+++ linux/arch/mips/vr41xx/nec-eagle/Makefile Tue Jul 29 23:36:25 2003
@@ -8,4 +8,3 @@
#
obj-y += init.o irq.o setup.o
-obj-$(CONFIG_IDE) += ide-eagle.o
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/nec-eagle/ide-eagle.c linux/arch/mips/vr41xx/nec-eagle/ide-eagle.c
--- linux.orig/arch/mips/vr41xx/nec-eagle/ide-eagle.c Tue Aug 6 09:08:58 2002
+++ linux/arch/mips/vr41xx/nec-eagle/ide-eagle.c Thu Jan 1 09:00:00 1970
@@ -1,96 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * IDE routines for typical pc-like standard configurations
- * for the NEC Eagle/Hawk board.
- *
- * Copyright (C) 1998, 1999, 2001 by Ralf Baechle
- */
-/*
- * Changes:
- * MontaVista Software Inc. <yyuasa@mvista.com> or <source@mvista.com>
- * Fri, 5 Apr 2002
- * - Added support for NEC Hawk.
- *
- * MontaVista Software Inc. <yyuasa@mvista.com> or <source@mvista.com>
- * Fri, 1 Mar 2002
- * - Added support for NEC Eagle.
- */
-#include <linux/sched.h>
-#include <linux/ide.h>
-#include <linux/ioport.h>
-#include <linux/hdreg.h>
-#include <asm/ptrace.h>
-#include <asm/hdreg.h>
-
-static int eagle_ide_default_irq(ide_ioreg_t base)
-{
- return 0;
-}
-
-static ide_ioreg_t eagle_ide_default_io_base(int index)
-{
- return 0;
-}
-
-static void eagle_ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port,
- ide_ioreg_t ctrl_port, int *irq)
-{
- ide_ioreg_t reg = data_port;
- int i;
-
- for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
- hw->io_ports[i] = reg;
- reg += 1;
- }
- if (ctrl_port) {
- hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
- } else {
- hw->io_ports[IDE_CONTROL_OFFSET] = hw->io_ports[IDE_DATA_OFFSET] + 0x206;
- }
- if (irq != NULL)
- *irq = 0;
- hw->io_ports[IDE_IRQ_OFFSET] = 0;
-}
-
-static int eagle_ide_request_irq(unsigned int irq,
- void (*handler)(int,void *, struct pt_regs *),
- unsigned long flags, const char *device,
- void *dev_id)
-{
- return request_irq(irq, handler, SA_SHIRQ, device, dev_id);
-}
-
-static void eagle_ide_free_irq(unsigned int irq, void *dev_id)
-{
- free_irq(irq, dev_id);
-}
-
-static int eagle_ide_check_region(ide_ioreg_t from, unsigned int extent)
-{
- return check_region(from, extent);
-}
-
-static void eagle_ide_request_region(ide_ioreg_t from, unsigned int extent,
- const char *name)
-{
- request_region(from, extent, name);
-}
-
-static void eagle_ide_release_region(ide_ioreg_t from, unsigned int extent)
-{
- release_region(from, extent);
-}
-
-struct ide_ops eagle_ide_ops = {
- &eagle_ide_default_irq,
- &eagle_ide_default_io_base,
- &eagle_ide_init_hwif_ports,
- &eagle_ide_request_irq,
- &eagle_ide_free_irq,
- &eagle_ide_check_region,
- &eagle_ide_request_region,
- &eagle_ide_release_region
-};
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/nec-eagle/setup.c linux/arch/mips/vr41xx/nec-eagle/setup.c
--- linux.orig/arch/mips/vr41xx/nec-eagle/setup.c Sun Dec 29 23:50:56 2002
+++ linux/arch/mips/vr41xx/nec-eagle/setup.c Tue Jul 29 23:39:41 2003
@@ -58,10 +58,6 @@
extern void * __rd_start, * __rd_end;
#endif
-#ifdef CONFIG_BLK_DEV_IDE
-extern struct ide_ops eagle_ide_ops;
-#endif
-
extern void eagle_irq_init(void);
#ifdef CONFIG_PCI
@@ -141,8 +137,8 @@
conswitchp = &dummy_con;
#endif
-#ifdef CONFIG_BLK_DEV_IDE
- ide_ops = &eagle_ide_ops;
+#if defined(CONFIG_IDE) || defined(CONFIG_IDE_MODULE)
+ ide_ops = &vr41xx_ide_ops;
#endif
vr41xx_bcu_init();
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/tanbac-tb0226/setup.c linux/arch/mips/vr41xx/tanbac-tb0226/setup.c
--- linux.orig/arch/mips/vr41xx/tanbac-tb0226/setup.c Thu Apr 24 00:27:49 2003
+++ linux/arch/mips/vr41xx/tanbac-tb0226/setup.c Tue Jul 29 23:39:59 2003
@@ -16,7 +16,6 @@
#include <linux/config.h>
#include <linux/init.h>
#include <linux/console.h>
-#include <linux/ide.h>
#include <linux/ioport.h>
#include <asm/pci_channel.h>
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/victor-mpc30x/Makefile linux/arch/mips/vr41xx/victor-mpc30x/Makefile
--- linux.orig/arch/mips/vr41xx/victor-mpc30x/Makefile Sat Jun 14 00:32:27 2003
+++ linux/arch/mips/vr41xx/victor-mpc30x/Makefile Tue Jul 29 23:37:00 2003
@@ -3,4 +3,3 @@
#
obj-y += init.o setup.o
-obj-$(CONFIG_IDE) += ide-mpc30x.o
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/victor-mpc30x/ide-mpc30x.c linux/arch/mips/vr41xx/victor-mpc30x/ide-mpc30x.c
--- linux.orig/arch/mips/vr41xx/victor-mpc30x/ide-mpc30x.c Fri Oct 4 01:57:50 2002
+++ linux/arch/mips/vr41xx/victor-mpc30x/ide-mpc30x.c Thu Jan 1 09:00:00 1970
@@ -1,91 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * IDE routines for typical pc-like standard configurations
- * for the ZAO Networks Capcella.
- *
- * Copyright (C) 1998, 1999, 2001 by Ralf Baechle
- */
-/*
- * Changes:
- * Yoichi Yuasa <yuasa@hh.iij4u.or.jp> Fri, 23 Aug 2002
- * - Added Victor MP-C303/304 support.
- */
-#include <linux/sched.h>
-#include <linux/ide.h>
-#include <linux/ioport.h>
-#include <linux/hdreg.h>
-#include <asm/ptrace.h>
-#include <asm/hdreg.h>
-
-static int mpc30x_ide_default_irq(ide_ioreg_t base)
-{
- return 0;
-}
-
-static ide_ioreg_t mpc30x_ide_default_io_base(int index)
-{
- return 0;
-}
-
-static void mpc30x_ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port,
- ide_ioreg_t ctrl_port, int *irq)
-{
- ide_ioreg_t reg = data_port;
- int i;
-
- for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
- hw->io_ports[i] = reg;
- reg += 1;
- }
- if (ctrl_port) {
- hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
- } else {
- hw->io_ports[IDE_CONTROL_OFFSET] = hw->io_ports[IDE_DATA_OFFSET] + 0x206;
- }
- if (irq != NULL)
- *irq = 0;
- hw->io_ports[IDE_IRQ_OFFSET] = 0;
-}
-
-static int mpc30x_ide_request_irq(unsigned int irq,
- void (*handler)(int,void *, struct pt_regs *),
- unsigned long flags, const char *device,
- void *dev_id)
-{
- return request_irq(irq, handler, flags, device, dev_id);
-}
-
-static void mpc30x_ide_free_irq(unsigned int irq, void *dev_id)
-{
- free_irq(irq, dev_id);
-}
-
-static int mpc30x_ide_check_region(ide_ioreg_t from, unsigned int extent)
-{
- return check_region(from, extent);
-}
-
-static void mpc30x_ide_request_region(ide_ioreg_t from, unsigned int extent,
- const char *name)
-{
- request_region(from, extent, name);
-}
-
-static void mpc30x_ide_release_region(ide_ioreg_t from, unsigned int extent)
-{
- release_region(from, extent);
-}
-
-struct ide_ops mpc30x_ide_ops = {
- &mpc30x_ide_default_irq,
- &mpc30x_ide_default_io_base,
- &mpc30x_ide_init_hwif_ports,
- &mpc30x_ide_request_irq,
- &mpc30x_ide_free_irq,
- &mpc30x_ide_check_region,
- &mpc30x_ide_request_region,
- &mpc30x_ide_release_region
-};
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/victor-mpc30x/setup.c linux/arch/mips/vr41xx/victor-mpc30x/setup.c
--- linux.orig/arch/mips/vr41xx/victor-mpc30x/setup.c Thu Nov 7 21:37:26 2002
+++ linux/arch/mips/vr41xx/victor-mpc30x/setup.c Tue Jul 29 23:40:28 2003
@@ -32,10 +32,6 @@
extern void * __rd_start, * __rd_end;
#endif
-#ifdef CONFIG_BLK_DEV_IDE
-extern struct ide_ops mpc30x_ide_ops;
-#endif
-
#ifdef CONFIG_PCI
static struct resource vr41xx_pci_io_resource = {
"PCI I/O space",
@@ -108,8 +104,8 @@
conswitchp = &dummy_con;
#endif
-#ifdef CONFIG_BLK_DEV_IDE
- ide_ops = &mpc30x_ide_ops;
+#if defined(CONFIG_IDE) || defined(CONFIG_IDE_MODULE)
+ ide_ops = &vr41xx_ide_ops;
#endif
vr41xx_bcu_init();
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/zao-capcella/Makefile linux/arch/mips/vr41xx/zao-capcella/Makefile
--- linux.orig/arch/mips/vr41xx/zao-capcella/Makefile Sat Jun 14 00:32:27 2003
+++ linux/arch/mips/vr41xx/zao-capcella/Makefile Tue Jul 29 23:37:20 2003
@@ -3,4 +3,3 @@
#
obj-y += init.o setup.o
-obj-$(CONFIG_IDE) += ide-capcella.o
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/zao-capcella/ide-capcella.c linux/arch/mips/vr41xx/zao-capcella/ide-capcella.c
--- linux.orig/arch/mips/vr41xx/zao-capcella/ide-capcella.c Tue Aug 6 09:08:58 2002
+++ linux/arch/mips/vr41xx/zao-capcella/ide-capcella.c Thu Jan 1 09:00:00 1970
@@ -1,99 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * IDE routines for typical pc-like standard configurations
- * for the ZAO Networks Capcella.
- *
- * Copyright (C) 1998, 1999, 2001 by Ralf Baechle
- */
-/*
- * Changes:
- * Yoichi Yuasa <yuasa@hh.iij4u.or.jp> Sun, 24 Feb 2002
- * - Added ZAO Networks Capcella support.
- */
-#include <linux/sched.h>
-#include <linux/ide.h>
-#include <linux/ioport.h>
-#include <linux/hdreg.h>
-#include <asm/ptrace.h>
-#include <asm/hdreg.h>
-
-static int capcella_ide_default_irq(ide_ioreg_t base)
-{
- switch (base) {
- case 0x8300: return 42;
- }
-
- return 0;
-}
-
-static ide_ioreg_t capcella_ide_default_io_base(int index)
-{
- switch (index) {
- case 0: return 0x8300;
- }
-
- return 0;
-}
-
-static void capcella_ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port,
- ide_ioreg_t ctrl_port, int *irq)
-{
- ide_ioreg_t reg = data_port;
- int i;
-
- for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
- hw->io_ports[i] = reg;
- reg += 1;
- }
- if (ctrl_port) {
- hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
- } else {
- hw->io_ports[IDE_CONTROL_OFFSET] = hw->io_ports[IDE_DATA_OFFSET] + 0x206;
- }
- if (irq != NULL)
- *irq = 0;
- hw->io_ports[IDE_IRQ_OFFSET] = 0;
-}
-
-static int capcella_ide_request_irq(unsigned int irq,
- void (*handler)(int,void *, struct pt_regs *),
- unsigned long flags, const char *device,
- void *dev_id)
-{
- return request_irq(irq, handler, flags, device, dev_id);
-}
-
-static void capcella_ide_free_irq(unsigned int irq, void *dev_id)
-{
- free_irq(irq, dev_id);
-}
-
-static int capcella_ide_check_region(ide_ioreg_t from, unsigned int extent)
-{
- return check_region(from, extent);
-}
-
-static void capcella_ide_request_region(ide_ioreg_t from, unsigned int extent,
- const char *name)
-{
- request_region(from, extent, name);
-}
-
-static void capcella_ide_release_region(ide_ioreg_t from, unsigned int extent)
-{
- release_region(from, extent);
-}
-
-struct ide_ops capcella_ide_ops = {
- &capcella_ide_default_irq,
- &capcella_ide_default_io_base,
- &capcella_ide_init_hwif_ports,
- &capcella_ide_request_irq,
- &capcella_ide_free_irq,
- &capcella_ide_check_region,
- &capcella_ide_request_region,
- &capcella_ide_release_region
-};
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/arch/mips/vr41xx/zao-capcella/setup.c linux/arch/mips/vr41xx/zao-capcella/setup.c
--- linux.orig/arch/mips/vr41xx/zao-capcella/setup.c Thu Nov 7 21:37:26 2002
+++ linux/arch/mips/vr41xx/zao-capcella/setup.c Tue Jul 29 23:40:54 2003
@@ -32,10 +32,6 @@
extern void * __rd_start, * __rd_end;
#endif
-#ifdef CONFIG_BLK_DEV_IDE
-extern struct ide_ops capcella_ide_ops;
-#endif
-
#ifdef CONFIG_PCI
static struct resource vr41xx_pci_io_resource = {
"PCI I/O space",
@@ -108,8 +104,8 @@
conswitchp = &dummy_con;
#endif
-#ifdef CONFIG_BLK_DEV_IDE
- ide_ops = &capcella_ide_ops;
+#if defined(CONFIG_IDE) || defined(CONFIG_IDE_MODULE)
+ ide_ops = &vr41xx_ide_ops;
#endif
vr41xx_bcu_init();
diff -aruN --exclude=CVS --exclude=.cvsignore linux.orig/include/asm-mips/vr41xx/vr41xx.h linux/include/asm-mips/vr41xx/vr41xx.h
--- linux.orig/include/asm-mips/vr41xx/vr41xx.h Mon Mar 24 00:01:42 2003
+++ linux/include/asm-mips/vr41xx/vr41xx.h Tue Jul 29 23:41:39 2003
@@ -189,4 +189,8 @@
extern void vr41xx_halt(void);
extern void vr41xx_power_off(void);
+#if defined(CONFIG_IDE) || defined(CONFIG_IDE_MODULE)
+extern struct ide_ops vr41xx_ide_ops;
+#endif
+
#endif /* __NEC_VR41XX_H */
