Author: gordon-guest Date: Mon Jun 11 05:08:05 2007 New Revision: 8964 Log: Update Artop PATA patch for NAS 100d and set CONFIG_PATA_ARTOP for ixp4xx.
Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/nas100d-pata-artop-single-port.patch Removed: dists/trunk/linux-2.6/debian/patches/bugfix/arm/nas100d-artop-temp-fix.patch Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx dists/trunk/linux-2.6/debian/changelog dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx ============================================================================== --- dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx (original) +++ dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx Mon Jun 11 05:08:05 2007 @@ -671,6 +671,7 @@ # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set +CONFIG_PATA_ARTOP=m # # Serial ATA (prod) and Parallel ATA (experimental) drivers Modified: dists/trunk/linux-2.6/debian/changelog ============================================================================== --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Mon Jun 11 05:08:05 2007 @@ -45,8 +45,9 @@ DVB_B2C2_FLEXCOP, and DVB_BUDGET as broken on ARM. * arm/ixp4xx: Add support for the new generic I2C GPIO driver on the NSLU2 and the NAS100D. Thanks to Michael-Luke Jones and Rod Whitby. + * arm/ixp4xx: Update Artop PATA support patch for the NAS 100d. - -- Gordon Farquharson <[EMAIL PROTECTED]> Sat, 9 Jun 2007 19:33:59 -0600 + -- Gordon Farquharson <[EMAIL PROTECTED]> Sun, 10 Jun 2007 22:52:02 -0600 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/nas100d-pata-artop-single-port.patch ============================================================================== --- (empty file) +++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/nas100d-pata-artop-single-port.patch Mon Jun 11 05:08:05 2007 @@ -0,0 +1,24 @@ +Index: linux-2.6.22-rc4-armeb/drivers/ata/pata_artop.c +=================================================================== +--- linux-2.6.22-rc4-armeb.orig/drivers/ata/pata_artop.c ++++ linux-2.6.22-rc4-armeb/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.3" +@@ -480,6 +481,11 @@ static int artop_init_one (struct pci_de + pci_read_config_byte(pdev, 0x4a, ®); + pci_write_config_byte(pdev, 0x4a, (reg & ~0x01) | 0x80); + ++ /* NAS100D workaround - probing second port kills uhci_hcd */ ++#ifdef CONFIG_MACH_NAS100D ++ if (machine_is_nas100d()) ++ ppi[1] = &ata_dummy_port_info; ++#endif + } + + BUG_ON(ppi[0] == NULL); Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra ============================================================================== --- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra (original) +++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra Mon Jun 11 05:08:05 2007 @@ -4,7 +4,7 @@ + features/all/xen/fedora-2.6.20-48670.patch *_xen *_xen-vserver + features/all/xen/update.patch *_xen *_xen-vserver + features/all/xen/vserver-update.patch *_xen-vserver -+ bugfix/arm/nas100d-artop-temp-fix.patch arm ++ bugfix/arm/nas100d-pata-artop-single-port.patch arm # Submitted + bugfix/m68k/falconide_intr_lock-reentrant.diff m68k _______________________________________________ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes