# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/02/05 22:51:28-05:00 jgarzik@pobox.com 
#   [libata sata_promise] merge Tobias Lorenz' pdc20619 patch, part 2
#   
#   Apply the second part of Tobias Lorenz's patch, the portion that
#   depended on functionality not in the base libata, but in libata-dev.
#   
#   Also, trim trailing whitespace, and remove setting of .scr_addr
#   for PDC20619, since that is senseless.
# 
# drivers/scsi/sata_promise.c
#   2005/02/05 22:51:21-05:00 jgarzik@pobox.com +14 -12
#   [libata sata_promise] merge Tobias Lorenz' pdc20619 patch, part 2
#   
#   Apply the second part of Tobias Lorenz's patch, the portion that
#   depended on functionality not in the base libata, but in libata-dev.
#   
#   Also, trim trailing whitespace, and remove setting of .scr_addr
#   for PDC20619, since that is senseless.
# 
diff -Nru a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
--- a/drivers/scsi/sata_promise.c	2005-02-05 22:51:53 -05:00
+++ b/drivers/scsi/sata_promise.c	2005-02-05 22:51:53 -05:00
@@ -281,7 +281,7 @@
 	void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03;
 
 	tmp = readb(mmio);
-	
+
 	if (tmp & 0x01)
 	{
 		ap->cbl = ATA_CBL_PATA40;
@@ -290,13 +290,13 @@
 	else
 		ap->cbl = ATA_CBL_PATA80;
 }
-		
+
 static void pdc_pata_phy_reset(struct ata_port *ap)
 {
 	pdc_pata_cbl_detect(ap);
 
 	ata_port_probe(ap);
-	
+
 	ata_bus_reset(ap);
 }
 
@@ -661,9 +661,6 @@
 	probe_ent->port[0].scr_addr = base + 0x400;
 	probe_ent->port[1].scr_addr = base + 0x500;
 
-	probe_ent->port_flags[0] = ATA_FLAG_SATA;
-	probe_ent->port_flags[1] = ATA_FLAG_SATA;
-	
 	/* notice 4-port boards */
 	switch (board_idx) {
 	case board_20319:
@@ -674,35 +671,40 @@
 
 		probe_ent->port[2].scr_addr = base + 0x600;
 		probe_ent->port[3].scr_addr = base + 0x700;
-	
+
+		probe_ent->port_flags[0] = ATA_FLAG_SATA;
+		probe_ent->port_flags[1] = ATA_FLAG_SATA;
 		probe_ent->port_flags[2] = ATA_FLAG_SATA;
 		probe_ent->port_flags[3] = ATA_FLAG_SATA;
 		break;
+
 	case board_2037x:
+		probe_ent->port_flags[0] = ATA_FLAG_SATA;
+		probe_ent->port_flags[1] = ATA_FLAG_SATA;
+
 		/* Some boards have also PATA port */
 		tmp = readb(mmio_base + PDC_FLASH_CTL+1);
 		if (!(tmp & 0x80))
 		{
 			probe_ent->n_ports = 3;
-			
+
 			pdc_ata_setup_port(&probe_ent->port[2], base + 0x300);
 
 			probe_ent->port_flags[2] = ATA_FLAG_SLAVE_POSS;
-			
+
 			printk(KERN_INFO DRV_NAME " PATA port found\n");
 		}
 		else
        			probe_ent->n_ports = 2;
 		break;
+
 	case board_20619:
 		probe_ent->n_ports = 4;
 
 		pdc_ata_setup_port(&probe_ent->port[2], base + 0x300);
 		pdc_ata_setup_port(&probe_ent->port[3], base + 0x380);
+		break;
 
-		probe_ent->port[2].scr_addr = base + 0x600;
-		probe_ent->port[3].scr_addr = base + 0x700;
-                break;
 	default:
 		BUG();
 		break;