aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_mpc52xx.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/pata_mpc52xx.c')
-rw-r--r--drivers/ata/pata_mpc52xx.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 099f4cdc4cd9..412140f02853 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -283,7 +283,6 @@ static struct scsi_host_template mpc52xx_ata_sht = {
283}; 283};
284 284
285static struct ata_port_operations mpc52xx_ata_port_ops = { 285static struct ata_port_operations mpc52xx_ata_port_ops = {
286 .port_disable = ata_port_disable,
287 .set_piomode = mpc52xx_ata_set_piomode, 286 .set_piomode = mpc52xx_ata_set_piomode,
288 .dev_select = mpc52xx_ata_dev_select, 287 .dev_select = mpc52xx_ata_dev_select,
289 .tf_load = ata_tf_load, 288 .tf_load = ata_tf_load,
@@ -299,12 +298,12 @@ static struct ata_port_operations mpc52xx_ata_port_ops = {
299 .data_xfer = ata_data_xfer, 298 .data_xfer = ata_data_xfer,
300 .irq_clear = ata_bmdma_irq_clear, 299 .irq_clear = ata_bmdma_irq_clear,
301 .irq_on = ata_irq_on, 300 .irq_on = ata_irq_on,
302 .irq_ack = ata_irq_ack,
303 .port_start = ata_port_start, 301 .port_start = ata_port_start,
304}; 302};
305 303
306static int __devinit 304static int __devinit
307mpc52xx_ata_init_one(struct device *dev, struct mpc52xx_ata_priv *priv) 305mpc52xx_ata_init_one(struct device *dev, struct mpc52xx_ata_priv *priv,
306 unsigned long raw_ata_regs)
308{ 307{
309 struct ata_host *host; 308 struct ata_host *host;
310 struct ata_port *ap; 309 struct ata_port *ap;
@@ -338,6 +337,8 @@ mpc52xx_ata_init_one(struct device *dev, struct mpc52xx_ata_priv *priv)
338 aio->status_addr = &priv->ata_regs->tf_command; 337 aio->status_addr = &priv->ata_regs->tf_command;
339 aio->command_addr = &priv->ata_regs->tf_command; 338 aio->command_addr = &priv->ata_regs->tf_command;
340 339
340 ata_port_desc(ap, "ata_regs 0x%lx", raw_ata_regs);
341
341 /* activate host */ 342 /* activate host */
342 return ata_host_activate(host, priv->ata_irq, ata_interrupt, 0, 343 return ata_host_activate(host, priv->ata_irq, ata_interrupt, 0,
343 &mpc52xx_ata_sht); 344 &mpc52xx_ata_sht);
@@ -434,7 +435,7 @@ mpc52xx_ata_probe(struct of_device *op, const struct of_device_id *match)
434 } 435 }
435 436
436 /* Register ourselves to libata */ 437 /* Register ourselves to libata */
437 rv = mpc52xx_ata_init_one(&op->dev, priv); 438 rv = mpc52xx_ata_init_one(&op->dev, priv, res_mem.start);
438 if (rv) { 439 if (rv) {
439 printk(KERN_ERR DRV_NAME ": " 440 printk(KERN_ERR DRV_NAME ": "
440 "Error while registering to ATA layer\n"); 441 "Error while registering to ATA layer\n");