Commit f228a725b975832ac5771ab2fc86d06bd694cdb3 breaks the build for this
driver; fix by using ioremap().
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Tested-by: Jarkko Nikula <jarkko.nikula@xxxxxxxxx>
---
arch/arm/mach-omap2/devices.c | 4 ++--
sound/arm/omap/eac.c | 4 +++-
2 files changed, 5 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..47a95e2 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 */
@@ -771,6 +771,8 @@ static int __devexit eac_remove(struct platform_device *pdev)
eac_disable_clocks(eac);
eac_put_clocks(eac);
+ iounmap(eac->base);
+
platform_set_drvdata(pdev, NULL);
return 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
