diff options
| -rw-r--r-- | arch/mips/Makefile | 17 | ||||
| -rw-r--r-- | arch/mips/kernel/Makefile | 6 | ||||
| -rw-r--r-- | arch/mips/kernel/setup.c | 5 | ||||
| -rw-r--r-- | arch/mips/lib/kbd-std.c | 2 | ||||
| -rw-r--r-- | include/asm-mips/bootinfo.h | 10 | ||||
| -rw-r--r-- | include/asm-mips/galileo-boards/ev96100.h | 4 | ||||
| -rw-r--r-- | include/asm-mips/galileo-boards/gt96100.h | 2 | ||||
| -rw-r--r-- | include/asm-mips/serial.h | 14 |
8 files changed, 45 insertions, 15 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 2b58c6b00..470807c9a 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -228,11 +228,18 @@ endif # ITE 8172 eval board with QED 5231 CPU # ifdef CONFIG_MIPS_ITE8172 -LIBS += arch/mips/ite-boards/qed-4n-s01b/ite.o \ - arch/mips/ite-boards/generic/it8172.o -SUBDIRS += arch/mips/ite-boards/generic \ - arch/mips/ite-boards/qed-4n-s01b -LOADADDR += 0x80100000 +LIBS += arch/mips/ite-boards/qed-4n-s01b/ite.o arch/mips/ite-boards/generic/it8172.o +SUBDIRS += arch/mips/ite-boards/generic arch/mips/ite-boards/qed-4n-s01b +LOADADDR += 0x80100000 +endif + +# +# Globespan IVR eval board with QED 5231 CPU +# +ifdef CONFIG_MIPS_IVR +LIBS += arch/mips/ite-boards/ivr/ivr.o arch/mips/ite-boards/generic/it8172.o +SUBDIRS += arch/mips/ite-boards/generic arch/mips/ite-boards/ivr +LOADADDR += 0x80100000 endif # diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index b4c91f991..ec2eae67e 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -11,7 +11,7 @@ .S.o: $(CC) $(AFLAGS) -c $< -o $@ -EXTRA_ASFLAGS = -mips3 -mcpu=r4000 +EXTRA_AFLAGS = -mips3 -mcpu=r4000 all: kernel.o head.o init_task.o @@ -54,7 +54,9 @@ ifndef CONFIG_DECSTATION ifndef CONFIG_MIPS_EV96100 ifndef CONFIG_MIPS_ITE8172 ifndef CONFIG_NINO - obj-y += time.o + ifndef CONFIG_MIPS_IVR + obj-y += time.o + endif endif endif endif diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 8815cbb20..04f2ee113 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -548,11 +548,12 @@ void __init setup_arch(char **cmdline_p) ev64120_setup(); break; #endif -#ifdef CONFIG_MIPS_ITE8172 +#if defined(CONFIG_MIPS_IVR) || defined(CONFIG_MIPS_ITE8172) case MACH_GROUP_ITE: + case MACH_GROUP_GLOBESPAN: it8172_setup(); break; -#endif +#endif #ifdef CONFIG_NINO case MACH_GROUP_PHILIPS: nino_setup(); diff --git a/arch/mips/lib/kbd-std.c b/arch/mips/lib/kbd-std.c index ce75371d5..ecaa2a0d8 100644 --- a/arch/mips/lib/kbd-std.c +++ b/arch/mips/lib/kbd-std.c @@ -20,7 +20,6 @@ static void std_kbd_request_region(void) { #ifdef CONFIG_MIPS_ITE8172 - printk("std_kbd_request_region\n"); request_region(0x14000060, 16, "keyboard"); #else request_region(0x60, 16, "keyboard"); @@ -29,7 +28,6 @@ static void std_kbd_request_region(void) static int std_kbd_request_irq(void (*handler)(int, void *, struct pt_regs *)) { - printk("std_kbd_request_irq\n"); return request_irq(KEYBOARD_IRQ, handler, 0, "keyboard", NULL); } diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h index 83e5dc895..23710cbef 100644 --- a/include/asm-mips/bootinfo.h +++ b/include/asm-mips/bootinfo.h @@ -27,10 +27,11 @@ #define MACH_GROUP_MOMENCO 12 /* Momentum Boards */ #define MACH_GROUP_ITE 13 /* ITE Semi Eval Boards */ #define MACH_GROUP_PHILLIPS 14 +#define MACH_GROUP_GLOBESPAN 15 /* Globespan PVR Referrence Board */ #define GROUP_NAMES { "unknown", "Jazz", "Digital", "ARC", "SNI", "ACN", \ "SGI", "Cobalt", "NEC DDB", "Baget", "Cosine", "Galileo", "Momentum", \ - "ITE", "Phillips" } + "ITE", "Phillips", "Globepspan" } /* * Valid machtype values for group unknown (low order halfword of mips_machtype) @@ -150,6 +151,13 @@ #define MACH_QED_4N_S01B 0 /* ITE8172 based eval board */ #define GROUP_ITE_NAMES { "QED-4N-S01B" } /* the actual board name */ + +/* + * Valid machtype for group Globespan + */ +#define MACH_IVR 0 /* IVR eval board */ + +#define GROUP_GLOBESPAN_NAMES { "IVR" } /* the actual board name */ /* * Valid machtype for group PHILIPS diff --git a/include/asm-mips/galileo-boards/ev96100.h b/include/asm-mips/galileo-boards/ev96100.h index 92a34cf7e..86f39fbdc 100644 --- a/include/asm-mips/galileo-boards/ev96100.h +++ b/include/asm-mips/galileo-boards/ev96100.h @@ -36,8 +36,8 @@ /* * EV96100 UART register base. */ -#define EV96100_UART0_REGS_BASE (KSEG1ADDR(EV96100_COM1_BASE_ADDR)) -#define EV96100_UART1_REGS_BASE (KSEG1ADDR(EV96100_COM2_BASE_ADDR)) +#define EV96100_UART0_REGS_BASE EV96100_COM1_BASE_ADDR +#define EV96100_UART1_REGS_BASE EV96100_COM2_BASE_ADDR #define EV96100_BASE_BAUD ( 3686400 / 16 ) diff --git a/include/asm-mips/galileo-boards/gt96100.h b/include/asm-mips/galileo-boards/gt96100.h index 4c48bd96c..5a1d170cd 100644 --- a/include/asm-mips/galileo-boards/gt96100.h +++ b/include/asm-mips/galileo-boards/gt96100.h @@ -1,7 +1,7 @@ /* * Copyright 2000 MontaVista Software Inc. * Author: MontaVista Software, Inc. - * stevel@mvista.com or support@mvista.com + * stevel@mvista.com or source@mvista.com * * ######################################################################## * diff --git a/include/asm-mips/serial.h b/include/asm-mips/serial.h index d2057f158..b5b8c6ff2 100644 --- a/include/asm-mips/serial.h +++ b/include/asm-mips/serial.h @@ -121,6 +121,19 @@ #define ITE_SERIAL_PORT_DEFNS #endif +#ifdef CONFIG_MIPS_IVR +#include <asm/it8172/it8172.h> +#include <asm/it8172/it8172_int.h> +#define IVR_SERIAL_PORT_DEFNS \ + { baud_base: BASE_BAUD, port: (IT8172_PCI_IO_BASE + IT_UART_BASE), \ + irq: IT8172_UART_IRQ, flags: STD_COM_FLAGS, type: 0x3 }, \ + /* Smart Card Reader 1 */ \ + { baud_base: BASE_BAUD, port: (IT8172_PCI_IO_BASE + IT_SCR1_BASE), \ + irq: IT8172_SCR1_IRQ, flags: STD_COM_FLAGS, type: 0x3 }, +#else +#define IVR_SERIAL_PORT_DEFNS +#endif + #ifdef CONFIG_HAVE_STD_PC_SERIAL_PORT #define STD_SERIAL_PORT_DEFNS \ /* UART CLK PORT IRQ FLAGS */ \ @@ -219,6 +232,7 @@ #endif #define SERIAL_PORT_DFNS \ + IVR_SERIAL_PORT_DEFNS \ ITE_SERIAL_PORT_DEFNS \ ATLAS_SERIAL_PORT_DEFNS \ EV96100_SERIAL_PORT_DEFNS \ |