NEC VR5701 support

PATCH Sergey Podstavin 1 participant 1 message Feb 23, 2006

Subsystems (2)

Sound MIPS

lore

Share & tools

lore

Sergey Podstavin

author

2006-02-23 15:38 UTC #0 lore raw

Source: MontaVista Software, Inc. Sergey Podstavin <[email protected]>
MR: 15475
Type: Defect Fix
Disposition: needs submitting to linuxmips-embedded mailing list

Signed-off-by Sergey Podstavin <[email protected]>

Description:
The Vendor asks to remove "teacube" and to change "teacube" to
"VR5701-SG2" respectively on all documents such as the name of Config, directory, files, functions and etc.

arch/mips/Kconfig +1 -1

Index: linux-2.6.10/arch/mips/Kconfig
===================================================================
@@ -449,7 +449,7 @@ config DDB5477_BUS_FREQUENCY
 	depends on DDB5477
 	default 0
 
-config TCUBE
+config VR5701_SG2
 	bool "Support for NEC Electronics Corporation VR5701 SolutionGearII"
 	select IRQ_CPU
 	select HW_HAS_PCI

arch/mips/Makefile +4 -4

Index: linux-2.6.10/arch/mips/Makefile
===================================================================
@@ -477,11 +477,11 @@ core-$(CONFIG_DDB5477)		+= arch/mips/ddb
 load-$(CONFIG_DDB5477)		+= 0xffffffff80100000
 
 #
-# NEC TCUBE
+# NEC VR5701-SG2
 #
-core-$(CONFIG_TCUBE)		+= arch/mips/vr5701/common/
-core-$(CONFIG_TCUBE)		+= arch/mips/vr5701/tcube/
-load-$(CONFIG_TCUBE)		+= 0xffffffff80080000
+core-$(CONFIG_VR5701_SG2)		+= arch/mips/vr5701/common/
+core-$(CONFIG_VR5701_SG2)		+= arch/mips/vr5701/vr5701_sg2/
+load-$(CONFIG_VR5701_SG2)		+= 0xffffffff80080000
 
 core-$(CONFIG_LASAT)		+= arch/mips/lasat/
 cflags-$(CONFIG_LASAT)		+= -Iinclude/asm-mips/mach-lasat

arch/mips/configs/nec_vr5701_defconfig +1 -1

Index: linux-2.6.10/arch/mips/configs/nec_vr5701_defconfig
===================================================================
@@ -90,7 +90,7 @@ CONFIG_KMOD=y
 # CONFIG_DDB5074 is not set
 # CONFIG_DDB5476 is not set
 # CONFIG_DDB5477 is not set
-CONFIG_TCUBE=y
+CONFIG_VR5701_SG2=y
 # CONFIG_NEC_OSPREY is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SOC_AU1X00 is not set

arch/mips/pci/Makefile +1 -1

Index: linux-2.6.10/arch/mips/pci/Makefile
===================================================================
@@ -52,4 +52,4 @@ obj-$(CONFIG_TOSHIBA_JMR3927)	+= fixup-j
 obj-$(CONFIG_TOSHIBA_RBTX4927)	+= fixup-rbtx4927.o ops-tx4927.o
 obj-$(CONFIG_VICTOR_MPC30X)	+= fixup-mpc30x.o
 obj-$(CONFIG_ZAO_CAPCELLA)	+= fixup-capcella.o
-obj-$(CONFIG_TCUBE)		+= pci-tcube.o ops-tcube.o
+obj-$(CONFIG_VR5701_SG2)	+= pci-vr5701_sg2.o ops-vr5701_sg2.o

arch/mips/pci/ops-tcube.c deleted +0 ~~-267~~

267 lines not on this page · raw message

arch/mips/pci/ops-vr5701_sg2.c new file +267 -0

267 lines not on this page · raw message

arch/mips/pci/pci-tcube.c deleted +0 ~~-126~~

126 lines not on this page · raw message

arch/mips/pci/pci-vr5701_sg2.c new file +126 -0

126 lines not on this page · raw message

arch/mips/vr5701/common/nec_vrxxxx.c +1 -1

Index: linux-2.6.10/arch/mips/vr5701/common/nec_vrxxxx.c
===================================================================
@@ -13,7 +13,7 @@
 #include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <asm/tcube.h>
