Commit f228a725b975832ac5771ab2fc86d06bd694cdb3 breaks the build for this
driver; fix by using OMAP2_IO_ADDRESS.
Compile-tested only.
Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
---
sound/arm/omap/eac.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/arm/omap/eac.c b/sound/arm/omap/eac.c
index 9fe8d74..cb042e6 100644
--- a/sound/arm/omap/eac.c
+++ b/sound/arm/omap/eac.c
@@ -254,7 +254,7 @@
/* internal structure of the EAC driver */
struct omap_eac {
struct mutex mutex;
- void __iomem * base;
+ u32 base;
struct platform_device * pdev;
struct eac_platform_data * pdata;
struct snd_card * card;
@@ -279,12 +279,12 @@ MODULE_PARM_DESC(id, "ID string for OMAP24xx EAC");
static inline void eac_write_reg(struct omap_eac *eac, int idx, u16 val)
{
- __raw_writew(val, eac->base + idx);
+ __raw_writew(val, OMAP2_IO_ADDRESS(eac->base + idx));
}
static inline u16 eac_read_reg(struct omap_eac *eac, int idx)
{
- return __raw_readw(eac->base + idx);
+ return __raw_readw(OMAP2_IO_ADDRESS(eac->base + idx));
}
static int eac_get_clocks(struct omap_eac *eac)
@@ -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 = res->start;
eac->pdata = pdata;
/* pre-initialize EAC hw */
--
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
