Hi Ralf,
setup.c for TANBAC TB0229 was updated.
Please apply to v2.6 CVS tree.
Yoichi
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/tanbac-tb0229/setup.c linux/arch/mips/vr41xx/tanbac-tb0229/setup.c
--- linux-orig/arch/mips/vr41xx/tanbac-tb0229/setup.c Thu Apr 29 10:42:49 2004
+++ linux/arch/mips/vr41xx/tanbac-tb0229/setup.c Thu May 13 23:45:46 2004
@@ -21,59 +21,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/config.h>
-#include <linux/ioport.h>
-#include <asm/io.h>
-#include <asm/pci_channel.h>
-#include <asm/vr41xx/tb0229.h>
-
-#ifdef CONFIG_PCI
-static struct resource vr41xx_pci_io_resource = {
- .name = "PCI I/O space",
- .start = VR41XX_PCI_IO_START,
- .end = VR41XX_PCI_IO_END,
- .flags = IORESOURCE_IO,
-};
-
-static struct resource vr41xx_pci_mem_resource = {
- .name = "PCI memory space",
- .start = VR41XX_PCI_MEM_START,
- .end = VR41XX_PCI_MEM_END,
- .flags = IORESOURCE_MEM,
-};
-
-extern struct pci_ops vr41xx_pci_ops;
-
-struct pci_controller vr41xx_controller = {
- .pci_ops = &vr41xx_pci_ops,
- .io_resource = &vr41xx_pci_io_resource,
- .mem_resource = &vr41xx_pci_mem_resource,
-};
-
-struct vr41xx_pci_address_space vr41xx_pci_mem1 = {
- .internal_base = VR41XX_PCI_MEM1_BASE,
- .address_mask = VR41XX_PCI_MEM1_MASK,
- .pci_base = IO_MEM1_RESOURCE_START,
-};
-
-struct vr41xx_pci_address_space vr41xx_pci_mem2 = {
- .internal_base = VR41XX_PCI_MEM2_BASE,
- .address_mask = VR41XX_PCI_MEM2_MASK,
- .pci_base = IO_MEM2_RESOURCE_START,
-};
-
-struct vr41xx_pci_address_space vr41xx_pci_io = {
- .internal_base = VR41XX_PCI_IO_BASE,
- .address_mask = VR41XX_PCI_IO_MASK,
- .pci_base = IO_PORT_RESOURCE_START
-};
-
-static struct vr41xx_pci_address_map pci_address_map = {
- .mem1 = &vr41xx_pci_mem1,
- .mem2 = &vr41xx_pci_mem2,
- .io = &vr41xx_pci_io,
-};
-#endif
+#include <asm/vr41xx/vr41xx.h>
const char *get_system_type(void)
{
@@ -82,18 +31,10 @@
static int tanbac_tb0229_setup(void)
{
- set_io_port_base(IO_PORT_BASE);
- ioport_resource.start = IO_PORT_RESOURCE_START;
- ioport_resource.end = IO_PORT_RESOURCE_END;
-
#ifdef CONFIG_SERIAL_8250
vr41xx_select_siu_interface(SIU_RS232C, IRDA_NONE);
vr41xx_siu_init();
vr41xx_dsiu_init();
-#endif
-
-#ifdef CONFIG_PCI
- vr41xx_pciu_init(&pci_address_map);
#endif
return 0;
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/tanbac-tb0229/tb0219.c linux/arch/mips/vr41xx/tanbac-tb0229/tb0219.c
--- linux-orig/arch/mips/vr41xx/tanbac-tb0229/tb0219.c Thu Apr 29 10:01:41 2004
+++ linux/arch/mips/vr41xx/tanbac-tb0229/tb0219.c Thu May 13 23:45:46 2004
@@ -22,13 +22,12 @@
#include <asm/io.h>
#include <asm/reboot.h>
-#include <asm/vr41xx/tb0229.h>
#define TB0219_RESET_REGS KSEG1ADDR(0x0a00000e)
#define tb0219_hard_reset() writew(0, TB0219_RESET_REGS)
-void tanbac_tb0219_restart(char *command)
+static void tanbac_tb0219_restart(char *command)
{
local_irq_disable();
tb0219_hard_reset();
diff -urN -X dontdiff linux-orig/include/asm-mips/vr41xx/tb0229.h linux/include/asm-mips/vr41xx/tb0229.h
--- linux-orig/include/asm-mips/vr41xx/tb0229.h Thu Apr 29 10:42:52 2004
+++ linux/include/asm-mips/vr41xx/tb0229.h Thu Jan 1 09:00:00 1970
@@ -1,57 +0,0 @@
-/*
- * tb0229.h, Include file for TANBAC TB0229.
- *
- * Copyright (C) 2002-2004 Yoichi Yuasa <yuasa@xxxxxxxxxxxxxx>
- *
- * Modified for TANBAC TB0229:
- * Copyright (C) 2003 Megasolution Inc. <matsu@xxxxxxxxxxxxxxx>
- *
- * 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 __TANBAC_TB0229_H
-#define __TANBAC_TB0229_H
-
-#include <asm/addrspace.h>
-
-/*
- * Board specific address mapping
- */
-#define VR41XX_PCI_MEM1_BASE 0x10000000
-#define VR41XX_PCI_MEM1_SIZE 0x04000000
-#define VR41XX_PCI_MEM1_MASK 0x7c000000
-
-#define VR41XX_PCI_MEM2_BASE 0x14000000
-#define VR41XX_PCI_MEM2_SIZE 0x02000000
-#define VR41XX_PCI_MEM2_MASK 0x7e000000
-
-#define VR41XX_PCI_IO_BASE 0x16000000
-#define VR41XX_PCI_IO_SIZE 0x02000000
-#define VR41XX_PCI_IO_MASK 0x7e000000
-
-#define VR41XX_PCI_IO_START 0x01000000
-#define VR41XX_PCI_IO_END 0x01ffffff
-
-#define VR41XX_PCI_MEM_START 0x12000000
-#define VR41XX_PCI_MEM_END 0x15ffffff
-
-#define IO_PORT_BASE KSEG1ADDR(VR41XX_PCI_IO_BASE)
-#define IO_PORT_RESOURCE_START 0
-#define IO_PORT_RESOURCE_END VR41XX_PCI_IO_SIZE
-#define IO_MEM1_RESOURCE_START VR41XX_PCI_MEM1_BASE
-#define IO_MEM1_RESOURCE_END (VR41XX_PCI_MEM1_BASE + VR41XX_PCI_MEM1_SIZE)
-#define IO_MEM2_RESOURCE_START VR41XX_PCI_MEM2_BASE
-#define IO_MEM2_RESOURCE_END (VR41XX_PCI_MEM2_BASE + VR41XX_PCI_MEM2_SIZE)
-
-#endif /* __TANBAC_TB0229_H */
