diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 03:13:36 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 03:13:36 +0400 |
commit | 50528fabeb25f9883e2845f5147f5e00a1c57cf7 (patch) | |
tree | e64da7ca92df33ec2b3f8d0aab1f7e4c38d8626c /drivers/ata/pata_imx.c | |
parent | 3ed1c478eff8db80e234d5446cb378b503135888 (diff) | |
parent | 2cc1144a31f76d4a9fb48bec5d6ba1359f980813 (diff) | |
download | linux-50528fabeb25f9883e2845f5147f5e00a1c57cf7.tar.xz |
Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
Pull libata update from Jeff Garzik:
- More ACPI fixes, cleanups
- Minor cleanups for sata_highbank, pata_at32, pata_octeon_cf,
sata_rcar
- pata_legacy: small bug found in opti chipset code (untested fix, due
to ancient h/w)
- sata_fsl: RX water mark config knob, some h/w needs it
- pata_imx: cleanups, DeviceTree support
- SCSI<->ATA translator: properly export translator version, not device
firmware version
* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
sata_highbank: Rename proc_name to the module name
ACPI/libata: Restore libata.noacpi support
[libata] acpi: make ata_ap_acpi_handle not block
[libata] SCSI: really use SATL version in VPD
pata_imx: add devicetree support
pata_imx: use void __iomem * for regs
pata_imx: cleanup error path
pata_imx: Use devm_clk_get
sata_rcar: Convert to devm_ioremap_resource()
fsl/sata: create a sysfs entry for rx water mark
libata-acpi: remove redundent code for power resource handling
sata_highbank: make ahci_highbank_pm_ops static
pata_octeon_cf: Use resource_size function
pata_legacy: bogus clock in opti82c46x_set_piomode()
pata_at32: use module_platform_driver_probe()
Diffstat (limited to 'drivers/ata/pata_imx.c')
-rw-r--r-- | drivers/ata/pata_imx.c | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c index 40849445a9dc..aa3d166e02eb 100644 --- a/drivers/ata/pata_imx.c +++ b/drivers/ata/pata_imx.c @@ -37,7 +37,7 @@ struct pata_imx_priv { struct clk *clk; /* timings/interrupt/control regs */ - u8 *host_regs; + void __iomem *host_regs; u32 ata_ctl; }; @@ -98,6 +98,7 @@ static int pata_imx_probe(struct platform_device *pdev) struct pata_imx_priv *priv; int irq = 0; struct resource *io_res; + int ret; io_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (io_res == NULL) @@ -112,7 +113,7 @@ static int pata_imx_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; - priv->clk = clk_get(&pdev->dev, NULL); + priv->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(priv->clk)) { dev_err(&pdev->dev, "Failed to get clock\n"); return PTR_ERR(priv->clk); @@ -121,8 +122,10 @@ static int pata_imx_probe(struct platform_device *pdev) clk_prepare_enable(priv->clk); host = ata_host_alloc(&pdev->dev, 1); - if (!host) - goto free_priv; + if (!host) { + ret = -ENOMEM; + goto err; + } host->private_data = priv; ap = host->ports[0]; @@ -135,7 +138,8 @@ static int pata_imx_probe(struct platform_device *pdev) resource_size(io_res)); if (!priv->host_regs) { dev_err(&pdev->dev, "failed to map IO/CTL base\n"); - goto free_priv; + ret = -EBUSY; + goto err; } ap->ioaddr.cmd_addr = priv->host_regs + PATA_IMX_DRIVE_DATA; @@ -158,13 +162,17 @@ static int pata_imx_probe(struct platform_device *pdev) priv->host_regs + PATA_IMX_ATA_INT_EN); /* activate */ - return ata_host_activate(host, irq, ata_sff_interrupt, 0, + ret = ata_host_activate(host, irq, ata_sff_interrupt, 0, &pata_imx_sht); -free_priv: + if (ret) + goto err; + + return 0; +err: clk_disable_unprepare(priv->clk); - clk_put(priv->clk); - return -ENOMEM; + + return ret; } static int pata_imx_remove(struct platform_device *pdev) @@ -177,7 +185,6 @@ static int pata_imx_remove(struct platform_device *pdev) __raw_writel(0, priv->host_regs + PATA_IMX_ATA_INT_EN); clk_disable_unprepare(priv->clk); - clk_put(priv->clk); return 0; } @@ -223,11 +230,20 @@ static const struct dev_pm_ops pata_imx_pm_ops = { }; #endif +static const struct of_device_id imx_pata_dt_ids[] = { + { + .compatible = "fsl,imx27-pata", + }, { + /* sentinel */ + } +}; + static struct platform_driver pata_imx_driver = { .probe = pata_imx_probe, .remove = pata_imx_remove, .driver = { .name = DRV_NAME, + .of_match_table = imx_pata_dt_ids, .owner = THIS_MODULE, #ifdef CONFIG_PM .pm = &pata_imx_pm_ops, |