Skip to contentSkip to conversation

OMAP2xxx EAC build fix and sparse cleanup

PATCH In review Paul Walmsley 2 participants 4 messages Sep 5, 2008

Subsystems (4)
Arm (32-bit) Sound Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Paul Walmsley

author
#0 lore raw

v3 cover OMAP2xxx EAC build fix and sparse cleanup

This series fixes a build bug in the EAC driver after the recent IO address changes, and resolves some sparse warnings. Updated to use ioremap(). Thanks to Jarkko Nikula <[email protected]> for testing and Russell King <[email protected]> for review.

Compile-tested only.

- Paul

---

 arch/arm/mach-omap2/devices.c |    4 ++--
 sound/arm/omap/eac.c          |    8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)
author
#1 lore raw

PATCH v3 1/2 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 <[email protected]>
Tested-by Jarkko Nikula <[email protected]>
---
 arch/arm/mach-omap2/devices.c |    4 ++--
 sound/arm/omap/eac.c          |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/devices.c +2 -2
index bd49a0f..c7de03e 100644
@@ -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,
 	},
 };
sound/arm/omap/eac.c +3 -1
index 9fe8d74..47a95e2 100644
@@ -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;
author
#2 lore raw

PATCH v3 2/2 OMAP2xxx EAC: fix sparse warnings

In reply to Paul Walmsley

This patch resolves the following two sparse warnings:

sound/arm/omap/eac.c:788:12: warning: symbol 'eac_init' was not declared. Should it be static? sound/arm/omap/eac.c:793:13: warning: symbol 'eac_exit' was not declared. Should it be static?

Signed-off-by Paul Walmsley <[email protected]>
---
 sound/arm/omap/eac.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
sound/arm/omap/eac.c +2 -2
index 47a95e2..667051e 100644
@@ -787,12 +787,12 @@ static struct platform_driver eac_driver = {
 	.remove		= eac_remove,
 };
 
-int __init eac_init(void)
+static int __init eac_init(void)
 {
 	return platform_driver_register(&eac_driver);
 }
 
-void __exit eac_exit(void)
+static void __exit eac_exit(void)
 {
 	platform_driver_unregister(&eac_driver);
 }