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

[Martin Michlmayr]

Author: tbm
Date: Thu Dec 14 19:03:43 2006
New Revision: 8004

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/nas100d-artop-temp-fix.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Log:
Add temporary hack to get Artop PATA support going on the nas100d.


Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Dec 14 19:03:43 2006
@@ -19,6 +19,7 @@
   * arm/ixp4xx: Enable PATA_ARTOP for the nas100d and dsmg600.
   * arm/ixp4xx: Enable RTC for the nas100d
   * Add nas100d Ethernet MAC setup support.
+  * Add temporary hack to get Artop PATA support going on the nas100d.
 
  -- Bastian Blank <waldi at debian.org>  Mon,  4 Dec 2006 07:16:41 +0100
 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/nas100d-artop-temp-fix.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/nas100d-artop-temp-fix.patch	Thu Dec 14 19:03:43 2006
@@ -0,0 +1,49 @@
+From: Alan Cox <alan at redhat.com>
+To: Alessandro Zummo <alessandro.zummo at towertech.it>
+Cc: Jeff Garzik <jgarzik at redhat.com>, Alan Cox <alan at redhat.com>
+Subject: Re: drivers/ata/pata_artop.c
+Date: Sun, 15 Oct 2006 14:25:16 -0400
+User-Agent: Mutt/1.4.1i
+
+On Sun, Oct 15, 2006 at 07:18:31PM +0200, Alessandro Zummo wrote:
+>  In the discovery phase there's a lot of time spent in the detection
+>  of the second port.  
+
+The error recovery is a bit determined right now - Tejun's been doing some
+work on SRST behaviour and also for the worst cases polled detect so it
+should come out ok
+
+>  What's the correct way to inform the driver
+>  to avoid checking the second port?  
+
+Set the number of ports to 1 in your own tree for now. The real fix is
+not to go poking at pata ports if the ret is 0xFF
+
+---
+ drivers/ata/pata_artop.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: linux-2.6.19/drivers/ata/pata_artop.c
+===================================================================
+--- linux-2.6.19.orig/drivers/ata/pata_artop.c
++++ linux-2.6.19/drivers/ata/pata_artop.c
+@@ -26,6 +26,7 @@
+ #include <scsi/scsi_host.h>
+ #include <linux/libata.h>
+ #include <linux/ata.h>
++#include <asm/mach-types.h>
+ 
+ #define DRV_NAME	"pata_artop"
+ #define DRV_VERSION	"0.4.2"
+@@ -469,6 +470,11 @@ static int artop_init_one (struct pci_de
+ 		pci_read_config_byte(pdev, 0x4a, &reg);
+ 		pci_write_config_byte(pdev, 0x4a, (reg & ~0x01) | 0x80);
+ 
++		/* NAS100D workaround */
++#ifdef CONFIG_MACH_NAS100D
++		if (machine_is_nas100d())
++			ports = 1;
++#endif
+ 	}
+ 
+ 	BUG_ON(info == NULL);

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	Thu Dec 14 19:03:43 2006
@@ -23,6 +23,7 @@
 + features/powerpc/efika/0012-Backport-of_platform.diff
 
 + bugfix/arm/nslu2-disk-leds.patch
++ bugfix/arm/nas100d-artop-temp-fix.patch
 + features/arm/nslu2-setup-mac.patch
 + features/arm/nslu2-eth-mac.patch
 + features/arm/nas100d-setup-mac.patch