summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorAndriy Skulysh <askulysh@gmail.com>2006-09-27 08:48:32 +0400
committerPaul Mundt <lethal@linux-sh.org>2006-09-27 08:48:32 +0400
commit7e27b9b720e74f471f0f0880c56578d07206c0af (patch)
treec99bfe14282117a933a78548569a78b2376338c9 /sound
parent048839dc548a5315b733993dfc7d082e1e848061 (diff)
downloadlinux-7e27b9b720e74f471f0f0880c56578d07206c0af.tar.xz
sound: SH DAC audio driver updates.
Update the SH DAC audio driver for the clock framework. Signed-off-by: Andriy Skulysh <askulysh@gmail.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/oss/sh_dac_audio.c26
1 files changed, 19 insertions, 7 deletions
diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c
index ae7fccc510a1..83ff8a71f716 100644
--- a/sound/oss/sh_dac_audio.c
+++ b/sound/oss/sh_dac_audio.c
@@ -1,3 +1,14 @@
+/*
+ * sound/oss/sh_dac_audio.c
+ *
+ * SH DAC based sound :(
+ *
+ * Copyright (C) 2004,2005 Andriy Skulysh
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
#include <linux/module.h>
#include <linux/init.h>
#include <linux/sched.h>
@@ -11,10 +22,12 @@
#include <asm/uaccess.h>
#include <asm/irq.h>
#include <asm/delay.h>
+#include <asm/clock.h>
#include <asm/cpu/dac.h>
+#include <asm/cpu/timer.h>
#include <asm/machvec.h>
#include <asm/hp6xx/hp6xx.h>
-#include <asm/hd64461/hd64461.h>
+#include <asm/hd64461.h>
#define MODNAME "sh_dac_audio"
@@ -23,11 +36,6 @@
#define TMU1_TCR_INIT 0x0020 /* Clock/4, rising edge; interrupt on */
#define TMU1_TSTR_INIT 0x02 /* Bit to turn on TMU1 */
-#define TMU_TSTR 0xfffffe92
-#define TMU1_TCOR 0xfffffea0
-#define TMU1_TCNT 0xfffffea4
-#define TMU1_TCR 0xfffffea8
-
#define BUFFER_SIZE 48000
static int rate;
@@ -87,14 +95,18 @@ static void dac_audio_stop(void)
outw(v, HD64461_GPADR);
}
+ sh_dac_output(0, CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL);
sh_dac_disable(CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL);
}
static void dac_audio_set_rate(void)
{
unsigned long interval;
+ struct clk *clk;
- interval = (current_cpu_data.module_clock / 4) / rate;
+ clk = clk_get("module_clk");
+ interval = (clk_get_rate(clk) / 4) / rate;
+ clk_put(clk);
ctrl_outl(interval, TMU1_TCOR);
ctrl_outl(interval, TMU1_TCNT);
}