+#include <asm/vr5701/vr5701_sg2.h>
 
 u32
 ddb_calc_pdar(u32 phys, u32 size, int width, int on_memory_bus, int pci_visible)

arch/mips/vr5701/common/prom.c +4 -4

Index: linux-2.6.10/arch/mips/vr5701/common/prom.c
===================================================================
@@ -18,7 +18,7 @@
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
 #include <asm/debug.h>
-#include <asm/tcube.h>
+#include <asm/vr5701/vr5701_sg2.h>
 
 const char *get_system_type(void)
 {

@@ -43,9 +43,9 @@ void __init prom_init(void)
 		strcat(arcs_cmdline, arg[i]);
 		strcat(arcs_cmdline, " ");
 	}
-	mips_machgroup = MACH_GROUP_SHIMA;
-	mips_machtype = MACH_SHIMA_TCUBE;
-	add_memory_region(0, TCUBE_SDRAM_SIZE, BOOT_MEM_RAM);
+	mips_machgroup = MACH_GROUP_VR5701;
+	mips_machtype = MACH_VR5701_SG2;
+	add_memory_region(0, VR5701_SG2_SDRAM_SIZE, BOOT_MEM_RAM);
 }
 
 void __init prom_free_prom_memory(void)

arch/mips/vr5701/common/rtc_rx5c348.c +1 -1

Index: linux-2.6.10/arch/mips/vr5701/common/rtc_rx5c348.c
===================================================================
@@ -22,7 +22,7 @@
 #include <asm/addrspace.h>
 #include <asm/delay.h>
 #include <asm/debug.h>
-#include <asm/tcube.h>
+#include <asm/vr5701/vr5701_sg2.h>
 
 #undef  DEBUG
 #undef RTC_DELAY

arch/mips/vr5701/tcube/Makefile deleted +0 -7

Index: linux-2.6.10/arch/mips/vr5701/tcube/Makefile
===================================================================
@@ -1,7 +0,0 @@
-#
-# Makefile for the NEC Electronics Corporation VR5701 SolutionGearII specific kernel interface routines
-# under Linux.
-#
-
-obj-y += setup.o irq.o int-handler.o irq_vr5701.o 
-EXTRA_AFLAGS: = $(CFLAGS)

arch/mips/vr5701/tcube/int-handler.S deleted +0 ~~-77~~

77 lines not on this page · raw message

arch/mips/vr5701/tcube/irq.c deleted +0 ~~-146~~

146 lines not on this page · raw message

arch/mips/vr5701/tcube/irq_vr5701.c deleted +0 ~~-194~~

194 lines not on this page · raw message

arch/mips/vr5701/tcube/setup.c deleted +0 ~~-188~~

188 lines not on this page · raw message

arch/mips/vr5701/vr5701_sg2/Makefile new file +7 -0

Index: linux-2.6.10/arch/mips/vr5701/vr5701_sg2/Makefile
===================================================================
@@ -0,0 +1,7 @@
+#
+# Makefile for the NEC Electronics Corporation VR5701 SolutionGearII specific kernel interface routines
+# under Linux.
+#
+
+obj-y += setup.o irq.o int-handler.o irq_vr5701.o 
+EXTRA_AFLAGS: = $(CFLAGS)

arch/mips/vr5701/vr5701_sg2/int-handler.S new file +77 -0

77 lines not on this page · raw message

arch/mips/vr5701/vr5701_sg2/irq.c new file +146 -0

146 lines not on this page · raw message

arch/mips/vr5701/vr5701_sg2/irq_vr5701.c new file +194 -0

194 lines not on this page · raw message

arch/mips/vr5701/vr5701_sg2/setup.c new file +188 -0

188 lines not on this page · raw message

drivers/ide/Kconfig +1 -1

Index: linux-2.6.10/drivers/ide/Kconfig
===================================================================
@@ -838,7 +838,7 @@ config BLK_DEV_GAYLE
 
 config BLK_DEV_NEC_VR5701_SG2
 	tristate "NEC Electronics Corporation VR5701 SolutionGearII IDE interface support"
-	depends on TCUBE
+	depends on VR5701_SG2
 	help
 	  This is the IDE driver for the NEC Electronics Corporation VR5701 
 	  SolutionGearII IDE interface.

include/asm-mips/bootinfo.h +3 -3

