Diff between Linus' and linux-mips git: drivers!

Diff between Linus' and linux-mips git: drivers!

[Martin Michlmayr]

I just did a diff between the git trees of Linus and linux-mips and
noticed that there's a large number of drivers in the MIPS tree which
are not in mainline.  I think these are still from the days when Ralf
would apply MIPS related drivers to his tree instead of telling people
to talk to the respective sub-system maintainers (like he does now).

We should find out whether these drivers are still needed, and if so,
send them to the appropriate sub-system maintainer.  If they're no
longer useful, they should be removed from the linux-mips tree.


 drivers/char/au1000_gpio.c                 |  266 +++
 drivers/char/au1000_ts.c                   |  677 +++++++++
 drivers/char/au1000_usbraw.c               |  573 ++++++++
 drivers/char/au1000_usbtty.c               |  761 ++++++++++
stevel@mvista.com

 drivers/char/ibm_workpad_keymap.map        |  343 ++++
Michael Klar <wyldfier@iname.com>

 drivers/char/sb1250_duart.c                |  911 ++++++++++++
BCM (I think they wanted to rewrite this?  Mark?)

 drivers/net/big_sur_ge.c                   | 2005 ++++++++++++++++++++++++++++
 drivers/net/big_sur_ge.h                   |  713 +++++++++
Manish Lachwani <lachwani@pmc-sierra.com>

 drivers/net/titan_ge.c                     | 2071 +++++++++++++++++++++++++++++
 drivers/net/titan_ge.h                     |  419 +++++
 drivers/net/titan_mdio.c                   |  217 +++
 drivers/net/titan_mdio.h                   |   56 
Manish Lachwani <lachwani@pmc-sierra.com>
(I thought most of this stuff was in mainline; do we have two copies
under different names?)

 drivers/net/gt64240eth.c                   | 1672 +++++++++++++++++++++++
 drivers/net/gt64240eth.h                   |   10 
stevel@mvista.com

 drivers/serial/ip3106_uart.c               |  912 ++++++++++++
 include/linux/serial_ip3106.h              |   12 
Per Hallsmark per.hallsmark@mvista.com

 drivers/video/au1200fb.c                   | 1940 +++++++++++++++++++++++++++
 drivers/video/au1200fb.h                   |  288 ++++
AMD (?)

 drivers/video/smivgxfb.c                   |  387 +++++
johuang@siliconmotion.com

 sound/oss/au1550_i2s.c                     | 2029 ++++++++++++++++++++++++++++
dan@embeddededge.com"

 drivers/usb/host/ohci-pnx8550.c            |  277 +++
dan@embeddededge.com"

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: trivial changes

[Martin Michlmayr]

Decrease delta between Linus and linux-mips tree: small changes

Decrease the delta between the Linus and linux-mips trees.  This
patch addresses some small differences where the Linus tree is right
and linux-mips should be changed accordingly.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>

---

 mtd/devices/Kconfig |    5 ---
 mtd/maps/lasat.c    |    4 +-
 net/declance.c      |    1
 scsi/dec_esp.c      |    2 -
 video/Kconfig       |    4 +-
 video/au1100fb.c    |   74 ++++++++++++++++++++++++++--------------------------
 video/au1100fb.h    |    6 ++--
 7 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
index 6acfa3d..dd628cb 100644
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@ -47,11 +47,6 @@ config MTD_MS02NV
 	  accelerator.  Say Y here if you have a DECstation 5000/2x0 or a
 	  DECsystem 5900 equipped with such a module.
 
-	  If you want to compile this driver as a module ( = code which can be
-	  inserted in and removed from the running kernel whenever you want),
-	  say M here and read <file:Documentation/modules.txt>.  The module will
-	  be called ms02-nv.o.
-
 config MTD_DATAFLASH
 	tristate "Support for AT45xxx DataFlash"
 	depends on MTD && SPI_MASTER && EXPERIMENTAL
diff --git a/drivers/mtd/maps/lasat.c b/drivers/mtd/maps/lasat.c
index 2a2efaa..c658d40 100644
--- a/drivers/mtd/maps/lasat.c
+++ b/drivers/mtd/maps/lasat.c
@@ -7,7 +7,7 @@
  * modify it under the terms of the GNU General Public License version
  * 2 as published by the Free Software Foundation.
  *
- * $Id: lasat.c,v 1.7 2004/07/12 21:59:44 dwmw2 Exp $
+ * $Id: lasat.c,v 1.9 2004/11/04 13:24:15 gleixner Exp $
  *
  */
 
@@ -50,7 +50,7 @@ static int __init init_lasat(void)
 	ENABLE_VPP((&lasat_map));
 
 	lasat_map.phys = lasat_flash_partition_start(LASAT_MTD_BOOTLOADER);
