linux-cvs-patches
[Top] [All Lists]

CVS Update@linux-mips.org: linux

To: linux-cvs-patches@linux-mips.org
Subject: CVS Update@linux-mips.org: linux
From: ralf@linux-mips.org
Date: Thu, 19 May 2005 17:12:49 +0100
Reply-to: linux-mips@linux-mips.org
Sender: linux-cvs-patches-bounce@linux-mips.org
CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/05/19 17:12:44

Modified files:
        arch/mips/vr41xx/common: Makefile 
Removed files:
        arch/mips/vr41xx/common: vrc4171.c 
        include/asm-mips/vr41xx: vrc4171.h 

Log message:
        Delete unneeded VRc4171 initialization code.

diff -urN linux/arch/mips/vr41xx/common/Makefile 
linux/arch/mips/vr41xx/common/Makefile
--- linux/arch/mips/vr41xx/common/Makefile      2005/05/19 15:26:29     1.18
+++ linux/arch/mips/vr41xx/common/Makefile      2005/05/19 16:12:44     1.19
@@ -4,7 +4,6 @@
 
 obj-y                          += bcu.o cmu.o icu.o init.o int-handler.o pmu.o
 obj-$(CONFIG_GPIO_VR41XX)      += giu.o
-obj-$(CONFIG_VRC4171)          += vrc4171.o
 obj-$(CONFIG_VRC4173)          += vrc4173.o
 
 EXTRA_AFLAGS := $(CFLAGS)
diff -urN linux/arch/mips/vr41xx/common/vrc4171.c 
linux/arch/mips/vr41xx/common/vrc4171.c
--- linux/arch/mips/vr41xx/common/Attic/vrc4171.c       2005-05-19 
17:12:44.422067000 +0100     1.2
+++ linux/arch/mips/vr41xx/common/Attic/vrc4171.c       1970/01/01 00:00:00+0100
@@ -1,106 +0,0 @@
-/*
- *  vrc4171.c, NEC VRC4171 base driver.
- *
- *  Copyright (C) 2003  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#include <linux/init.h>
-#include <linux/ioport.h>
-#include <linux/module.h>
-#include <linux/types.h>
-
-#include <asm/io.h>
-#include <asm/vr41xx/vrc4171.h>
-
-MODULE_DESCRIPTION("NEC VRC4171 base driver");
-MODULE_AUTHOR("Yoichi Yuasa <yuasa@hh.iij4u.or.jp>");
-MODULE_LICENSE("GPL");
-
-EXPORT_SYMBOL_GPL(vrc4171_get_irq_status);
-EXPORT_SYMBOL_GPL(vrc4171_set_multifunction_pin);
-
-#define CONFIGURATION1         0x05fe
- #define SLOTB_CONFIG          0xc000
- #define SLOTB_NONE            0x0000
- #define SLOTB_PCCARD          0x4000
- #define SLOTB_CF              0x8000
- #define SLOTB_FLASHROM                0xc000
-
-#define CONFIGURATION2         0x05fc
-#define INTERRUPT_STATUS       0x05fa
-#define PCS_CONTROL            0x05ee
-#define GPIO_DATA              PCS_CONTROL
-#define PCS0_UPPER_START       0x05ec
-#define PCS0_LOWER_START       0x05ea
-#define PCS0_UPPER_STOP                0x05e8
-#define PCS0_LOWER_STOP                0x05e6
-#define PCS1_UPPER_START       0x05e4
-#define PCS1_LOWER_START       0x05e2
-#define PCS1_UPPER_STOP                0x05de
-#define PCS1_LOWER_STOP                0x05dc
-
-#define VRC4171_REGS_BASE      PCS1_LOWER_STOP
-#define VRC4171_REGS_SIZE      0x24
-
-uint16_t vrc4171_get_irq_status(void)
-{
-       return inw(INTERRUPT_STATUS);
-}
-
-void vrc4171_set_multifunction_pin(int config)
-{
-       uint16_t config1;
-
-       config1 = inw(CONFIGURATION1);
-       config1 &= ~SLOTB_CONFIG;
-
-       switch (config) {
-       case SLOTB_IS_NONE:
-               config1 |= SLOTB_NONE;
-               break;
-       case SLOTB_IS_PCCARD:
-               config1 |= SLOTB_PCCARD;
-               break;
-       case SLOTB_IS_CF:
-               config1 |= SLOTB_CF;
-               break;
-       case SLOTB_IS_FLASHROM:
-               config1 |= SLOTB_FLASHROM;
-               break;
-       default:
-               break;
-       }
-
-       outw(config1, CONFIGURATION1);
-}
-
-static int __devinit vrc4171_init(void)
-{
-       if (request_region(VRC4171_REGS_BASE, VRC4171_REGS_SIZE, "NEC VRC4171") 
== NULL)
-               return -EBUSY;
-
-       printk(KERN_INFO "NEC VRC4171 base driver\n");
-
-       return 0;
-}
-
-static void __devexit vrc4171_exit(void)
-{
-       release_region(VRC4171_REGS_BASE, VRC4171_REGS_SIZE);
-}
-
-module_init(vrc4171_init);
-module_exit(vrc4171_exit);
diff -urN linux/include/asm-mips/vr41xx/vrc4171.h 
linux/include/asm-mips/vr41xx/vrc4171.h
--- linux/include/asm-mips/vr41xx/Attic/vrc4171.h       2005-05-19 
17:12:44.481906000 +0100     1.2
+++ linux/include/asm-mips/vr41xx/Attic/vrc4171.h       1970/01/01 00:00:00+0100
@@ -1,43 +0,0 @@
-/*
- *  vrc4171.h, Include file for NEC VRC4171.
- *
- *  Copyright (C) 2003  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#ifndef __NEC_VRC4171_H 
-#define __NEC_VRC4171_H 
-
-/*
- * Configuration 1
- */
-enum {
-       SLOTB_IS_NONE,       
-       SLOTB_IS_PCCARD,
-       SLOTB_IS_CF,
-       SLOTB_IS_FLASHROM
-};
-
-extern void vrc4171_set_multifunction_pin(int config);
-
-/*
- * Interrupt Status Mask
- */
-#define IRQ_A  0x02
-#define IRQ_B  0x04
-
-extern uint16_t vrc4171_get_irq_status(void);
-
-#endif /* __NEC_VRC4171_H */

<Prev in Thread] Current Thread [Next in Thread>