[kernel] r8265 - in dists/trunk/linux-2.6/debian/patches: bugfix/arm series

[Martin Michlmayr]

Author: tbm
Date: Mon Feb  5 14:53:24 2007
New Revision: 8265

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/cyber2010_burst.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/rtc-rs5c372-n2100.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Log:
add some ARM patches from 2.6.18 that are still needed


Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/cyber2010_burst.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/cyber2010_burst.patch	Mon Feb  5 14:53:24 2007
@@ -0,0 +1,30 @@
+The Netwinder machines with Cyber2010 crash badly when starting Xserver.
+The workaround is to disable pci burst option for this revision of video chip.
+
+Signed-off-by: Woody Suwalski <woodys at xandros.com>
+
+---
+
+--- a/drivers/video/cyber2000fb.c	2006-04-21 12:11:45.000000000 -0400
++++ b/drivers/video/cyber2000fb.c	2006-04-26 16:29:44.000000000 -0400
+@@ -1541,6 +1541,12 @@ static int cyberpro_pci_enable_mmio(stru
+ 	/*
+ 	 * Allow the CyberPro to accept PCI burst accesses
+ 	 */
++	if (cfb->id == ID_CYBERPRO_2010)
++	{
++		printk(KERN_INFO "%s: NOT enabling PCI bursts\n", cfb->fb.fix.id);
++	}
++	else
++	{
+ 	val = cyber2000_grphr(EXT_BUS_CTL, cfb);
+ 	if (!(val & EXT_BUS_CTL_PCIBURST_WRITE)) {
+ 		printk(KERN_INFO "%s: enabling PCI bursts\n", cfb->fb.fix.id);
+@@ -1552,6 +1558,7 @@ static int cyberpro_pci_enable_mmio(stru
+ 
+ 		cyber2000_grphw(EXT_BUS_CTL, val, cfb);
+ 	}
++	}
+ 
+ 	return 0;
+ }

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/rtc-rs5c372-n2100.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/rtc-rs5c372-n2100.patch	Mon Feb  5 14:53:24 2007
@@ -0,0 +1,13 @@
+Autodetect the RTC chip.
+
+--- a/drivers/rtc/rtc-rs5c372.c
++++ b/drivers/rtc/rtc-rs5c372.c
+@@ -16,7 +16,7 @@ #include <linux/bcd.h>
+ #define DRV_VERSION "0.3"
+ 
+ /* Addresses to scan */
+-static unsigned short normal_i2c[] = { /* 0x32,*/ I2C_CLIENT_END };
++static unsigned short normal_i2c[] = { 0x32, I2C_CLIENT_END };
+ 
+ /* Insmod parameters */
+ I2C_CLIENT_INSMOD;

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Mon Feb  5 14:53:24 2007
@@ -27,3 +27,5 @@
 + bugfix/Makefile-localversion-backup.patch
 + bugfix/drivers-bus_to_virt.patch
 + bugfix/arm/disable-broken-config-options.patch
++ bugfix/arm/cyber2010_burst.patch
++ bugfix/arm/rtc-rs5c372-n2100.patch