3af779eb17
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.11, and Linux v3.12. This work mainly covers: * Ground work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family,and the Armada family. * Further updates to the mvebu MBus. * Work and ground work for enabling MSI on the Armada family. * some phy / mdio bus initialization related work. * Device tree binding documentation update. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39565
82 lines
2.4 KiB
Diff
82 lines
2.4 KiB
Diff
From 5c461327aca8975276d2480ddf02b6c7f0a29548 Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Wed, 17 Apr 2013 13:38:10 -0300
|
|
Subject: [PATCH 102/203] mtd: nand: pxa3xx: Use devm_ioremap_resource
|
|
|
|
Using the new devm_ioremap_resource() we can greatly
|
|
simplify resource handling.
|
|
|
|
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
|
|
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
|
|
---
|
|
drivers/mtd/nand/pxa3xx_nand.c | 31 ++++---------------------------
|
|
1 file changed, 4 insertions(+), 27 deletions(-)
|
|
|
|
--- a/drivers/mtd/nand/pxa3xx_nand.c
|
|
+++ b/drivers/mtd/nand/pxa3xx_nand.c
|
|
@@ -1108,30 +1108,16 @@ static int alloc_nand_resource(struct pl
|
|
}
|
|
|
|
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
- if (r == NULL) {
|
|
- dev_err(&pdev->dev, "no IO memory resource defined\n");
|
|
- ret = -ENODEV;
|
|
+ info->mmio_base = devm_ioremap_resource(&pdev->dev, r);
|
|
+ if (IS_ERR(info->mmio_base)) {
|
|
+ ret = PTR_ERR(info->mmio_base);
|
|
goto fail_put_clk;
|
|
}
|
|
-
|
|
- r = request_mem_region(r->start, resource_size(r), pdev->name);
|
|
- if (r == NULL) {
|
|
- dev_err(&pdev->dev, "failed to request memory resource\n");
|
|
- ret = -EBUSY;
|
|
- goto fail_put_clk;
|
|
- }
|
|
-
|
|
- info->mmio_base = ioremap(r->start, resource_size(r));
|
|
- if (info->mmio_base == NULL) {
|
|
- dev_err(&pdev->dev, "ioremap() failed\n");
|
|
- ret = -ENODEV;
|
|
- goto fail_free_res;
|
|
- }
|
|
info->mmio_phys = r->start;
|
|
|
|
ret = pxa3xx_nand_init_buff(info);
|
|
if (ret)
|
|
- goto fail_free_io;
|
|
+ goto fail_put_clk;
|
|
|
|
/* initialize all interrupts to be disabled */
|
|
disable_int(info, NDSR_MASK);
|
|
@@ -1155,10 +1141,6 @@ fail_free_buf:
|
|
info->data_buff, info->data_buff_phys);
|
|
} else
|
|
kfree(info->data_buff);
|
|
-fail_free_io:
|
|
- iounmap(info->mmio_base);
|
|
-fail_free_res:
|
|
- release_mem_region(r->start, resource_size(r));
|
|
fail_put_clk:
|
|
clk_disable(info->clk);
|
|
clk_put(info->clk);
|
|
@@ -1169,7 +1151,6 @@ static int pxa3xx_nand_remove(struct pla
|
|
{
|
|
struct pxa3xx_nand_info *info = platform_get_drvdata(pdev);
|
|
struct pxa3xx_nand_platform_data *pdata;
|
|
- struct resource *r;
|
|
int irq, cs;
|
|
|
|
if (!info)
|
|
@@ -1188,10 +1169,6 @@ static int pxa3xx_nand_remove(struct pla
|
|
} else
|
|
kfree(info->data_buff);
|
|
|
|
- iounmap(info->mmio_base);
|
|
- r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
- release_mem_region(r->start, resource_size(r));
|
|
-
|
|
clk_disable(info->clk);
|
|
clk_put(info->clk);
|
|
|