From: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
To: Santosh Shilimkar <santosh.shilimkar@ti.com>,
Rob Landley <rob@landley.net>,
Russell King <linux@arm.linux.org.uk>
Cc: Mark Rutland <mark.rutland@arm.com>,
devicetree@vger.kernel.org, grygorii.strashko@ti.com,
Pawel Moll <pawel.moll@arm.com>,
Stephen Warren <swarren@wwwdotorg.org>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@kernel.crashing.org>,
Rob Herring <rob.herring@calxeda.com>,
linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org,
Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] mtd: nand: davinci: don't request AEMIF address range
Date: Wed, 20 Nov 2013 18:24:59 +0200 [thread overview]
Message-ID: <1384964699-15134-4-git-send-email-ivan.khoronzhuk@ti.com> (raw)
In-Reply-To: <1384964699-15134-1-git-send-email-ivan.khoronzhuk@ti.com>
The TI AEMIF driver registers are used to setup timings for each chip
select. The same registers range is used to setup NAND settings.
The AEMIF and NAND drivers not use the same registers in this range.
In case with TI AEMIF driver, the memory address range is requested
already by AEMIF, so we cannot request it twice, just ioremap.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
drivers/mtd/nand/davinci_nand.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index e904364..aa30708 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -638,9 +638,11 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
if (IS_ERR(vaddr))
return PTR_ERR(vaddr);
- base = devm_ioremap_resource(&pdev->dev, res2);
- if (IS_ERR(base))
- return PTR_ERR(base);
+ base = devm_ioremap(&pdev->dev, res2->start, resource_size(res2));
+ if (!base) {
+ dev_err(&pdev->dev, "ioremap failed for resource %pR\n", res2);
+ return -EADDRNOTAVAIL;
+ }
info->dev = &pdev->dev;
info->base = base;
--
1.7.9.5
next prev parent reply other threads:[~2013-11-20 16:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-20 16:24 [PATCH 0/3] Reuse davinci-nand driver for Keystone arch Ivan Khoronzhuk
2013-11-20 16:24 ` [PATCH 1/3] mtd: nand: davinci: reuse " Ivan Khoronzhuk
2013-11-23 18:15 ` Arnd Bergmann
2013-11-25 15:57 ` ivan.khoronzhuk
2013-11-20 16:24 ` [PATCH 2/3] mtd: nand: davinci: don't set timings if AEMIF is used Ivan Khoronzhuk
2013-11-20 16:24 ` Ivan Khoronzhuk [this message]
2013-11-20 20:17 ` [PATCH 0/3] Reuse davinci-nand driver for Keystone arch Grygorii Strashko
2013-11-20 20:33 ` Santosh Shilimkar
2013-11-20 20:38 ` ivan.khoronzhuk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1384964699-15134-4-git-send-email-ivan.khoronzhuk@ti.com \
--to=ivan.khoronzhuk@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@kernel.crashing.org \
--cc=grygorii.strashko@ti.com \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=rob.herring@calxeda.com \
--cc=rob@landley.net \
--cc=santosh.shilimkar@ti.com \
--cc=swarren@wwwdotorg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox