From: Paul Walmsley <paul@pwsan.com>
To: linux-omap@vger.kernel.org
Cc: Paul Walmsley <paul@pwsan.com>
Subject: [PATCH v2 1/2] OMAP2xxx EAC: update per recent IO address changes
Date: Thu, 04 Sep 2008 23:51:15 -0600 [thread overview]
Message-ID: <20080905055048.5272.89989.stgit@localhost.localdomain> (raw)
In-Reply-To: <20080905054959.5272.63450.stgit@localhost.localdomain>
Commit f228a725b975832ac5771ab2fc86d06bd694cdb3 breaks the build for this
driver; fix by using ioremap().
Signed-off-by: Paul Walmsley <paul@pwsan.com>
---
arch/arm/mach-omap2/devices.c | 4 ++--
sound/arm/omap/eac.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index bd49a0f..c7de03e 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -270,12 +270,12 @@ static inline void omap_init_mcspi(void) {}
#ifdef CONFIG_SND_OMAP24XX_EAC
-#define OMAP2_EAC_BASE 0x48090000
+#define OMAP2_EAC_BASE (L4_24XX_BASE + 0x90000)
static struct resource omap2_eac_resources[] = {
{
.start = OMAP2_EAC_BASE,
- .end = OMAP2_EAC_BASE + 0x109,
+ .end = OMAP2_EAC_BASE + 0xfff,
.flags = IORESOURCE_MEM,
},
};
diff --git a/sound/arm/omap/eac.c b/sound/arm/omap/eac.c
index 9fe8d74..9752ece 100644
--- a/sound/arm/omap/eac.c
+++ b/sound/arm/omap/eac.c
@@ -707,7 +707,7 @@ static int __devinit eac_probe(struct platform_device *pdev)
err = -ENODEV;
goto err1;
}
- eac->base = (void __iomem *)io_p2v(res->start);
+ eac->base = ioremap(res->start, (res->end - res->start) + 1);
eac->pdata = pdata;
/* pre-initialize EAC hw */
next prev parent reply other threads:[~2008-09-05 5:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-05 5:50 [PATCH v2 0/2] OMAP2xxx EAC build fix and sparse cleanup Paul Walmsley
2008-09-05 5:51 ` Paul Walmsley [this message]
2008-09-05 7:23 ` [PATCH v2 1/2] OMAP2xxx EAC: update per recent IO address changes Russell King - ARM Linux
2008-09-05 5:51 ` [PATCH v2 2/2] OMAP2xxx EAC: fix sparse warnings Paul Walmsley
2008-09-05 7:00 ` [PATCH v2 0/2] OMAP2xxx EAC build fix and sparse cleanup Jarkko Nikula
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=20080905055048.5272.89989.stgit@localhost.localdomain \
--to=paul@pwsan.com \
--cc=linux-omap@vger.kernel.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