-	lasat_map.virt = (unsigned long)ioremap_nocache(
+	lasat_map.virt = ioremap_nocache(
 		        lasat_map.phys, lasat_board_info.li_flash_size);
 	lasat_map.size = lasat_board_info.li_flash_size;
 
diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index d049129..6561575 100644
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
@@ -1301,7 +1301,6 @@ static void __exit dec_lance_cleanup(voi
 	while (root_lance_dev) {
 		struct net_device *dev = root_lance_dev;
 		struct lance_private *lp = netdev_priv(dev);
-
 		unregister_netdev(dev);
 #ifdef CONFIG_TC
 		if (lp->slot >= 0)
diff --git a/drivers/scsi/dec_esp.c b/drivers/scsi/dec_esp.c
index e755664..4b86685 100644
--- a/drivers/scsi/dec_esp.c
+++ b/drivers/scsi/dec_esp.c
@@ -55,7 +55,7 @@
 
 static int  dma_bytes_sent(struct NCR_ESP *esp, int fifo_count);
 static void dma_drain(struct NCR_ESP *esp);
-static int  dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd * sp);
+static int  dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd *sp);
 static void dma_dump_state(struct NCR_ESP *esp);
 static void dma_init_read(struct NCR_ESP *esp, u32 vaddress, int length);
 static void dma_init_write(struct NCR_ESP *esp, u32 vaddress, int length);
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7d7724c..7e63f15 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1336,8 +1336,8 @@ config FB_PMAGB_B
  	select FB_CFB_IMAGEBLIT
 	help
 	  Support for the PMAGB-B TURBOchannel framebuffer card used mainly
-	  in the MIPS-based DECstation series. The card is currently only 
-	  supported in 1280x1024x8 mode.  
+	  in the MIPS-based DECstation series. The card is currently only
+	  supported in 1280x1024x8 mode.
 
 config FB_MAXINE
 	bool "Maxine (Personal DECstation) onboard framebuffer support"
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index e821bba..11b87d5 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -3,7 +3,7 @@
  *	Au1100 LCD Driver.
  *
  * Rewritten for 2.6 by Embedded Alley Solutions
- * 	<source@embeddedalley.com>, based on submissions by 
+ * 	<source@embeddedalley.com>, based on submissions by
  *  	Karl Lessard <klessard@sunrisetelecom.com>
  *  	<c.pellegrin@exadron.com>
  *
@@ -57,7 +57,7 @@
 
 #include "au1100fb.h"
 
-/* 
+/*
  * Sanity check. If this is a new Au1100 based board, search for
  * the PB1100 ifdefs to make sure you modify the code accordingly.
  */
@@ -75,11 +75,11 @@
 #define to_au1100fb_device(_info) \
 	  (_info ? container_of(_info, struct au1100fb_device, info) : NULL);
 
-/* Bitfields format supported by the controller. Note that the order of formats 
+/* Bitfields format supported by the controller. Note that the order of formats
  * SHOULD be the same as in the LCD_CONTROL_SBPPF field, so we can retrieve the
  * right pixel format by doing rgb_bitfields[LCD_CONTROL_SBPPF_XXX >> LCD_CONTROL_SBPPF]
  */
-struct fb_bitfield rgb_bitfields[][4] = 
+struct fb_bitfield rgb_bitfields[][4] =
 {
   	/*     Red, 	   Green, 	 Blue, 	     Transp   */
 	{ { 10, 6, 0 }, { 5, 5, 0 }, { 0, 5, 0 }, { 0, 0, 0 } },
@@ -143,7 +143,7 @@ int au1100fb_setmode(struct au1100fb_dev
 			info->var.transp.msb_right = 0;
 
 			info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
-			info->fix.line_length = info->var.xres_virtual / 
+			info->fix.line_length = info->var.xres_virtual /
 							(8/info->var.bits_per_pixel);
 		} else {
 			/* non-palettized */
@@ -163,7 +163,7 @@ int au1100fb_setmode(struct au1100fb_dev
 	}
 
 	info->screen_size = info->fix.line_length * info->var.yres_virtual;
-	
+
 	/* Determine BPP mode and format */
 	fbdev->regs->lcd_control = fbdev->panel->control_base |
 			    ((info->var.rotate/90) << LCD_CONTROL_SM_BIT);
@@ -184,7 +184,7 @@ int au1100fb_setmode(struct au1100fb_dev
 		 * otherwise display the same as the first panel */
 		if (info->var.yres_virtual >= (info->var.yres << 1)) {
 			fbdev->regs->lcd_dmaaddr1 = LCD_DMA_SA_N(fbdev->fb_phys +
-							  (info->fix.line_length * 
+							  (info->fix.line_length *
 						          (info->var.yres_virtual >> 1)));
 		} else {
 			fbdev->regs->lcd_dmaaddr1 = LCD_DMA_SA_N(fbdev->fb_phys);
@@ -202,7 +202,7 @@ int au1100fb_setmode(struct au1100fb_dev
 
 	fbdev->regs->lcd_pwmdiv = 0;
 	fbdev->regs->lcd_pwmhi = 0;
-   
+
 	/* Resume controller */
 	fbdev->regs->lcd_control |= LCD_CONTROL_GO;
 
@@ -223,22 +223,22 @@ int au1100fb_fb_setcolreg(unsigned regno
 
 	if (fbi->var.grayscale) {
 		/* Convert color to grayscale */
-		red = green = blue = 
+		red = green = blue =
 			(19595 * red + 38470 * green + 7471 * blue) >> 16;
 	}
-   
+
 	if (fbi->fix.visual == FB_VISUAL_TRUECOLOR) {
 		/* Place color in the pseudopalette */
 		if (regno > 16)
 			return -EINVAL;
-   
+
 		palette = (u32*)fbi->pseudo_palette;
 
 		red   >>= (16 - fbi->var.red.length);
 		green >>= (16 - fbi->var.green.length);
 		blue  >>= (16 - fbi->var.blue.length);
-	
-		value = (red   << fbi->var.red.offset) 	|	
+
+		value = (red   << fbi->var.red.offset) 	|
 			(green << fbi->var.green.offset)|
 			(blue  << fbi->var.blue.offset);
 		value &= 0xFFFF;
@@ -250,8 +250,8 @@ int au1100fb_fb_setcolreg(unsigned regno
 
 	} else if (panel_is_color(fbdev->panel)) {
 		/* COLOR STN MODE */
-		value = (((panel_swap_rgb(fbdev->panel) ? blue : red) >> 12) & 0x000F) | 
-			((green >> 8) & 0x00F0) | 
+		value = (((panel_swap_rgb(fbdev->panel) ? blue : red) >> 12) & 0x000F) |
+			((green >> 8) & 0x00F0) |
 			(((panel_swap_rgb(fbdev->panel) ? red : blue) >> 4) & 0x0F00);
 		value &= 0xFFF;
 	} else {
@@ -261,7 +261,7 @@ int au1100fb_fb_setcolreg(unsigned regno
 	}
 
 	palette[regno] = value;
-	
+
 	return 0;
 }
 
@@ -282,8 +282,8 @@ int au1100fb_fb_blank(int blank_mode, st
 			fbdev->regs->lcd_control |= LCD_CONTROL_GO;
 #ifdef CONFIG_MIPS_PB1100
 			if (drv_info.panel_idx == 1) {
-				au_writew(au_readw(PB1100_G_CONTROL) 
-					  | (PB1100_G_CONTROL_BL | PB1100_G_CONTROL_VDD), 
+				au_writew(au_readw(PB1100_G_CONTROL)
+					  | (PB1100_G_CONTROL_BL | PB1100_G_CONTROL_VDD),
 			PB1100_G_CONTROL);
 			}
 #endif
@@ -297,14 +297,14 @@ int au1100fb_fb_blank(int blank_mode, st
 			fbdev->regs->lcd_control &= ~LCD_CONTROL_GO;
 #ifdef CONFIG_MIPS_PB1100
 			if (drv_info.panel_idx == 1) {
-				au_writew(au_readw(PB1100_G_CONTROL) 
+				au_writew(au_readw(PB1100_G_CONTROL)
 				  	  & ~(PB1100_G_CONTROL_BL | PB1100_G_CONTROL_VDD),
 			PB1100_G_CONTROL);
 			}
 #endif
 		au_sync();
 		break;
-	default: 
+	default:
 		break;
 
 	}
@@ -329,7 +329,7 @@ int au1100fb_fb_pan_display(struct fb_va
 		/* No support for X panning for now! */
 		return -EINVAL;
 	}
-			
+
 	print_dbg("fb_pan_display 2 %p %p", var, fbi);
 	dy = var->yoffset - fbi->var.yoffset;
 	if (dy) {
@@ -389,7 +389,7 @@ int au1100fb_fb_mmap(struct fb_info *fbi
 	if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT)) {
 		return -EINVAL;
 	}
-    
+
 	start = fbdev->fb_phys & PAGE_MASK;
 	len = PAGE_ALIGN((start & ~PAGE_MASK) + fbdev->fb_len);
 
@@ -406,7 +406,7 @@ int au1100fb_fb_mmap(struct fb_info *fbi
 	pgprot_val(vma->vm_page_prot) |= (6 << 9); //CCA=6
 
 	vma->vm_flags |= VM_IO;
-    
+
 	if (io_remap_page_range(vma, vma->vm_start, off,
 				vma->vm_end - vma->vm_start,
 				vma->vm_page_prot)) {
@@ -416,7 +416,7 @@ int au1100fb_fb_mmap(struct fb_info *fbi
 	return 0;
 }
 
-static struct fb_ops au1100fb_ops = 
+static struct fb_ops au1100fb_ops =
 {
 	.owner			= THIS_MODULE,
 	.fb_setcolreg		= au1100fb_fb_setcolreg,
@@ -456,7 +456,7 @@ int au1100fb_drv_probe(struct device *de
 	dev_set_drvdata(dev, (void*)fbdev);
 
 	/* Allocate region for our registers and map them */
-	if (!(regs_res = platform_get_resource(to_platform_device(dev), 
+	if (!(regs_res = platform_get_resource(to_platform_device(dev),
 					IORESOURCE_MEM, 0))) {
 		print_err("fail to retrieve registers resource");
 		return -EFAULT;
@@ -465,9 +465,9 @@ int au1100fb_drv_probe(struct device *de
 	au1100fb_fix.mmio_start = regs_res->start;
 	au1100fb_fix.mmio_len = regs_res->end - regs_res->start + 1;
 
-	if (!request_mem_region(au1100fb_fix.mmio_start, au1100fb_fix.mmio_len, 
+	if (!request_mem_region(au1100fb_fix.mmio_start, au1100fb_fix.mmio_len,
 				DRIVER_NAME)) {
-		print_err("fail to lock memory region at 0x%08x", 
+		print_err("fail to lock memory region at 0x%08x",
 				au1100fb_fix.mmio_start);
 		return -EBUSY;
 	}
@@ -482,11 +482,11 @@ int au1100fb_drv_probe(struct device *de
 	/* Allocate the framebuffer to the maximum screen size * nbr of video buffers */
 	fbdev->fb_len = fbdev->panel->xres * fbdev->panel->yres *
 		  	(fbdev->panel->bpp >> 3) * AU1100FB_NBR_VIDEO_BUFFERS;
-	
-	fbdev->fb_mem = dma_alloc_coherent(dev, PAGE_ALIGN(fbdev->fb_len), 
+
+	fbdev->fb_mem = dma_alloc_coherent(dev, PAGE_ALIGN(fbdev->fb_len),
 					&fbdev->fb_phys, GFP_KERNEL);
 	if (!fbdev->fb_mem) {
-		print_err("fail to allocate frambuffer (size: %dK))", 
+		print_err("fail to allocate frambuffer (size: %dK))",
 			  fbdev->fb_len / 1024);
 		return -ENOMEM;
 	}
@@ -499,7 +499,7 @@ int au1100fb_drv_probe(struct device *de
 	 * since we'll be remapping normal memory.
 	 */
 	for (page = (unsigned long)fbdev->fb_mem;
-	     page < PAGE_ALIGN((unsigned long)fbdev->fb_mem + fbdev->fb_len); 
+	     page < PAGE_ALIGN((unsigned long)fbdev->fb_mem + fbdev->fb_len);
 	     page += PAGE_SIZE) {
 #if CONFIG_DMA_NONCOHERENT
 		SetPageReserved(virt_to_page(CAC_ADDR(page)));
@@ -616,11 +616,11 @@ static struct device_driver au1100fb_dri
 	.suspend	= au1100fb_drv_suspend,
         .resume		= au1100fb_drv_resume,
 };
-    
+
 /*-------------------------------------------------------------------------*/
 
 /* Kernel driver */
-    
+
 int au1100fb_setup(char *options)
 {
 	char* this_opt;
@@ -641,7 +641,7 @@ int au1100fb_setup(char *options)
 				this_opt += 6;
 				for (i = 0; i < num_panels; i++) {
 					if (!strncmp(this_opt,
-					      	     known_lcd_panels[i].name, 
+					      	     known_lcd_panels[i].name,
 							strlen(this_opt))) {
 						panel_idx = i;
 					break;
@@ -661,7 +661,7 @@ int au1100fb_setup(char *options)
 				print_warn("Unsupported option \"%s\"", this_opt);
 		}
 		}
-	} 
+	}
 
 	drv_info.panel_idx = panel_idx;
 	drv_info.opt_mode = mode;
@@ -677,9 +677,9 @@ int __init au1100fb_init(void)
 {
 	char* options;
 	int ret;
-	
+
 	print_info("" DRIVER_DESC "");
-	
+
 	memset(&drv_info, 0, sizeof(drv_info));
 
 	if (fb_get_options(DRIVER_NAME, &options))
diff --git a/drivers/video/au1100fb.h b/drivers/video/au1100fb.h
index 07c5298..2855534 100644
--- a/drivers/video/au1100fb.h
+++ b/drivers/video/au1100fb.h
@@ -78,7 +78,7 @@ struct au1100fb_panel
 	u32 	bpp;		/* Maximum depth supported */
 };
 
-struct au1100fb_regs 
+struct au1100fb_regs
 {
 	u32  lcd_control;
 	u32  lcd_intstatus;
@@ -255,7 +255,7 @@ struct au1100fb_device {
 
 /* List of panels known to work with the AU1100 LCD controller.
  * To add a new panel, enter the same specifications as the
- * Generic_TFT one, and MAKE SURE that it doesn't conflicts 
+ * Generic_TFT one, and MAKE SURE that it doesn't conflicts
  * with the controller restrictions. Restrictions are:
  *
  * STN color panels: max_bpp <= 12
@@ -272,7 +272,7 @@ static struct au1100fb_panel known_lcd_p
 		.xres = 800,
 		.yres = 600,
 		.bpp = 16,
-		.control_base =	0x0004886A | 
+		.control_base =	0x0004886A |
 			LCD_CONTROL_DEFAULT_PO | LCD_CONTROL_DEFAULT_SBPPF |
 			LCD_CONTROL_BPP_16,
 		.clkcontrol_base = 0x00020000,

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: small changes

[Martin Michlmayr]

I noticed the following difference between the Linus and the
linux-mips tree.  Who is correct and can the other one be changed
please?

--- linux-2.6.16-rc4/drivers/char/qtronix.c	2006-02-19 20:08:44.000000000 +0000
+++ mips-2.6.16-rc4/drivers/char/qtronix.c	2006-02-19 20:15:07.000000000 +0000
@@ -535,8 +535,7 @@
 		i--;
 	}
 	if (count-i) {
-		struct inode *inode = file->f_dentry->d_inode;
-		inode->i_atime = current_fs_time(inode->i_sb);
+		file->f_dentry->d_inode->i_atime = get_seconds();
 		return count-i;
 	}
 	if (signal_pending(current))

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: VR4181

[Martin Michlmayr]

It seems the following VR4181 change never made it into mainline.


--- linux-2.6.16-rc4/arch/mips/Kconfig	2006-02-19 20:08:02.000000000 +0000
+++ mips-2.6.16-rc4/arch/mips/Kconfig	2006-02-19 20:14:36.000000000 +0000
@@ -503,10 +503,7 @@
 	  ether port USB, AC97, PCI, etc.
 
 config MACH_VR41XX
-	bool "Support for NEC VR4100 series based machines"
-	select SYS_HAS_CPU_VR41XX
-	select SYS_SUPPORTS_32BIT_KERNEL
-	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+	bool "Support for NEC VR41XX-based machines"
 
 config PMC_YOSEMITE
 	bool "Support for PMC-Sierra Yosemite eval board"
@@ -1019,6 +1016,9 @@
 config HAVE_STD_PC_SERIAL_PORT
 	bool
 
+config VR4181
+	bool
+
 config ARC_CONSOLE
 	bool "ARC console support"
 	depends on SGI_IP22 || SNI_RM200_PCI
@@ -1130,7 +1130,7 @@
 	select CPU_SUPPORTS_32BIT_KERNEL
 	select CPU_SUPPORTS_64BIT_KERNEL
 	help
-	  The options selects support for the NEC VR4100 series of processors.
+	  The options selects support for the NEC VR41xx series of processors.
 	  Only choose this option if you have one of these processors as a
 	  kernel built with this option will not run on any other type of
 	  processor or vice versa.
--- linux-2.6.16-rc4/arch/mips/kernel/cpu-probe.c	2006-02-19 20:08:04.000000000 +0000
+++ mips-2.6.16-rc4/arch/mips/kernel/cpu-probe.c	2006-02-19 20:14:37.000000000 +0000
@@ -242,9 +242,15 @@
 		break;
 	case PRID_IMP_VR41XX:
 		switch (c->processor_id & 0xf0) {
+#ifndef CONFIG_VR4181
 		case PRID_REV_VR4111:
 			c->cputype = CPU_VR4111;
 			break;
+#else
+		case PRID_REV_VR4181:
+			c->cputype = CPU_VR4181;
+			break;
+#endif
 		case PRID_REV_VR4121:
 			c->cputype = CPU_VR4121;
 			break;

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: declance

[Martin Michlmayr]

Remove delta between Linus' and linux-mips git trees in declance

There are two changes between the Linus' and linux-mips git trees
regarding the declaner driver.  The first change is certainly correct
(as it is consistent with the rest of the file) and should be applied
to mainline; the other change seems correct too.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>


--- linux-2.6.16-rc4/drivers/net/declance.c	2006-02-19 20:09:07.000000000 +0000
+++ mips-2.6.16-rc4/drivers/net/declance.c	2006-02-19 20:15:22.000000000 +0000
@@ -704,8 +704,8 @@
 	return IRQ_HANDLED;
 }
 
-static irqreturn_t
-lance_interrupt(const int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t lance_interrupt(const int irq, void *dev_id,
+				   struct pt_regs *regs)
 {
 	struct net_device *dev = (struct net_device *) dev_id;
 	struct lance_private *lp = netdev_priv(dev);
@@ -1255,7 +1255,7 @@
 	return 0;
 
 err_out_free_dev:
-	kfree(dev);
+	free_netdev(dev);
 
 err_out:
 	return ret;

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: tulip

[Martin Michlmayr]

Anyone know what this change is good for?


--- linux-2.6.16-rc4/drivers/net/tulip/tulip_core.c	2006-02-19 20:09:12.000000000 +0000
+++ mips-2.6.16-rc4/drivers/net/tulip/tulip_core.c	2006-02-19 20:15:27.000000000 +0000
@@ -1495,8 +1495,8 @@
                if ((pdev->bus->number == 0) && (PCI_SLOT(pdev->devfn) == 4)) {
                        /* DDB5477 MAC address in first EEPROM locations. */
                        sa_offset = 0;
-                       /* No media table either */
-                       tp->flags &= ~HAS_MEDIA_TABLE;
+		       /* Ensure our media table fixup get's applied */
+		       memcpy(ee_data + 16, ee_data, 8);
                }
 #endif
 #ifdef CONFIG_MIPS_COBALT

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: elf.h

[Martin Michlmayr]

Can we agree?

--- linux-2.6.16-rc4/include/linux/elf.h	2006-02-19 20:09:52.000000000 +0000
+++ mips-2.6.16-rc4/include/linux/elf.h	2006-02-19 20:16:23.000000000 +0000
@@ -67,7 +67,7 @@
 
 #define EM_MIPS		8	/* MIPS R3000 (officially, big-endian only) */
 
-#define EM_MIPS_RS4_BE 10	/* MIPS R4000 big-endian */
+#define EM_MIPS_RS3_LE 10	/* MIPS R3000 little-endian */
 
 #define EM_PARISC      15	/* HPPA */
 

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: drivers!

[Martin Michlmayr]

* Martin Michlmayr <tbm@cyrius.com> [2006-02-19 23:43]:
>  drivers/char/ibm_workpad_keymap.map        |  343 ++++
> Michael Klar <wyldfier@iname.com>
> 
>  drivers/net/big_sur_ge.c                   | 2005 ++++++++++++++++++++++++++++
>  drivers/net/big_sur_ge.h                   |  713 +++++++++
>  drivers/net/titan_ge.c                     | 2071 +++++++++++++++++++++++++++++
>  drivers/net/titan_ge.h                     |  419 +++++
>  drivers/net/titan_mdio.c                   |  217 +++
>  drivers/net/titan_mdio.h                   |   56 
> Manish Lachwani <lachwani@pmc-sierra.com>

>  drivers/video/smivgxfb.c                   |  387 +++++
> johuang@siliconmotion.com

Mail bounces of these three.
-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: VR4181

[Yoichi Yuasa]

Hi Martin,

VR4181 has already been removed from the mainline and linux-mips. 
I think linux-mips should synchronize with the mainline.

Yoichi

On Mon, 20 Feb 2006 00:11:26 +0000
Martin Michlmayr <tbm@cyrius.com> wrote:

> It seems the following VR4181 change never made it into mainline.
> 
> 
> --- linux-2.6.16-rc4/arch/mips/Kconfig	2006-02-19 20:08:02.000000000 +0000
> +++ mips-2.6.16-rc4/arch/mips/Kconfig	2006-02-19 20:14:36.000000000 +0000
> @@ -503,10 +503,7 @@
>  	  ether port USB, AC97, PCI, etc.
>  
>  config MACH_VR41XX
> -	bool "Support for NEC VR4100 series based machines"
> -	select SYS_HAS_CPU_VR41XX
> -	select SYS_SUPPORTS_32BIT_KERNEL
> -	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
> +	bool "Support for NEC VR41XX-based machines"
>  
>  config PMC_YOSEMITE
>  	bool "Support for PMC-Sierra Yosemite eval board"
> @@ -1019,6 +1016,9 @@
>  config HAVE_STD_PC_SERIAL_PORT
>  	bool
>  
> +config VR4181
> +	bool
> +
>  config ARC_CONSOLE
>  	bool "ARC console support"
>  	depends on SGI_IP22 || SNI_RM200_PCI
> @@ -1130,7 +1130,7 @@
>  	select CPU_SUPPORTS_32BIT_KERNEL
>  	select CPU_SUPPORTS_64BIT_KERNEL
>  	help
> -	  The options selects support for the NEC VR4100 series of processors.
> +	  The options selects support for the NEC VR41xx series of processors.
>  	  Only choose this option if you have one of these processors as a
>  	  kernel built with this option will not run on any other type of
>  	  processor or vice versa.
> --- linux-2.6.16-rc4/arch/mips/kernel/cpu-probe.c	2006-02-19 20:08:04.000000000 +0000
> +++ mips-2.6.16-rc4/arch/mips/kernel/cpu-probe.c	2006-02-19 20:14:37.000000000 +0000
> @@ -242,9 +242,15 @@
>  		break;
>  	case PRID_IMP_VR41XX:
>  		switch (c->processor_id & 0xf0) {
> +#ifndef CONFIG_VR4181
>  		case PRID_REV_VR4111:
>  			c->cputype = CPU_VR4111;
>  			break;
> +#else
> +		case PRID_REV_VR4181:
> +			c->cputype = CPU_VR4181;
> +			break;
> +#endif
>  		case PRID_REV_VR4121:
>  			c->cputype = CPU_VR4121;
>  			break;
> 

Re: Diff between Linus' and linux-mips git: VR4181

[Martin Michlmayr]

* Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> [2006-02-20 10:07]:
> VR4181 has already been removed from the mainline and linux-mips. 
> I think linux-mips should synchronize with the mainline.

There are many references to VR4181 stil.  If VR4181 support is gone,
maybe we should do the following:

[MIPS] Remove last portions of incomplete VR4181 support

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>


diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 4ca93ff..b89088e 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -503,7 +503,8 @@ config DDB5477
 	  ether port USB, AC97, PCI, etc.
 
 config MACH_VR41XX
-	bool "Support for NEC VR41XX-based machines"
+	bool "Support for NEC VR41XX based machines"
+	select SYS_HAS_CPU_VR41XX
 
 config PMC_YOSEMITE
 	bool "Support for PMC-Sierra Yosemite eval board"
@@ -1016,9 +1017,6 @@ config MIPS_L1_CACHE_SHIFT
 config HAVE_STD_PC_SERIAL_PORT
 	bool
 
-config VR4181
-	bool
-
 config ARC_CONSOLE
 	bool "ARC console support"
 	depends on SGI_IP22 || SNI_RM200_PCI
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index c6363ff..19b84f4 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -242,23 +242,14 @@ static inline void cpu_probe_legacy(stru
 		break;
 	case PRID_IMP_VR41XX:
 		switch (c->processor_id & 0xf0) {
-#ifndef CONFIG_VR4181
 		case PRID_REV_VR4111:
 			c->cputype = CPU_VR4111;
 			break;
-#else
-		case PRID_REV_VR4181:
-			c->cputype = CPU_VR4181;
-			break;
-#endif
 		case PRID_REV_VR4121:
 			c->cputype = CPU_VR4121;
 			break;
 		case PRID_REV_VR4122:
-			if ((c->processor_id & 0xf) < 0x3)
-				c->cputype = CPU_VR4122;
-			else
-				c->cputype = CPU_VR4181A;
+			c->cputype = CPU_VR4122;
 			break;
 		case PRID_REV_VR4130:
 			if ((c->processor_id & 0xf) < 0x4)
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 86fe15b..b31cd90 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -79,8 +79,6 @@ static const char *cpu_name[] = {
 	[CPU_VR4122]	= "NEC VR4122",
 	[CPU_VR4131]	= "NEC VR4131",
 	[CPU_VR4133]	= "NEC VR4133",
-	[CPU_VR4181]	= "NEC VR4181",
-	[CPU_VR4181A]	= "NEC VR4181A",
 	[CPU_SR71000]	= "Sandcraft SR71000",
 	[CPU_PR4450]	= "Philips PR4450",
 };
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 1b71d91..2828a59 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -840,8 +840,6 @@ static void __init probe_pcache(void)
 	case CPU_VR4111:
 	case CPU_VR4121:
 	case CPU_VR4122:
-	case CPU_VR4181:
-	case CPU_VR4181A:
 		icache_size = 1 << (10 + ((config & CONF_IC) >> 9));
 		c->icache.linesz = 16 << ((config & CONF_IB) >> 5);
 		c->icache.ways = 1;
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 0f94858..f96d6e0 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -908,8 +908,6 @@ static __init void build_tlb_write_entry
 	case CPU_VR4111:
 	case CPU_VR4121:
 	case CPU_VR4122:
-	case CPU_VR4181:
-	case CPU_VR4181A:
 		i_nop(p);
 		i_nop(p);
 		tlbw(p);
@@ -1054,8 +1052,6 @@ static __init void build_adjust_context(
 	case CPU_VR4121:
 	case CPU_VR4122:
 	case CPU_VR4131:
-	case CPU_VR4181:
-	case CPU_VR4181A:
 	case CPU_VR4133:
 		shift += 2;
 		break;
diff --git a/include/asm-mips/cpu.h b/include/asm-mips/cpu.h
index 818b9a9..ab2476b 100644
--- a/include/asm-mips/cpu.h
+++ b/include/asm-mips/cpu.h
@@ -116,10 +116,8 @@
 #define PRID_REV_TX3922 	0x0030
 #define PRID_REV_TX3927 	0x0040
 #define PRID_REV_VR4111		0x0050
-#define PRID_REV_VR4181		0x0050	/* Same as VR4111 */
 #define PRID_REV_VR4121		0x0060
 #define PRID_REV_VR4122		0x0070
-#define PRID_REV_VR4181A	0x0070	/* Same as VR4122 */
 #define PRID_REV_VR4130		0x0080
 
 /*
@@ -183,8 +181,6 @@
 #define CPU_VR4121		47
 #define CPU_VR4122		48
 #define CPU_VR4131		49
-#define CPU_VR4181		50
-#define CPU_VR4181A		51
 #define CPU_AU1100		52
 #define CPU_SR71000		53
 #define CPU_RM9000		54
diff --git a/include/asm-mips/vr41xx/vr41xx.h b/include/asm-mips/vr41xx/vr41xx.h
index 70828d5..3ab7ad6 100644
--- a/include/asm-mips/vr41xx/vr41xx.h
+++ b/include/asm-mips/vr41xx/vr41xx.h
@@ -29,10 +29,6 @@
 #define PRID_VR4122_REV3_0	0x00000c71
 #define PRID_VR4122_REV3_1	0x00000c72
 
-/* VR4181A 0x00000c73-0x00000c7f */
-#define PRID_VR4181A_REV1_0	0x00000c73
-#define PRID_VR4181A_REV1_1	0x00000c74
-
 /* VR4131 0x00000c80-0x00000c83 */
 #define PRID_VR4131_REV1_2	0x00000c80
 #define PRID_VR4131_REV2_0	0x00000c81

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: VR4181

[Yoichi Yuasa]

Hi Martin,

VR4181 and VR4181A are different.
Please don't remove VR4181A. 

Yoichi

On Mon, 20 Feb 2006 01:21:16 +0000
Martin Michlmayr <tbm@cyrius.com> wrote:

> * Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> [2006-02-20 10:07]:
> > VR4181 has already been removed from the mainline and linux-mips. 
> > I think linux-mips should synchronize with the mainline.
> 
> There are many references to VR4181 stil.  If VR4181 support is gone,
> maybe we should do the following:
> 
> [MIPS] Remove last portions of incomplete VR4181 support
> 
> Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
> 
> 
> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index 4ca93ff..b89088e 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -503,7 +503,8 @@ config DDB5477
>  	  ether port USB, AC97, PCI, etc.
>  
>  config MACH_VR41XX
> -	bool "Support for NEC VR41XX-based machines"
> +	bool "Support for NEC VR41XX based machines"
> +	select SYS_HAS_CPU_VR41XX
>  
>  config PMC_YOSEMITE
>  	bool "Support for PMC-Sierra Yosemite eval board"
> @@ -1016,9 +1017,6 @@ config MIPS_L1_CACHE_SHIFT
>  config HAVE_STD_PC_SERIAL_PORT
>  	bool
>  
> -config VR4181
> -	bool
> -
>  config ARC_CONSOLE
>  	bool "ARC console support"
>  	depends on SGI_IP22 || SNI_RM200_PCI
> diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
> index c6363ff..19b84f4 100644
> --- a/arch/mips/kernel/cpu-probe.c
> +++ b/arch/mips/kernel/cpu-probe.c
> @@ -242,23 +242,14 @@ static inline void cpu_probe_legacy(stru
>  		break;
>  	case PRID_IMP_VR41XX:
>  		switch (c->processor_id & 0xf0) {
> -#ifndef CONFIG_VR4181
>  		case PRID_REV_VR4111:
>  			c->cputype = CPU_VR4111;
>  			break;
> -#else
> -		case PRID_REV_VR4181:
> -			c->cputype = CPU_VR4181;
> -			break;
> -#endif
>  		case PRID_REV_VR4121:
>  			c->cputype = CPU_VR4121;
>  			break;
>  		case PRID_REV_VR4122:
> -			if ((c->processor_id & 0xf) < 0x3)
> -				c->cputype = CPU_VR4122;
> -			else
> -				c->cputype = CPU_VR4181A;
> +			c->cputype = CPU_VR4122;
>  			break;
>  		case PRID_REV_VR4130:
>  			if ((c->processor_id & 0xf) < 0x4)
> diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
> index 86fe15b..b31cd90 100644
> --- a/arch/mips/kernel/proc.c
> +++ b/arch/mips/kernel/proc.c
> @@ -79,8 +79,6 @@ static const char *cpu_name[] = {
>  	[CPU_VR4122]	= "NEC VR4122",
>  	[CPU_VR4131]	= "NEC VR4131",
>  	[CPU_VR4133]	= "NEC VR4133",
> -	[CPU_VR4181]	= "NEC VR4181",
> -	[CPU_VR4181A]	= "NEC VR4181A",
>  	[CPU_SR71000]	= "Sandcraft SR71000",
>  	[CPU_PR4450]	= "Philips PR4450",
>  };
> diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
> index 1b71d91..2828a59 100644
> --- a/arch/mips/mm/c-r4k.c
> +++ b/arch/mips/mm/c-r4k.c
> @@ -840,8 +840,6 @@ static void __init probe_pcache(void)
>  	case CPU_VR4111:
>  	case CPU_VR4121:
>  	case CPU_VR4122:
> -	case CPU_VR4181:
> -	case CPU_VR4181A:
>  		icache_size = 1 << (10 + ((config & CONF_IC) >> 9));
>  		c->icache.linesz = 16 << ((config & CONF_IB) >> 5);
>  		c->icache.ways = 1;
> diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
> index 0f94858..f96d6e0 100644
> --- a/arch/mips/mm/tlbex.c
> +++ b/arch/mips/mm/tlbex.c
> @@ -908,8 +908,6 @@ static __init void build_tlb_write_entry
>  	case CPU_VR4111:
>  	case CPU_VR4121:
>  	case CPU_VR4122:
> -	case CPU_VR4181:
> -	case CPU_VR4181A:
>  		i_nop(p);
>  		i_nop(p);
>  		tlbw(p);
> @@ -1054,8 +1052,6 @@ static __init void build_adjust_context(
>  	case CPU_VR4121:
>  	case CPU_VR4122:
>  	case CPU_VR4131:
> -	case CPU_VR4181:
> -	case CPU_VR4181A:
>  	case CPU_VR4133:
>  		shift += 2;
>  		break;
> diff --git a/include/asm-mips/cpu.h b/include/asm-mips/cpu.h
> index 818b9a9..ab2476b 100644
> --- a/include/asm-mips/cpu.h
> +++ b/include/asm-mips/cpu.h
> @@ -116,10 +116,8 @@
>  #define PRID_REV_TX3922 	0x0030
>  #define PRID_REV_TX3927 	0x0040
>  #define PRID_REV_VR4111		0x0050
> -#define PRID_REV_VR4181		0x0050	/* Same as VR4111 */
>  #define PRID_REV_VR4121		0x0060
>  #define PRID_REV_VR4122		0x0070
> -#define PRID_REV_VR4181A	0x0070	/* Same as VR4122 */
>  #define PRID_REV_VR4130		0x0080
>  
>  /*
> @@ -183,8 +181,6 @@
>  #define CPU_VR4121		47
>  #define CPU_VR4122		48
>  #define CPU_VR4131		49
> -#define CPU_VR4181		50
> -#define CPU_VR4181A		51
>  #define CPU_AU1100		52
>  #define CPU_SR71000		53
>  #define CPU_RM9000		54
> diff --git a/include/asm-mips/vr41xx/vr41xx.h b/include/asm-mips/vr41xx/vr41xx.h
> index 70828d5..3ab7ad6 100644
> --- a/include/asm-mips/vr41xx/vr41xx.h
> +++ b/include/asm-mips/vr41xx/vr41xx.h
> @@ -29,10 +29,6 @@
>  #define PRID_VR4122_REV3_0	0x00000c71
>  #define PRID_VR4122_REV3_1	0x00000c72
>  
> -/* VR4181A 0x00000c73-0x00000c7f */
> -#define PRID_VR4181A_REV1_0	0x00000c73
> -#define PRID_VR4181A_REV1_1	0x00000c74
> -
>  /* VR4131 0x00000c80-0x00000c83 */
>  #define PRID_VR4131_REV1_2	0x00000c80
>  #define PRID_VR4131_REV2_0	0x00000c81
> 
> -- 
> Martin Michlmayr
> http://www.cyrius.com/


-- 
トライピークス株式会社
湯浅陽一 <yoichi_yuasa@tripeaks.co.jp>

〒141-0031
東京都品川区西五反田1-32-4サンユー西五反田ビル3F
TEL: 03-5719-8655
FAX: 03-5719-8656
URL: http://www.tripeaks.co.jp

Re: Diff between Linus' and linux-mips git: VR4181

[Martin Michlmayr]

* Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> [2006-02-20 10:32]:
> VR4181 and VR4181A are different.
> Please don't remove VR4181A. 

OK, this one doesn't touch VR4181A.


[MIPS] Remove last portions of incomplete VR4181 support

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 4ca93ff..b89088e 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -503,7 +503,8 @@ config DDB5477
 	  ether port USB, AC97, PCI, etc.
 
 config MACH_VR41XX
-	bool "Support for NEC VR41XX-based machines"
+	bool "Support for NEC VR41XX based machines"
+	select SYS_HAS_CPU_VR41XX
 
 config PMC_YOSEMITE
 	bool "Support for PMC-Sierra Yosemite eval board"
@@ -1016,9 +1017,6 @@ config MIPS_L1_CACHE_SHIFT
 config HAVE_STD_PC_SERIAL_PORT
 	bool
 
-config VR4181
-	bool
-
 config ARC_CONSOLE
 	bool "ARC console support"
 	depends on SGI_IP22 || SNI_RM200_PCI
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index c6363ff..292f8b2 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -242,15 +242,9 @@ static inline void cpu_probe_legacy(stru
 		break;
 	case PRID_IMP_VR41XX:
 		switch (c->processor_id & 0xf0) {
-#ifndef CONFIG_VR4181
 		case PRID_REV_VR4111:
 			c->cputype = CPU_VR4111;
 			break;
-#else
-		case PRID_REV_VR4181:
-			c->cputype = CPU_VR4181;
-			break;
-#endif
 		case PRID_REV_VR4121:
 			c->cputype = CPU_VR4121;
 			break;
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 86fe15b..0fbf450 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -79,7 +79,6 @@ static const char *cpu_name[] = {
 	[CPU_VR4122]	= "NEC VR4122",
 	[CPU_VR4131]	= "NEC VR4131",
 	[CPU_VR4133]	= "NEC VR4133",
-	[CPU_VR4181]	= "NEC VR4181",
 	[CPU_VR4181A]	= "NEC VR4181A",
 	[CPU_SR71000]	= "Sandcraft SR71000",
 	[CPU_PR4450]	= "Philips PR4450",
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 1b71d91..28a3b33 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -840,7 +840,6 @@ static void __init probe_pcache(void)
 	case CPU_VR4111:
 	case CPU_VR4121:
 	case CPU_VR4122:
-	case CPU_VR4181:
 	case CPU_VR4181A:
 		icache_size = 1 << (10 + ((config & CONF_IC) >> 9));
 		c->icache.linesz = 16 << ((config & CONF_IB) >> 5);
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 0f94858..5a7e0a6 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -908,7 +908,6 @@ static __init void build_tlb_write_entry
 	case CPU_VR4111:
 	case CPU_VR4121:
 	case CPU_VR4122:
-	case CPU_VR4181:
 	case CPU_VR4181A:
 		i_nop(p);
 		i_nop(p);
@@ -1054,9 +1053,8 @@ static __init void build_adjust_context(
 	case CPU_VR4121:
 	case CPU_VR4122:
 	case CPU_VR4131:
-	case CPU_VR4181:
-	case CPU_VR4181A:
 	case CPU_VR4133:
+	case CPU_VR4181A:
 		shift += 2;
 		break;
 
diff --git a/include/asm-mips/cpu.h b/include/asm-mips/cpu.h
index 818b9a9..ef72bcd 100644
--- a/include/asm-mips/cpu.h
+++ b/include/asm-mips/cpu.h
@@ -116,7 +116,6 @@
 #define PRID_REV_TX3922 	0x0030
 #define PRID_REV_TX3927 	0x0040
 #define PRID_REV_VR4111		0x0050
-#define PRID_REV_VR4181		0x0050	/* Same as VR4111 */
 #define PRID_REV_VR4121		0x0060
 #define PRID_REV_VR4122		0x0070
 #define PRID_REV_VR4181A	0x0070	/* Same as VR4122 */
@@ -183,7 +182,6 @@
 #define CPU_VR4121		47
 #define CPU_VR4122		48
 #define CPU_VR4131		49
-#define CPU_VR4181		50
 #define CPU_VR4181A		51
 #define CPU_AU1100		52
 #define CPU_SR71000		53
diff --git a/include/asm-mips/vr41xx/vr41xx.h b/include/asm-mips/vr41xx/vr41xx.h

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: VR4181

[Yoichi Yuasa]

Acked-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

On Mon, 20 Feb 2006 01:41:21 +0000
Martin Michlmayr <tbm@cyrius.com> wrote:

> * Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> [2006-02-20 10:32]:
> > VR4181 and VR4181A are different.
> > Please don't remove VR4181A. 
> 
> OK, this one doesn't touch VR4181A.
> 
> 
> [MIPS] Remove last portions of incomplete VR4181 support
> 
> Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
> 
> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index 4ca93ff..b89088e 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -503,7 +503,8 @@ config DDB5477
>  	  ether port USB, AC97, PCI, etc.
>  
>  config MACH_VR41XX
> -	bool "Support for NEC VR41XX-based machines"
> +	bool "Support for NEC VR41XX based machines"
> +	select SYS_HAS_CPU_VR41XX
>  
>  config PMC_YOSEMITE
>  	bool "Support for PMC-Sierra Yosemite eval board"
> @@ -1016,9 +1017,6 @@ config MIPS_L1_CACHE_SHIFT
>  config HAVE_STD_PC_SERIAL_PORT
>  	bool
>  
> -config VR4181
> -	bool
> -
>  config ARC_CONSOLE
>  	bool "ARC console support"
>  	depends on SGI_IP22 || SNI_RM200_PCI
> diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
> index c6363ff..292f8b2 100644
> --- a/arch/mips/kernel/cpu-probe.c
> +++ b/arch/mips/kernel/cpu-probe.c
> @@ -242,15 +242,9 @@ static inline void cpu_probe_legacy(stru
>  		break;
>  	case PRID_IMP_VR41XX:
>  		switch (c->processor_id & 0xf0) {
> -#ifndef CONFIG_VR4181
>  		case PRID_REV_VR4111:
>  			c->cputype = CPU_VR4111;
>  			break;
> -#else
> -		case PRID_REV_VR4181:
> -			c->cputype = CPU_VR4181;
> -			break;
> -#endif
>  		case PRID_REV_VR4121:
>  			c->cputype = CPU_VR4121;
>  			break;
> diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
> index 86fe15b..0fbf450 100644
> --- a/arch/mips/kernel/proc.c
> +++ b/arch/mips/kernel/proc.c
> @@ -79,7 +79,6 @@ static const char *cpu_name[] = {
>  	[CPU_VR4122]	= "NEC VR4122",
>  	[CPU_VR4131]	= "NEC VR4131",
>  	[CPU_VR4133]	= "NEC VR4133",
> -	[CPU_VR4181]	= "NEC VR4181",
>  	[CPU_VR4181A]	= "NEC VR4181A",
>  	[CPU_SR71000]	= "Sandcraft SR71000",
>  	[CPU_PR4450]	= "Philips PR4450",
> diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
> index 1b71d91..28a3b33 100644
> --- a/arch/mips/mm/c-r4k.c
> +++ b/arch/mips/mm/c-r4k.c
> @@ -840,7 +840,6 @@ static void __init probe_pcache(void)
>  	case CPU_VR4111:
>  	case CPU_VR4121:
>  	case CPU_VR4122:
> -	case CPU_VR4181:
>  	case CPU_VR4181A:
>  		icache_size = 1 << (10 + ((config & CONF_IC) >> 9));
>  		c->icache.linesz = 16 << ((config & CONF_IB) >> 5);
> diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
> index 0f94858..5a7e0a6 100644
> --- a/arch/mips/mm/tlbex.c
> +++ b/arch/mips/mm/tlbex.c
> @@ -908,7 +908,6 @@ static __init void build_tlb_write_entry
>  	case CPU_VR4111:
>  	case CPU_VR4121:
>  	case CPU_VR4122:
> -	case CPU_VR4181:
>  	case CPU_VR4181A:
>  		i_nop(p);
>  		i_nop(p);
> @@ -1054,9 +1053,8 @@ static __init void build_adjust_context(
>  	case CPU_VR4121:
>  	case CPU_VR4122:
>  	case CPU_VR4131:
> -	case CPU_VR4181:
> -	case CPU_VR4181A:
>  	case CPU_VR4133:
> +	case CPU_VR4181A:
>  		shift += 2;
>  		break;
>  
> diff --git a/include/asm-mips/cpu.h b/include/asm-mips/cpu.h
> index 818b9a9..ef72bcd 100644
> --- a/include/asm-mips/cpu.h
> +++ b/include/asm-mips/cpu.h
> @@ -116,7 +116,6 @@
>  #define PRID_REV_TX3922 	0x0030
>  #define PRID_REV_TX3927 	0x0040
>  #define PRID_REV_VR4111		0x0050
> -#define PRID_REV_VR4181		0x0050	/* Same as VR4111 */
>  #define PRID_REV_VR4121		0x0060
>  #define PRID_REV_VR4122		0x0070
>  #define PRID_REV_VR4181A	0x0070	/* Same as VR4122 */
> @@ -183,7 +182,6 @@
>  #define CPU_VR4121		47
>  #define CPU_VR4122		48
>  #define CPU_VR4131		49
> -#define CPU_VR4181		50
>  #define CPU_VR4181A		51
>  #define CPU_AU1100		52
>  #define CPU_SR71000		53
> diff --git a/include/asm-mips/vr41xx/vr41xx.h b/include/asm-mips/vr41xx/vr41xx.h
> 
> -- 
> Martin Michlmayr
> http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: elf.h

[Ralf Baechle]

On Mon, Feb 20, 2006 at 12:31:28AM +0000, Martin Michlmayr wrote:

> Can we agree?

> -#define EM_MIPS_RS4_BE 10	/* MIPS R4000 big-endian */
> +#define EM_MIPS_RS3_LE 10	/* MIPS R3000 little-endian */

Not really :-)

I've dug deep into history - but it seems nobody remembers the reason for
this change anymore.  I suspect actually both constant names might
historically have been in use.  For the purposes of Linux it's probably
best to dump the whole number - it never had any relevance.

  Ralf

Re: Diff between Linus' and linux-mips git: trivial changes

[Maciej W. Rozycki]

On Sun, 19 Feb 2006, Martin Michlmayr wrote:

> diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
> index 6acfa3d..dd628cb 100644
> --- a/drivers/mtd/devices/Kconfig
> +++ b/drivers/mtd/devices/Kconfig
> @@ -47,11 +47,6 @@ config MTD_MS02NV
>  	  accelerator.  Say Y here if you have a DECstation 5000/2x0 or a
>  	  DECsystem 5900 equipped with such a module.
>  
> -	  If you want to compile this driver as a module ( = code which can be
> -	  inserted in and removed from the running kernel whenever you want),
> -	  say M here and read <file:Documentation/modules.txt>.  The module will
> -	  be called ms02-nv.o.
> -
>  config MTD_DATAFLASH
>  	tristate "Support for AT45xxx DataFlash"
>  	depends on MTD && SPI_MASTER && EXPERIMENTAL

 NAK.

> diff --git a/drivers/net/declance.c b/drivers/net/declance.c
> index d049129..6561575 100644
> --- a/drivers/net/declance.c
> +++ b/drivers/net/declance.c
> @@ -1301,7 +1301,6 @@ static void __exit dec_lance_cleanup(voi
>  	while (root_lance_dev) {
>  		struct net_device *dev = root_lance_dev;
>  		struct lance_private *lp = netdev_priv(dev);
> -
>  		unregister_netdev(dev);
>  #ifdef CONFIG_TC
>  		if (lp->slot >= 0)

 NAK.

> diff --git a/drivers/scsi/dec_esp.c b/drivers/scsi/dec_esp.c
> index e755664..4b86685 100644
> --- a/drivers/scsi/dec_esp.c
> +++ b/drivers/scsi/dec_esp.c
> @@ -55,7 +55,7 @@
>  
>  static int  dma_bytes_sent(struct NCR_ESP *esp, int fifo_count);
>  static void dma_drain(struct NCR_ESP *esp);
> -static int  dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd * sp);
> +static int  dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd *sp);
>  static void dma_dump_state(struct NCR_ESP *esp);
>  static void dma_init_read(struct NCR_ESP *esp, u32 vaddress, int length);
>  static void dma_init_write(struct NCR_ESP *esp, u32 vaddress, int length);

 ACK.

> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
> index 7d7724c..7e63f15 100644
> --- a/drivers/video/Kconfig
> +++ b/drivers/video/Kconfig
> @@ -1336,8 +1336,8 @@ config FB_PMAGB_B
>   	select FB_CFB_IMAGEBLIT
>  	help
>  	  Support for the PMAGB-B TURBOchannel framebuffer card used mainly
> -	  in the MIPS-based DECstation series. The card is currently only 
> -	  supported in 1280x1024x8 mode.  
> +	  in the MIPS-based DECstation series. The card is currently only
> +	  supported in 1280x1024x8 mode.
>  
>  config FB_MAXINE
>  	bool "Maxine (Personal DECstation) onboard framebuffer support"

 ACK.

 Thanks for looking into it.

  Maciej

Re: Diff between Linus' and linux-mips git: trivial changes

[Ralf Baechle]

On Mon, Feb 20, 2006 at 01:33:31PM +0000, Maciej W. Rozycki wrote:

> > diff --git a/drivers/scsi/dec_esp.c b/drivers/scsi/dec_esp.c
> > index e755664..4b86685 100644
> > --- a/drivers/scsi/dec_esp.c
> > +++ b/drivers/scsi/dec_esp.c
> > @@ -55,7 +55,7 @@
> >  
> >  static int  dma_bytes_sent(struct NCR_ESP *esp, int fifo_count);
> >  static void dma_drain(struct NCR_ESP *esp);
> > -static int  dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd * sp);
> > +static int  dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd *sp);
> >  static void dma_dump_state(struct NCR_ESP *esp);
> >  static void dma_init_read(struct NCR_ESP *esp, u32 vaddress, int length);
> >  static void dma_init_write(struct NCR_ESP *esp, u32 vaddress, int length);
> 
>  ACK.

Actually the reversed patch is on in flight since a while but seems to
have lost like anything SCSI-related I sent in past weeks ...

  Ralf

Re: Diff between Linus' and linux-mips git: trivial changes

[Martin Michlmayr]

* Maciej W. Rozycki <macro@linux-mips.org> [2006-02-20 13:33]:
> > -static int  dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd * sp);
> > +static int  dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd *sp);
>  ACK.


[MIPS] Remove space before pointer - sync with Linus tree

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Acked-by: Maciej W. Rozycki <macro@linux-mips.org>

---

diff --git a/drivers/scsi/dec_esp.c b/drivers/scsi/dec_esp.c
index e755664..4b86685 100644
--- a/drivers/scsi/dec_esp.c
+++ b/drivers/scsi/dec_esp.c
@@ -55,7 +55,7 @@
 
 static int  dma_bytes_sent(struct NCR_ESP *esp, int fifo_count);
 static void dma_drain(struct NCR_ESP *esp);
-static int  dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd * sp);
+static int  dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd *sp);
 static void dma_dump_state(struct NCR_ESP *esp);
 static void dma_init_read(struct NCR_ESP *esp, u32 vaddress, int length);
 static void dma_init_write(struct NCR_ESP *esp, u32 vaddress, int length);

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: trivial changes

[Martin Michlmayr]

* Maciej W. Rozycki <macro@linux-mips.org> [2006-02-20 13:33]:
> > +	  in the MIPS-based DECstation series. The card is currently only
> > +	  supported in 1280x1024x8 mode.
>  ACK.


[MIPS] Remove trailing whitespace from drivers/video/Kconfig - sync with Linus tree

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Acked-by: Maciej W. Rozycki <macro@linux-mips.org>

---

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7d7724c..7e63f15 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1336,8 +1336,8 @@ config FB_PMAGB_B
  	select FB_CFB_IMAGEBLIT
 	help
 	  Support for the PMAGB-B TURBOchannel framebuffer card used mainly
-	  in the MIPS-based DECstation series. The card is currently only 
-	  supported in 1280x1024x8 mode.  
+	  in the MIPS-based DECstation series. The card is currently only
+	  supported in 1280x1024x8 mode.
 
 config FB_MAXINE
 	bool "Maxine (Personal DECstation) onboard framebuffer support"


-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: trivial changes

[Martin Michlmayr]

[MIPS] Remove typecase from drivers/mtd/maps/lasat.c - sync with Linus tree

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>

diff --git a/drivers/mtd/maps/lasat.c b/drivers/mtd/maps/lasat.c
index 2a2efaa..31d2c35 100644
--- a/drivers/mtd/maps/lasat.c
+++ b/drivers/mtd/maps/lasat.c
@@ -7,7 +7,8 @@
  * modify it under the terms of the GNU General Public License version
  * 2 as published by the Free Software Foundation.
  *
- * $Id: lasat.c,v 1.7 2004/07/12 21:59:44 dwmw2 Exp $
+ * $Id: lasat.c,v 1.9 2004/11/04 13:24:15 gleixner Exp $
+ *
  *
  */
 
@@ -50,7 +51,7 @@ static int __init init_lasat(void)
 	ENABLE_VPP((&lasat_map));
 
 	lasat_map.phys = lasat_flash_partition_start(LASAT_MTD_BOOTLOADER);
-	lasat_map.virt = (unsigned long)ioremap_nocache(
+	lasat_map.virt = ioremap_nocache(
 		        lasat_map.phys, lasat_board_info.li_flash_size);
 	lasat_map.size = lasat_board_info.li_flash_size;
 

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: declance

[Martin Michlmayr]

Updated patch, please apply.


[PATCH] Remove delta between Linus' and linux-mips git trees in declance

There are three changes between the Linus' and linux-mips git trees
regarding the declaner driver.  The first change is certainly correct
(as it is consistent with the rest of the file) and should be applied
to mainline; the other change seems correct too.  And the third is
cosmetic.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>

---

--- a/drivers/net/declance.c	2006-02-03 03:07:02.000000000 +0000
+++ b/drivers/net/declance.c	2006-02-19 23:50:11.000000000 +0000
@@ -704,8 +704,8 @@
 	return IRQ_HANDLED;
 }
 
-static irqreturn_t
-lance_interrupt(const int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t lance_interrupt(const int irq, void *dev_id,
+				   struct pt_regs *regs)
 {
 	struct net_device *dev = (struct net_device *) dev_id;
 	struct lance_private *lp = netdev_priv(dev);
@@ -1255,7 +1255,7 @@
 	return 0;
 
 err_out_free_dev:
-	kfree(dev);
+	free_netdev(dev);
 
 err_out:
 	return ret;
@@ -1301,6 +1301,7 @@
 	while (root_lance_dev) {
 		struct net_device *dev = root_lance_dev;
 		struct lance_private *lp = netdev_priv(dev);
+
 		unregister_netdev(dev);
 #ifdef CONFIG_TC
 		if (lp->slot >= 0)

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: trivial changes

[Martin Michlmayr]

* Maciej W. Rozycki <macro@linux-mips.org> [2006-02-20 13:33]:
> > -	  If you want to compile this driver as a module ( = code which can be
> > -	  inserted in and removed from the running kernel whenever you want),
> > -	  say M here and read <file:Documentation/modules.txt>.  The module will
> > -	  be called ms02-nv.o.
> > -
>  NAK.

I disagree with you - it's obvious from the name of the config option
(MTD_MS02NV) what the module will be called and people who compile
their own kernels should know.  More importantly, no other description
in this Kconfig file mentions anything like this.  However, since
there seems to be no Kconfig "writing style", I guess it must as well
be added.  But I guess the MTD folks removed it for a reason.

Still NAK, i.e. should I send the following patch to the MTD list, or
ok to remove?


[PATCH] Add information about modules to MTD_MS02NV - sync with linux-mips tree

This synces drivers/mtd/devices/Kconfig with the linux-mips tree by adding
some description about modules to MTD_MS02NV.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Acked-by: Maciej W. Rozycki <macro@linux-mips.org>

---

--- a/drivers/mtd/devices/Kconfig	2006-02-03 03:07:01.000000000 +0000
+++ b/drivers/mtd/devices/Kconfig	2006-02-19 23:50:11.000000000 +0000
@@ -47,6 +47,11 @@
 	  accelerator.  Say Y here if you have a DECstation 5000/2x0 or a
 	  DECsystem 5900 equipped with such a module.
 
+	  If you want to compile this driver as a module ( = code which can be
+	  inserted in and removed from the running kernel whenever you want),
+	  say M here and read <file:Documentation/modules.txt>.  The module will
+	  be called ms02-nv.o.
+
 config MTD_DATAFLASH
 	tristate "Support for AT45xxx DataFlash"
 	depends on MTD && SPI_MASTER && EXPERIMENTAL


> >  		struct net_device *dev = root_lance_dev;
> >  		struct lance_private *lp = netdev_priv(dev);
> > -
> >  		unregister_netdev(dev);
> >  #ifdef CONFIG_TC
> >  		if (lp->slot >= 0)
> 
>  NAK.

Upated patch sent to netdev.

Thanks.
-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: drivers!

[Jordan Crouse]

On 19/02/06 23:43 +0000, Martin Michlmayr wrote:
> We should find out whether these drivers are still needed, and if so,
> send them to the appropriate sub-system maintainer.  If they're no
> longer useful, they should be removed from the linux-mips tree.

Meh - I think there's something to be said for platform specific trees.
Why bother Linus with code that 99% of the users will never compile?
That said...

 
>  drivers/video/au1200fb.c                   | 1940 +++++++++++++++++++++++++++
>  drivers/video/au1200fb.h                   |  288 ++++

Not sure why this hasn't been sent up, but it should be good to go, 
right Ralf?

>  sound/oss/au1550_i2s.c                     | 2029 ++++++++++++++++++++++++++++

I thought we agreed that this would stay in linux-mips until such time that
somebody (probably me) got annoyed enough to write an ALSA driver.

Jordan
-- 
Jordan Crouse
Senior Linux Engineer
AMD - Personal Connectivity Solutions Group
<www.amd.com/embeddedprocessors>

Re: Diff between Linus' and linux-mips git: drivers!

[Martin Michlmayr]

* Jordan Crouse <jordan.crouse@amd.com> [2006-02-20 08:27]:
> Meh - I think there's something to be said for platform specific trees.
> Why bother Linus with code that 99% of the users will never compile?

If there are any major changes to the video layer, people will fix
your driver if it's in mainline; but not if it's in some obscure tree.
Also, peer review, etc.

> >  sound/oss/au1550_i2s.c                     | 2029  ++++++++++++++++++++++++++++
> I thought we agreed that this would stay in linux-mips until such
> time that somebody (probably me) got annoyed enough to write an ALSA
> driver.

lkml people seem to be trying hard recently to finally get rid of OSS,
so that would be nice.
-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: drivers!

[Christoph Hellwig]

On Mon, Feb 20, 2006 at 08:27:34AM -0700, Jordan Crouse wrote:
> On 19/02/06 23:43 +0000, Martin Michlmayr wrote:
> > We should find out whether these drivers are still needed, and if so,
> > send them to the appropriate sub-system maintainer.  If they're no
> > longer useful, they should be removed from the linux-mips tree.
> 
> Meh - I think there's something to be said for platform specific trees.

There's shouldn't be any platform-specific trees at all.  just staging
trees for subsystem maintainers.  For linux-mips that would be just
arch/mips/ and include/asm-mips/.  Having the common tree not compile
is a complete pain in the ass for distributors, and that includes
embedded SDK vendors.

Re: Diff between Linus' and linux-mips git: drivers!

[Ralf Baechle]

On Mon, Feb 20, 2006 at 08:27:34AM -0700, Jordan Crouse wrote:

> >  drivers/video/au1200fb.c                   | 1940 +++++++++++++++++++++++++++
> >  drivers/video/au1200fb.h                   |  288 ++++
> 
> Not sure why this hasn't been sent up, but it should be good to go, 
> right Ralf?

Thank you for volunteering to clean this driver.

It's amazing it's working at all ...

  Ralf

Re: Diff between Linus' and linux-mips git: trivial changes

[Maciej W. Rozycki]

On Mon, 20 Feb 2006, Martin Michlmayr wrote:

> I disagree with you - it's obvious from the name of the config option
> (MTD_MS02NV) what the module will be called and people who compile
> their own kernels should know.  More importantly, no other description
> in this Kconfig file mentions anything like this.  However, since
> there seems to be no Kconfig "writing style", I guess it must as well
> be added.  But I guess the MTD folks removed it for a reason.

 I can't recall if I noticed it being removed and I have no idea who 
removed it and why.  I seem to have no access to the MTD CVS tree right 
now, so I can't check the history of the file.

> Still NAK, i.e. should I send the following patch to the MTD list, or
> ok to remove?

 Well, descriptions for some drivers mention how the module is going to be 
called and others do not.  I'd prefer too much information was available 
rather than too little.  I don't think people should be forced to chase 
Makefiles trying to determine module names.  I don't insist though -- I 
fear the driver has too few users to care. ;-)

  Maciej

Re: Diff between Linus' and linux-mips git: declance

[Maciej W. Rozycki]

On Mon, 20 Feb 2006, Martin Michlmayr wrote:

> Updated patch, please apply.
> 
> 
> [PATCH] Remove delta between Linus' and linux-mips git trees in declance
> 
> There are three changes between the Linus' and linux-mips git trees
> regarding the declaner driver.  The first change is certainly correct
> (as it is consistent with the rest of the file) and should be applied
> to mainline; the other change seems correct too.  And the third is
> cosmetic.
> 
> Signed-off-by: Martin Michlmayr <tbm@cyrius.com>

Acked-by: Maciej W. Rozycki <macro@linux-mips.org>

  Maciej

Re: Diff between Linus' and linux-mips git: trivial changes

[Martin Michlmayr]

* Maciej W. Rozycki <macro@linux-mips.org> [2006-02-20 16:58]:
> I can't recall if I noticed it being removed and I have no idea who
> removed it and why.  I seem to have no access to the MTD CVS tree
> right now, so I can't check the history of the file.

I found it:

revision 1.10
date: 2004/07/15 00:34:49;  author: dwmw2;  state: Exp;  lines: +2 -7
MACH_DECSTATION not DECSTATION

Index: Kconfig
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/devices/Kconfig,v
retrieving revision 1.9
retrieving revision 1.10
diff -r1.9 -r1.10
2c2
< # $Id: Kconfig,v 1.9 2004/07/08 12:48:21 kalev Exp $
---
> # $Id: Kconfig,v 1.10 2004/07/15 00:34:49 dwmw2 Exp $
43c43
< 	depends on MTD && DECSTATION
---
> 	depends on MTD && MACH_DECSTATION
50,54d49
< 	  If you want to compile this driver as a module ( = code which can be
< 	  inserted in and removed from the running kernel whenever you want),
< 	  say M here and read <file:Documentation/modules.txt>.  The module will
< 	  be called ms02-nv.o.
< 

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: tulip

[Peter Horton]

On Mon, Feb 20, 2006 at 12:19:07AM +0000, Martin Michlmayr wrote:
> Anyone know what this change is good for?
> 
> 
> --- linux-2.6.16-rc4/drivers/net/tulip/tulip_core.c	2006-02-19 20:09:12.000000000 +0000
> +++ mips-2.6.16-rc4/drivers/net/tulip/tulip_core.c	2006-02-19 20:15:27.000000000 +0000
> @@ -1495,8 +1495,8 @@
>                 if ((pdev->bus->number == 0) && (PCI_SLOT(pdev->devfn) == 4)) {
>                         /* DDB5477 MAC address in first EEPROM locations. */
>                         sa_offset = 0;
> -                       /* No media table either */
> -                       tp->flags &= ~HAS_MEDIA_TABLE;
> +		       /* Ensure our media table fixup get's applied */
> +		       memcpy(ee_data + 16, ee_data, 8);
>                 }
>  #endif
>  #ifdef CONFIG_MIPS_COBALT
> 

Didn't the memcpy() used to be inside the CONFIG_MIPS_COBALT section ?

Looking at tulip/eeprom.c I can't work out why it was ever there though
...

P.

Re: Diff between Linus' and linux-mips git: tulip

[Martin Michlmayr]

* Peter Horton <pdh@colonel-panic.org> [2006-02-20 23:03]:
> > -                       /* No media table either */
> > -                       tp->flags &= ~HAS_MEDIA_TABLE;
> > +		       /* Ensure our media table fixup get's applied */
> > +		       memcpy(ee_data + 16, ee_data, 8);
> >  #endif
> >  #ifdef CONFIG_MIPS_COBALT
> Didn't the memcpy() used to be inside the CONFIG_MIPS_COBALT section ?
> Looking at tulip/eeprom.c I can't work out why it was ever there though

Yeah, and it's still there in the Cobalt section.  But now (in the
mips tree) it's _also_ there for CONFIG_DDB5477.  So I have several
questions:
 - can we just get rid of the code between CONFIG_MIPS_COBALT?
 - should the CONFIG_DDB5477 change be reverted (probably), and do we
   need these special cases for CONFIG_DDB* anyway or can they be
   solved in a better way (e.g. by putting something in eeprom.c).

It seems mips is the only arch that mucks around with "#ifdef CONFIG_"
in this file...
-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: tulip

[Martin Michlmayr]

* Martin Michlmayr <tbm@cyrius.com> [2006-02-24 01:13]:
>  - should the CONFIG_DDB5477 change be reverted (probably)

OK, I managed to track down when this change was introduced, namely in
the merge with Linux 2.6.13-rc1.  See
http://www.linux-mips.org/git?p=linux.git;a=blobdiff;h=e6781ea5ba055ec445f35c734a59db24e748be3a;hp=cfc346e72d6234ae37ee11b794791ee99fcec24e;hb=aa5fcc48f9ae2887b6c570411e73ef965f72a746;f=drivers/net/tulip/tulip_core.c

Ralf, please apply this to the mips-tree only (not for-linus).


[MIPS] Revert bogus tulip_core/DDB5477 change introduced in 2.6.13-rc1 merge

Merging with 2.6.13-rc1 introduced a change in the DDB5477 section of
tulip_core.c that was really meant for Cobalt (and was there already).
Revert this change, thereby syncing with Linus' tree.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>

--- mips.git/drivers/net/tulip/tulip_core.c	2006-02-23 22:05:30.000000000 +0000
+++ linux.git/drivers/net/tulip/tulip_core.c	2006-02-03 03:07:03.000000000 +0000
@@ -1495,8 +1495,8 @@
                if ((pdev->bus->number == 0) && (PCI_SLOT(pdev->devfn) == 4)) {
                        /* DDB5477 MAC address in first EEPROM locations. */
                        sa_offset = 0;
-		       /* Ensure our media table fixup get's applied */
-		       memcpy(ee_data + 16, ee_data, 8);
+                       /* No media table either */
+                       tp->flags &= ~HAS_MEDIA_TABLE;
                }
 #endif
 #ifdef CONFIG_MIPS_COBALT

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: tulip

[Ralf Baechle]

On Fri, Feb 24, 2006 at 01:49:57AM +0000, Martin Michlmayr wrote:

> OK, I managed to track down when this change was introduced, namely in
> the merge with Linux 2.6.13-rc1.  See
> http://www.linux-mips.org/git?p=linux.git;a=blobdiff;h=e6781ea5ba055ec445f35c734a59db24e748be3a;hp=cfc346e72d6234ae37ee11b794791ee99fcec24e;hb=aa5fcc48f9ae2887b6c570411e73ef965f72a746;f=drivers/net/tulip/tulip_core.c
> 
> Ralf, please apply this to the mips-tree only (not for-linus).

Applied,

  Ralf

Re: Diff between Linus' and linux-mips git: small changes

[Martin Michlmayr]

* Martin Michlmayr <tbm@cyrius.com> [2006-02-20 00:01]:
> I noticed the following difference between the Linus and the
> linux-mips tree.  Who is correct and can the other one be changed
> please?

ping.


> --- linux-2.6.16-rc4/drivers/char/qtronix.c	2006-02-19 20:08:44.000000000 +0000
> +++ mips-2.6.16-rc4/drivers/char/qtronix.c	2006-02-19 20:15:07.000000000 +0000
> @@ -535,8 +535,7 @@
>  		i--;
>  	}
>  	if (count-i) {
> -		struct inode *inode = file->f_dentry->d_inode;
> -		inode->i_atime = current_fs_time(inode->i_sb);
> +		file->f_dentry->d_inode->i_atime = get_seconds();
>  		return count-i;
>  	}
>  	if (signal_pending(current))
> 
> -- 
> Martin Michlmayr
> http://www.cyrius.com/

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: drivers!

[Martin Michlmayr]

* Martin Michlmayr <tbm@cyrius.com> [2006-02-20 00:34]:
> >  drivers/char/ibm_workpad_keymap.map        |  343 ++++
> > Michael Klar <wyldfier@iname.com>

Yoichi, as the maintainre of the IBM z50 support, can you comment?

> >  drivers/video/smivgxfb.c                   |  387 +++++
> > johuang@siliconmotion.com

Dan, are you willing to take responsibility for this driver (and
forward it upstream)?
-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: trivial changes

[Martin Michlmayr]

[IDE] au1xxx_ide.h: Remove redefinition of drive_list_entry

The mips tree (but not mainline) contains a definition of
drive_list_entry in include/asm-mips/mach-au1x00/au1xxx_ide.h which
leads to a compilation failure if CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
is set.  Remove this bogus redefinition, thereby bringing the driver
in sync with mainline and into a compilable form.

  CC      drivers/ide/mips/au1xxx-ide.o
In file included from drivers/ide/mips/au1xxx-ide.c:53:
include/asm/mach-au1x00/au1xxx_ide.h:87: error: redefinition of ‘struct drive_list_entry’

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>


--- mips.git/include/asm-mips/mach-au1x00/au1xxx_ide.h	2006-02-23 22:06:13.000000000 +0000
+++ linux-2.6.git/include/asm-mips/mach-au1x00/au1xxx_ide.h	2006-02-03 03:07:30.000000000 +0000
@@ -84,11 +84,6 @@
 } _auide_hwif;
 
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
-struct drive_list_entry {
-	const char *id_model;
-	const char *id_firmware;
-};
-
 /* HD white list */
 static const struct drive_list_entry dma_white_list [] = {
 /*

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: drivers!

[Yoichi Yuasa]

On Mon, 27 Feb 2006 19:10:33 +0000
Martin Michlmayr <tbm@cyrius.com> wrote:

> * Martin Michlmayr <tbm@cyrius.com> [2006-02-20 00:34]:
> > >  drivers/char/ibm_workpad_keymap.map        |  343 ++++
> > > Michael Klar <wyldfier@iname.com>
> 
> Yoichi, as the maintainre of the IBM z50 support, can you comment?

v2.6 don't include IBM z50(vr41xx) keyboard driver.
I think it can be removed.

Yoichi

Re: Diff between Linus' and linux-mips git: drivers!

[Martin Michlmayr]

* Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> [2006-02-28 13:47]:
> > Yoichi, as the maintainre of the IBM z50 support, can you comment?
> v2.6 don't include IBM z50(vr41xx) keyboard driver.
> I think it can be removed.

Ralf, please apply.


[CHAR] Remove obsolete IBM z50(vr41xx) keyboard map

Remove the keymap for the IBM z50 workpad since 2.6 doesn't include a
keyboard driver for this platform.  This also brings the linux-mips
tree in sync with mainline.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Acked-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>


--- mips.git/drivers/char/Makefile	2006-02-28 00:13:54.000000000 +0000
+++ linux-2.6.git/drivers/char/Makefile	2006-02-03 03:06:52.000000000 +0000
@@ -121,8 +115,7 @@
 
 ifdef GENERATE_KEYMAP
 
-$(obj)/defkeymap.c $(obj)/qtronixmap.c $(obj)/ibm_workpad_keymap.c: \
-		$(obj)/%.c: $(src)/%.map
+$(obj)/defkeymap.c $(obj)/qtronixmap.c: $(obj)/%.c: $(src)/%.map
 	loadkeys --mktable $< > $@.tmp
 	sed -e 's/^static *//' $@.tmp > $@
 	rm $@.tmp
--- mips.git/drivers/char/ibm_workpad_keymap.map	2006-01-19 22:18:20.000000000 +0000
+++ b/drivers/char/ibm_workpad_keymap.map	2006-02-27 00:45:54.766344104 +0000
@@ -1,343 +0,0 @@
-# Keymap for IBM Workpad z50
-# US Mapping
-#
-# by Michael Klar <wyldfier@iname.com>
-#
-# This is a great big mess on account of how the Caps Lock key is handled as
-# LeftShift-RightShift.  Right shift key had to be broken out, so don't use
-# use this map file as a basis for other keyboards that don't do the same
-# thing with Caps Lock.
-#
-# 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.
-
-keymaps 0-2,4-5,8,12,32-33,36-37
-strings as usual
-
-keycode 0 = F1 F11 Console_13
-	shiftr keycode 0 = F11
-	shift shiftr keycode 0 = F11
-	control keycode 0 = F1
-	alt keycode 0 = Console_1
-	control alt keycode 0 = Console_1
-keycode 1 = F3 F13 Console_15
-	shiftr keycode 1 = F13
-	shift shiftr keycode 1 = F13
-	control keycode 1 = F3
-	alt keycode 1 = Console_3
-	control alt keycode 1 = Console_3
-keycode 2 = F5 F15 Console_17
-	shiftr keycode 2 = F15
-	shift shiftr keycode 2 = F15
-	control keycode 2 = F5
-	alt keycode 2 = Console_5
-	control alt keycode 2 = Console_5
-keycode 3 = F7 F17 Console_19
-	shiftr keycode 3 = F17
-	shift shiftr keycode 3 = F17
-	control keycode 3 = F7
-	alt keycode 3 = Console_7
-	control alt keycode 3 = Console_7
-keycode 4 = F9 F19 Console_21
-	shiftr keycode 4 = F19
-	shift shiftr keycode 4 = F19
-	control keycode 4 = F9
-	alt keycode 4 = Console_9
-	control alt keycode 4 = Console_9
-#keycode 5 is contrast down
-#keycode 6 is contrast up
-keycode 7 = F11 F11 Console_23
-	shiftr keycode 7 = F11
-	shift shiftr keycode 7 = F11
-	control keycode 7 = F11
-	alt keycode 7 = Console_11
-	control alt keycode 7 = Console_11
-keycode 8 = F2 F12 Console_14
-	shiftr keycode 8 = F12
-	shift shiftr keycode 8 = F12
-	control keycode 8 = F2
-	alt keycode 8 = Console_2
-	control alt keycode 8 = Console_2
-keycode 9 = F4 F14 Console_16
-	shiftr keycode 9 = F14
-	shift shiftr keycode 9 = F14
-	control keycode 9 = F4
-	alt keycode 9 = Console_4
-	control alt keycode 9 = Console_4
-keycode 10 = F6 F16 Console_18
-	shiftr keycode 10 = F16
-	shift shiftr keycode 10 = F16
-	control keycode 10 = F6
-	alt keycode 10 = Console_6
-	control alt keycode 10 = Console_6
-keycode 11 = F8 F18 Console_20
-	shiftr keycode 11 = F18
-	shift shiftr keycode 11 = F18
-	control keycode 11 = F8
-	alt keycode 11 = Console_8
-	control alt keycode 11 = Console_8
-keycode 12 = F10 F20 Console_22
-	shiftr keycode 12 = F20
-	shift shiftr keycode 12 = F20
-	control keycode 12 = F10
-	alt keycode 12 = Console_10
-	control alt keycode 12 = Console_10
-#keycode 13 is brightness down
-#keycode 14 is brightness up
-keycode 15 = F12 F12 Console_24
-	shiftr keycode 15 = F12
-	shift shiftr keycode 15 = F12
-	control keycode 15 = F12
-	alt keycode 15 = Console_12
-	control alt keycode 15 = Console_12
-keycode 16 = apostrophe quotedbl
-	shiftr keycode 16 = quotedbl
-	shift shiftr keycode 16 = quotedbl
-	control keycode 16 = Control_g
-	alt keycode 16 = Meta_apostrophe
-keycode 17 = bracketleft braceleft
-	shiftr keycode 17 = braceleft
-	shift shiftr keycode 17 = braceleft
-	control keycode 17 = Escape
-	alt keycode 17 = Meta_bracketleft
-keycode 18 = minus underscore backslash       
-	shiftr keycode 18 = underscore
-	shift shiftr keycode 18 = underscore
-	control keycode 18 = Control_underscore
-	shift control keycode 18 = Control_underscore
-	shiftr control keycode 18 = Control_underscore
-	shift shiftr control keycode 18 = Control_underscore
-	alt keycode 18 = Meta_minus
-keycode 19 = zero parenright braceright
-	shiftr keycode 19 = parenright
-	shift shiftr keycode 19 = parenright
-	alt keycode 19 = Meta_zero
-keycode 20 = p
-	shiftr keycode 20 = +P
-	shift shiftr keycode 20 = +p
-keycode 21 = semicolon colon
-	shiftr keycode 21 = colon
-	shift shiftr keycode 21 = colon
-	alt keycode 21 = Meta_semicolon
-keycode 22 = Up Scroll_Backward
-	shiftr keycode 22 = Scroll_Backward
-	shift shiftr keycode 22 = Scroll_Backward
-	alt keycode 22 = Prior
-keycode 23 = slash question
-	shiftr keycode 23 = question
-	shift shiftr keycode 23 = question
-	control keycode 23 = Delete
-	alt keycode 23 = Meta_slash
-
-keycode 27 = nine parenleft bracketright
-	shiftr keycode 27 = parenleft
-	shift shiftr keycode 27 = parenleft
-	alt keycode 27 = Meta_nine
-keycode 28 = o
-	shiftr keycode 28 = +O
-	shift shiftr keycode 28 = +o
-keycode 29 = l
-	shiftr keycode 29 = +L
-	shift shiftr keycode 29 = +l
-keycode 30 = period greater
-	shiftr keycode 30 = greater
-	shift shiftr keycode 30 = greater
-	control keycode 30 = Compose
-	alt keycode 30 = Meta_period
-
-keycode 32 = Left Decr_Console
-	shiftr keycode 32 = Decr_Console
-	shift shiftr keycode 32 = Decr_Console
-	alt keycode 32 = Home
-keycode 33 = bracketright braceright asciitilde      
-	shiftr keycode 33 = braceright
-	shift shiftr keycode 33 = braceright
-	control keycode 33 = Control_bracketright
-	alt keycode 33 = Meta_bracketright
-keycode 34 = equal plus
-	shiftr keycode 34 = plus
-	shift shiftr keycode 34 = plus
-	alt keycode 34 = Meta_equal
-keycode 35 = eight asterisk bracketleft
-	shiftr keycode 35 = asterisk
-	shift shiftr keycode 35 = asterisk
-	control keycode 35 = Delete
-	alt keycode 35 = Meta_eight
-keycode 36 = i
-	shiftr keycode 36 = +I
-	shift shiftr keycode 36 = +i
-keycode 37 = k
-	shiftr keycode 37 = +K
-	shift shiftr keycode 37 = +k
-keycode 38 = comma less
-	shiftr keycode 38 = less
-	shift shiftr keycode 38 = less
-	alt keycode 38 = Meta_comma
-
-keycode 40 = h
-	shiftr keycode 40 = +H
-	shift shiftr keycode 40 = +h
-keycode 41 = y
-	shiftr keycode 41 = +Y
-	shift shiftr keycode 41 = +y
-keycode 42 = six asciicircum
-	shiftr keycode 42 = asciicircum
-	shift shiftr keycode 42 = asciicircum
-	control keycode 42 = Control_asciicircum
-	alt keycode 42 = Meta_six
-keycode 43 = seven ampersand braceleft
-	shiftr keycode 43 = ampersand
-	shift shiftr keycode 43 = ampersand
-	control keycode 43 = Control_underscore
-	alt keycode 43 = Meta_seven
-keycode 44 = u
-	shiftr keycode 44 = +U
-	shift shiftr keycode 44 = +u
-keycode 45 = j
-	shiftr keycode 45 = +J
-	shift shiftr keycode 45 = +j
-keycode 46 = m
-	shiftr keycode 46 = +M
-	shift shiftr keycode 46 = +m
-keycode 47 = n
-	shiftr keycode 47 = +N
-	shift shiftr keycode 47 = +n
-
-# This is the "Backspace" key:
-keycode 49 = Delete Delete
-	shiftr keycode 49 = Delete
-	shift shiftr keycode 49 = Delete
-	control keycode 49 = BackSpace
-	alt keycode 49 = Meta_Delete
-keycode 50 = Num_Lock
-	shift keycode 50 = Bare_Num_Lock
-	shiftr keycode 50 = Bare_Num_Lock
-	shift shiftr keycode 50 = Bare_Num_Lock
-# This is the "Delete" key:
-keycode 51 = Remove
-	control alt keycode 51 = Boot
-
-keycode 53 = backslash bar
-	shiftr keycode 53 = bar
-	shift shiftr keycode 53 = bar
-	control keycode 53 = Control_backslash
-	alt keycode 53 = Meta_backslash
-keycode 54 = Return
-	alt keycode 54 = Meta_Control_m
-keycode 55 = space space           
-	shiftr keycode 55 = space
-	shift shiftr keycode 55 = space
-	control keycode 55 = nul
-	alt keycode 55 = Meta_space
-keycode 56 = g
-	shiftr keycode 56 = +G
-	shift shiftr keycode 56 = +g
-keycode 57 = t
-	shiftr keycode 57 = +T
-	shift shiftr keycode 57 = +t
-keycode 58 = five percent
-	shiftr keycode 58 = percent
-	shift shiftr keycode 58 = percent
-	control keycode 58 = Control_bracketright
-	alt keycode 58 = Meta_five
-keycode 59 = four dollar dollar
-	shiftr keycode 59 = dollar
-	shift shiftr keycode 59 = dollar
-	control keycode 59 = Control_backslash
-	alt keycode 59 = Meta_four
-keycode 60 = r
-	shiftr keycode 60 = +R
-	shift shiftr keycode 60 = +r
-keycode 61 = f
-	shiftr keycode 61 = +F
-	shift shiftr keycode 61 = +f
-	altgr keycode 61 = Hex_F
-keycode 62 = v
-	shiftr keycode 62 = +V
-	shift shiftr keycode 62 = +v
-keycode 63 = b
-	shiftr keycode 63 = +B
-	shift shiftr keycode 63 = +b
-	altgr keycode 63 = Hex_B
-
-keycode 67 = three numbersign
-	shiftr keycode 67 = numbersign
-	shift shiftr keycode 67 = numbersign
-	control keycode 67 = Escape
-	alt keycode 67 = Meta_three
-keycode 68 = e
-	shiftr keycode 68 = +E
-	shift shiftr keycode 68 = +e
-	altgr keycode 68 = Hex_E
-keycode 69 = d
-	shiftr keycode 69 = +D
-	shift shiftr keycode 69 = +d
-	altgr keycode 69 = Hex_D
-keycode 70 = c
-	shiftr keycode 70 = +C
-	shift shiftr keycode 70 = +c
-	altgr keycode 70 = Hex_C
-keycode 71 = Right Incr_Console
-	shiftr keycode 71 = Incr_Console
-	shift shiftr keycode 71 = Incr_Console
-	alt keycode 71 = End
-
-keycode 75 = two at at
-	shiftr keycode 75 = at
-	shift shiftr keycode 75 = at
-	control keycode 75 = nul
-	shift control keycode 75 = nul
-	shiftr control keycode 75 = nul
-	shift shiftr control keycode 75 = nul
-	alt keycode 75 = Meta_two
-keycode 76 = w
-	shiftr keycode 76 = +W
-	shift shiftr keycode 76 = +w
-keycode 77 = s
-	shiftr keycode 77 = +S
-	shift shiftr keycode 77 = +s
-keycode 78 = x
-	shiftr keycode 78 = +X
-	shift shiftr keycode 78 = +x
-keycode 79 = Down Scroll_Forward
-	shiftr keycode 79 = Scroll_Forward
-	shift shiftr keycode 79 = Scroll_Forward
-	alt keycode 79 = Next
-keycode 80 = Escape Escape
-	shiftr keycode 80 = Escape
-	shift shiftr keycode 80 = Escape
-	alt keycode 80 = Meta_Escape
-keycode 81 = Tab Tab             
-	shiftr keycode 81 = Tab
-	shift shiftr keycode 81 = Tab
-	alt keycode 81 = Meta_Tab
-keycode 82 = grave asciitilde
-	shiftr keycode 82 = asciitilde
-	shift shiftr keycode 82 = asciitilde
-	control keycode 82 = nul
-	alt keycode 82 = Meta_grave
-keycode 83 = one exclam
-	shiftr keycode 83 = exclam
-	shift shiftr keycode 83 = exclam
-	alt keycode 83 = Meta_one
-keycode 84 = q
-	shiftr keycode 84 = +Q
-	shift shiftr keycode 84 = +q
-keycode 85 = a
-	shiftr keycode 85 = +A
-	shift shiftr keycode 85 = +a
-	altgr keycode 85 = Hex_A
-keycode 86 = z
-	shiftr keycode 86 = +Z
-	shift shiftr keycode 86 = +z
-
-# This is the windows key:
-keycode 88 = Decr_Console
-keycode 89 = Shift
-keycode 90 = Control
-keycode 91 = Control
-keycode 92 = Alt
-keycode 93 = AltGr
-keycode 94 = ShiftR
-	shift keycode 94 = Caps_Lock

-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: small changes

[Dmitry Torokhov]

On 2/27/06, Martin Michlmayr <tbm@cyrius.com> wrote:
> * Martin Michlmayr <tbm@cyrius.com> [2006-02-20 00:01]:
> > I noticed the following difference between the Linus and the
> > linux-mips tree.  Who is correct and can the other one be changed
> > please?
>
> ping.
>
>
> > --- linux-2.6.16-rc4/drivers/char/qtronix.c   2006-02-19 20:08:44.000000000 +0000
> > +++ mips-2.6.16-rc4/drivers/char/qtronix.c    2006-02-19 20:15:07.000000000 +0000
> > @@ -535,8 +535,7 @@
> >               i--;
> >       }
> >       if (count-i) {
> > -             struct inode *inode = file->f_dentry->d_inode;
> > -             inode->i_atime = current_fs_time(inode->i_sb);
> > +             file->f_dentry->d_inode->i_atime = get_seconds();
> >               return count-i;
> >       }
> >       if (signal_pending(current))
> >

Oh, that's an input driver, that's why I am on CC list ;) How about
registering it with the input system and ripping this psaux code off
competely?

--
Dmitry

Re: Diff between Linus' and linux-mips git: trivial changes

[Jordan Crouse]

> [IDE] au1xxx_ide.h: Remove redefinition of drive_list_entry
 
> The mips tree (but not mainline) contains a definition of
> drive_list_entry in include/asm-mips/mach-au1x00/au1xxx_ide.h 

Right - Bart took this a while back - not sure how it hasn't made it down
from Ralfs periodic pulls from Linus.

Jordan

--
Jordan Crouse
Senior Linux Engineer
AMD - Personal Connectivity Solutions Group
<www.amd.com/embeddedprocessors>

Re: Diff between Linus' and linux-mips git: tulip

[Peter Horton]

On Fri, Feb 24, 2006 at 01:13:27AM +0000, Martin Michlmayr wrote:
> * Peter Horton <pdh@colonel-panic.org> [2006-02-20 23:03]:
> > > -                       /* No media table either */
> > > -                       tp->flags &= ~HAS_MEDIA_TABLE;
> > > +		       /* Ensure our media table fixup get's applied */
> > > +		       memcpy(ee_data + 16, ee_data, 8);
> > >  #endif
> > >  #ifdef CONFIG_MIPS_COBALT
> > Didn't the memcpy() used to be inside the CONFIG_MIPS_COBALT section ?
> > Looking at tulip/eeprom.c I can't work out why it was ever there though
> 
> Yeah, and it's still there in the Cobalt section.  But now (in the
> mips tree) it's _also_ there for CONFIG_DDB5477.  So I have several
> questions:
>  - can we just get rid of the code between CONFIG_MIPS_COBALT?
>  - should the CONFIG_DDB5477 change be reverted (probably), and do we
>    need these special cases for CONFIG_DDB* anyway or can they be
>    solved in a better way (e.g. by putting something in eeprom.c).
> 
> It seems mips is the only arch that mucks around with "#ifdef CONFIG_"
> in this file...

Looks like both the "sa_offset = 0" and "memcpy(...)" are required to
ensure our fixup from tulip/eeprom.c gets applied. I don't know why it
only seems to be us that needs it :-(

P.

Re: Diff between Linus' and linux-mips git: elf.h

[Martin Michlmayr]

* Ralf Baechle <ralf@linux-mips.org> [2006-02-20 11:34]:
> > Can we agree?
> > -#define EM_MIPS_RS4_BE 10	/* MIPS R4000 big-endian */
> > +#define EM_MIPS_RS3_LE 10	/* MIPS R3000 little-endian */
> Not really :-)
> 
> I've dug deep into history - but it seems nobody remembers the reason for
> this change anymore.  I suspect actually both constant names might
> historically have been in use.  For the purposes of Linux it's probably
> best to dump the whole number - it never had any relevance.

Maybe you can remove it, or at least bring it in sync.
-- 
Martin Michlmayr
http://www.cyrius.com/

Re: Diff between Linus' and linux-mips git: elf.h

[Kevin D. Kissell]

Arguably, whatever's used by binutils should be the tie-breaker.
Googling around, I see that the EM_MIPS_RS3_LE value was
added in the October 4, 1999 draft of the ELF spec, but inexplicably
the alias with EM_MIPS_RS4_BE was left in place - perhaps they
were supposed to be disambiguated by some 32-vs-64-bit flag
somewhere.  A random sampling of ELF documents on the web
shows the vast majority calling out RS3_LE and not RS4_BE.

            Regards,

            Kevin K.

----- Original Message ----- 
From: "Martin Michlmayr" <tbm@cyrius.com>
To: "Ralf Baechle" <ralf@linux-mips.org>
Cc: <linux-mips@linux-mips.org>
Sent: Friday, April 07, 2006 7:19 PM
Subject: Re: Diff between Linus' and linux-mips git: elf.h


> * Ralf Baechle <ralf@linux-mips.org> [2006-02-20 11:34]:
> > > Can we agree?
> > > -#define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */
> > > +#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */
> > Not really :-)
> > 
> > I've dug deep into history - but it seems nobody remembers the reason for
> > this change anymore.  I suspect actually both constant names might
> > historically have been in use.  For the purposes of Linux it's probably
> > best to dump the whole number - it never had any relevance.
> 
> Maybe you can remove it, or at least bring it in sync.
> -- 
> Martin Michlmayr
> http://www.cyrius.com/
> 
> 

Re: Diff between Linus' and linux-mips git: elf.h

[Kevin D. Kissell]

Arguably, whatever's used by binutils should be the tie-breaker.
Googling around, I see that the EM_MIPS_RS3_LE value was
added in the October 4, 1999 draft of the ELF spec, but inexplicably
the alias with EM_MIPS_RS4_BE was left in place - perhaps they
were supposed to be disambiguated by some 32-vs-64-bit flag
somewhere.  A random sampling of ELF documents on the web
shows the vast majority calling out RS3_LE and not RS4_BE.

            Regards,

            Kevin K.

----- Original Message ----- 
From: "Martin Michlmayr" <tbm@cyrius.com>
To: "Ralf Baechle" <ralf@linux-mips.org>
Cc: <linux-mips@linux-mips.org>
Sent: Friday, April 07, 2006 7:19 PM
Subject: Re: Diff between Linus' and linux-mips git: elf.h


> * Ralf Baechle <ralf@linux-mips.org> [2006-02-20 11:34]:
> > > Can we agree?
> > > -#define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */
> > > +#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */
> > Not really :-)
> > 
> > I've dug deep into history - but it seems nobody remembers the reason for
> > this change anymore.  I suspect actually both constant names might
> > historically have been in use.  For the purposes of Linux it's probably
> > best to dump the whole number - it never had any relevance.
> 
> Maybe you can remove it, or at least bring it in sync.
> -- 
> Martin Michlmayr
> http://www.cyrius.com/
> 
> 

Re: Diff between Linus' and linux-mips git: elf.h

[Ralf Baechle]

On Fri, Apr 07, 2006 at 07:47:40PM +0200, Kevin D. Kissell wrote:

> Arguably, whatever's used by binutils should be the tie-breaker.
> Googling around, I see that the EM_MIPS_RS3_LE value was
> added in the October 4, 1999 draft of the ELF spec, but inexplicably
> the alias with EM_MIPS_RS4_BE was left in place - perhaps they
> were supposed to be disambiguated by some 32-vs-64-bit flag
> somewhere.  A random sampling of ELF documents on the web
> shows the vast majority calling out RS3_LE and not RS4_BE.

No way to actually resolve this one; not even binutils oldtimer
Ian Lance Taylor can remember the reasons for the change anymore.

  Ralf

Re: Diff between Linus' and linux-mips git: elf.h

[Thiemo Seufer]

Ralf Baechle wrote:
> On Fri, Apr 07, 2006 at 07:47:40PM +0200, Kevin D. Kissell wrote:
> 
> > Arguably, whatever's used by binutils should be the tie-breaker.
> > Googling around, I see that the EM_MIPS_RS3_LE value was
> > added in the October 4, 1999 draft of the ELF spec, but inexplicably
> > the alias with EM_MIPS_RS4_BE was left in place - perhaps they
> > were supposed to be disambiguated by some 32-vs-64-bit flag
> > somewhere.  A random sampling of ELF documents on the web
> > shows the vast majority calling out RS3_LE and not RS4_BE.
> 
> No way to actually resolve this one; not even binutils oldtimer
> Ian Lance Taylor can remember the reasons for the change anymore.

FWIW, the general rule is to use EM_MIPS == 8 for MIPS with both
endiannesses and ignore EM_MIPS_*. So removing the other defines
from the linux include file seems to be the sensible thing to do.
(Binutils can't do the same due to backward compatibility concerns.)


Thiemo

Re: Diff between Linus' and linux-mips git: elf.h

[Ralf Baechle]

On Mon, Apr 10, 2006 at 01:27:15PM +0100, Thiemo Seufer wrote:

> > No way to actually resolve this one; not even binutils oldtimer
> > Ian Lance Taylor can remember the reasons for the change anymore.
> 
> FWIW, the general rule is to use EM_MIPS == 8 for MIPS with both
> endiannesses and ignore EM_MIPS_*. So removing the other defines
> from the linux include file seems to be the sensible thing to do.
> (Binutils can't do the same due to backward compatibility concerns.)

Or rather convert it into a comment so this is the last time these
constants have been discussed ...

  Ralf