From: Paul Walmsley <paul@pwsan.com>
Date: Fri, 5 Sep 2008 07:37:33 +0000 (-0600)
Subject: OMAP2xxx EAC: update per recent IO address changes
X-Git-Tag: v2.6.27-omap1~253
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=3a02c1ae56a61c5249594553735ff32557e2e7ed;p=linux-2.6-omap-h63xx.git

OMAP2xxx EAC: update per recent IO address changes

Commit f228a725b975832ac5771ab2fc86d06bd694cdb3 breaks the build for this
driver; fix by using ioremap().

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Tested-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index bd49a0f152c..c7de03ea930 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 9fe8d7435c1..47a95e217f3 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;