X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/c55e60e2ba10550f5b25849aaf749628344d1044..2da5dcf199f77603afb654d9127910cda5e225ac:/target/linux/adm5120/files/drivers/ata/pata_rb153_cf.c?ds=sidebyside

diff --git a/target/linux/adm5120/files/drivers/ata/pata_rb153_cf.c b/target/linux/adm5120/files/drivers/ata/pata_rb153_cf.c
index a978e0678..fbbf313d9 100644
--- a/target/linux/adm5120/files/drivers/ata/pata_rb153_cf.c
+++ b/target/linux/adm5120/files/drivers/ata/pata_rb153_cf.c
@@ -32,7 +32,7 @@
 #include <asm/gpio.h>
 
 #define DRV_NAME	"pata-rb153-cf"
-#define DRV_VERSION	"0.2"
+#define DRV_VERSION	"0.2.2"
 #define DRV_DESC	"PATA driver for RouterBOARD 153 Compact Flash"
 
 #define RB153_CF_MAXPORTS	1
@@ -175,21 +175,20 @@ static void rb153_pata_setup_ports(struct ata_host *ah)
 {
 	struct rb153_cf_info *info = ah->private_data;
 	struct ata_port *ap;
-	struct ata_ioports *iop;
 
 	ap = ah->ports[0];
-	iop = &ap->ioaddr;
 
 	ap->ops		= &rb153_pata_port_ops;
 	ap->pio_mask	= 0x1f; /* PIO4 */
-	ap->flags	|= ATA_FLAG_MMIO | ATA_FLAG_NO_LEGACY;
+	ap->flags	= ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO;
 
-	iop->cmd_addr		= info->iobase + RB153_CF_REG_CMD;
-	iop->ctl_addr		= info->iobase + RB153_CF_REG_CTRL;
-	iop->altstatus_addr	= info->iobase + RB153_CF_REG_CTRL;
-	iop->data_addr		= info->iobase + RB153_CF_REG_DATA;
+	ap->ioaddr.cmd_addr	= info->iobase + RB153_CF_REG_CMD;
+	ap->ioaddr.ctl_addr	= info->iobase + RB153_CF_REG_CTRL;
+	ap->ioaddr.altstatus_addr = info->iobase + RB153_CF_REG_CTRL;
 
-	ata_std_ports(iop);
+	ata_std_ports(&ap->ioaddr);
+
+	ap->ioaddr.data_addr	= info->iobase + RB153_CF_REG_DATA;
 }
 
 static __devinit int rb153_pata_driver_probe(struct platform_device *pdev)
@@ -237,6 +236,7 @@ static __devinit int rb153_pata_driver_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	ah->private_data = info;
+	info->gpio_line = gpio;
 
 	info->iobase = devm_ioremap_nocache(&pdev->dev, res->start,
 				res->end - res->start + 1);
@@ -252,8 +252,8 @@ static __devinit int rb153_pata_driver_probe(struct platform_device *pdev)
 
 	rb153_pata_setup_ports(ah);
 
-	ret = ata_host_activate(ah, irq, ata_interrupt, IRQF_TRIGGER_HIGH,
-				&rb153_pata_sht);
+	ret = ata_host_activate(ah, irq, rb153_pata_irq_handler,
+				IRQF_TRIGGER_LOW, &rb153_pata_sht);
 	if (ret)
 		goto err_free_gpio;