Index: linux-2.6.10/include/asm-mips/bootinfo.h
===================================================================
@@ -214,10 +214,10 @@
 #define  MACH_TITAN_YOSEMITE	1	/* PMC-Sierra Yosemite		*/
 
 /*
- * Valid machtype for group SHIMA
+ * Valid machtype for group VR5701
  */
-#define MACH_GROUP_SHIMA       24 /* SHIMAFUJI                              */
-#define MACH_SHIMA_TCUBE         0      /* SHIMAFUJI T-Cube(Vr5701) */
+#define MACH_GROUP_VR5701       24 	/* VR5701     */
+#define MACH_VR5701_SG2         0       /* VR5701_SG2 */
 
 #define CL_SIZE			COMMAND_LINE_SIZE

include/asm-mips/serial.h +5 -5

Index: linux-2.6.10/include/asm-mips/serial.h
===================================================================
@@ -412,9 +412,9 @@
 #define DDB5477_SERIAL_PORT_DEFNS
 #endif
 
-#ifdef CONFIG_TCUBE
-#include <asm/tcube.h>
-#define TCUBE_SERIAL_PORT_DEFNS                                   \
+#ifdef CONFIG_VR5701_SG2
+#include <asm/vr5701/vr5701_sg2.h>
+#define VR5701_SG2_SERIAL_PORT_DEFNS                                   \
 	{ baud_base: BASE_BAUD, irq: 16, flags: STD_COM_FLAGS,          \
 	  iomem_base: (u8*)0xbe000a00, iomem_reg_shift: 3,              \
 	  io_type: SERIAL_IO_MEM},\

@@ -422,7 +422,7 @@
 	  iomem_base: (u8*)0xbe000a40, iomem_reg_shift: 3,              \
 	  io_type: SERIAL_IO_MEM},
 #else
-#define TCUBE_SERIAL_PORT_DEFNS
+#define VR5701_SG2_SERIAL_PORT_DEFNS
 #endif

@@ -455,6 +455,6 @@
 	MOMENCO_OCELOT_3_SERIAL_PORT_DEFNS		\
 	TXX927_SERIAL_PORT_DEFNS                        \
 	AU1000_SERIAL_PORT_DEFNS                        \
-	TCUBE_SERIAL_PORT_DEFNS
+	VR5701_SG2_SERIAL_PORT_DEFNS
 
 #endif /* _ASM_SERIAL_H */

include/asm-mips/tcube.h deleted +0 ~~-200~~

200 lines not on this page · raw message

include/asm-mips/vr5701.h deleted +0 ~~-96~~

96 lines not on this page · raw message

include/asm-mips/vr5701/vr5701.h new file +96 -0

96 lines not on this page · raw message

include/asm-mips/vr5701/vr5701_sg2.h new file +200 -0

200 lines not on this page · raw message

include/linux/lsppatchlevel.h +1 -1

Index: linux-2.6.10/include/linux/lsppatchlevel.h
===================================================================
@@ -6,4 +6,4 @@
  * is licensed "as is" without any warranty of any kind, whether express
  * or implied.
  */
-#define LSP_PATCH_LEVEL "9"
+#define LSP_PATCH_LEVEL "10"

mvl_patches/pro-0010.c new file +16 -0

Index: linux-2.6.10/mvl_patches/pro-0010.c
===================================================================
@@ -0,0 +1,16 @@
+/*
+ * Author: MontaVista Software, Inc. <[email protected]>
+ *
+ * 2005 (c) MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+#include <linux/init.h>
+#include <linux/mvl_patch.h>
+
+static __init int regpatch(void)
+{
+        return mvl_register_patch(10);
+}
+module_init(regpatch);

sound/oss/Kconfig +1 -1

Index: linux-2.6.10/sound/oss/Kconfig
===================================================================
@@ -235,7 +235,7 @@ config SOUND_VRC5477
 
 config SOUND_VR5701
 	tristate "NEC Electronics Corporation VR5701 SolutionGearII AC97 sound"
-	depends on SOUND_PRIME!=n && TCUBE && SOUND
+	depends on SOUND_PRIME!=n && VR5701_SG2 && SOUND
 	help
 	  Say Y here to enable sound support for the NEC Electronics Corporation 
 	  VR5701 SolutionGearII AC97 sound. Works with the AC97 codec.