OMAP2/3 clock: mark the rest of the CM clocks as belonging to cm_clkdm

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-n800-audio.c

diff --git a/arch/arm/mach-omap2/board-n800-audio.c b/arch/arm/mach-omap2/board-n800-audio.c
index 5940f6191ab32cd6d1bdd65a8847a17e9a56e800..e28390e0c195f7599af9b3f80664e1cffa57e076 100644 (file)
--- a/arch/arm/mach-omap2/board-n800-audio.c
+++ b/arch/arm/mach-omap2/board-n800-audio.c
@@ -27,9 +27,9 @@
 #include <linux/spi/tsc2301.h>
 
 #include <asm/io.h>
-#include <asm/arch/eac.h>
+#include <mach/eac.h>
 
-#include "../plat-omap/dsp/dsp_common.h"
+#include <mach/dsp_common.h>
 
 #if defined(CONFIG_SPI_TSC2301_AUDIO) && defined(CONFIG_SND_OMAP24XX_EAC)
 #define AUDIO_ENABLED
@@ -58,7 +58,7 @@ static void n800_enable_eac_mux(void)
 {
        if (!eac_mux_disabled)
                return;
-       __raw_writel(saved_mux[1], IO_ADDRESS(0x48000124));
+       __raw_writel(saved_mux[1], OMAP2_IO_ADDRESS(0x48000124));
        eac_mux_disabled = 0;
 }
 
@@ -68,8 +68,8 @@ static void n800_disable_eac_mux(void)
                WARN_ON(eac_mux_disabled);
                return;
        }
-       saved_mux[1] = __raw_readl(IO_ADDRESS(0x48000124));
-       __raw_writel(0x1f1f1f1f, IO_ADDRESS(0x48000124));
+       saved_mux[1] = __raw_readl(OMAP2_IO_ADDRESS(0x48000124));
+       __raw_writel(0x1f1f1f1f, OMAP2_IO_ADDRESS(0x48000124));
        eac_mux_disabled = 1;
 }
 
@@ -77,7 +77,7 @@ static void n800_enable_clkout2_mux(void)
 {
        if (!clkout2_mux_disabled)
                return;
-       __raw_writel(saved_mux[0], IO_ADDRESS(0x480000e8));
+       __raw_writel(saved_mux[0], OMAP2_IO_ADDRESS(0x480000e8));
        clkout2_mux_disabled = 0;
 }
 
@@ -89,10 +89,10 @@ static void n800_disable_clkout2_mux(void)
                WARN_ON(clkout2_mux_disabled);
                return;
        }
-       saved_mux[0] = __raw_readl(IO_ADDRESS(0x480000e8));
+       saved_mux[0] = __raw_readl(OMAP2_IO_ADDRESS(0x480000e8));
        l = saved_mux[0] & ~0xff;
        l |= 0x1f;
-       __raw_writel(l, IO_ADDRESS(0x480000e8));
+       __raw_writel(l, OMAP2_IO_ADDRESS(0x480000e8));
        clkout2_mux_disabled = 1;
 }
 
@@ -316,7 +316,7 @@ void __init n800_audio_init(struct tsc2301_platform_data *tc)
 
 #else
 
-void __init n800_audio_init(void)
+void __init n800_audio_init(struct tsc2301_platform_data *tc)
 {
 }