aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/sh_dac_audio.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-05-13 03:59:40 -0400
committerPaul Mundt <lethal@linux-sh.org>2009-05-13 03:59:40 -0400
commitaf777ce42d3d51cdef353ce296d6f99dc503feef (patch)
treed0f1f8d9b485da129b0298fd0d74ab8c829884e0 /sound/oss/sh_dac_audio.c
parentfd5b12458b25a88eb6f6b56464846d98a45e8928 (diff)
sh: clkfwk: module_clk -> peripheral_clk rename.
For consistenct naming, and to allow us to fix up some confusion in the SH-Mobile clock framework, amongst other places. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'sound/oss/sh_dac_audio.c')
-rw-r--r--sound/oss/sh_dac_audio.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c
index 78cfb66e4c59..6fa3140720bc 100644
--- a/sound/oss/sh_dac_audio.c
+++ b/sound/oss/sh_dac_audio.c
@@ -95,18 +95,18 @@ static void dac_audio_stop(void)
95 outw(v, HD64461_GPADR); 95 outw(v, HD64461_GPADR);
96 } 96 }
97 97
98 sh_dac_output(0, CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL); 98 sh_dac_output(0, CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL);
99 sh_dac_disable(CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL); 99 sh_dac_disable(CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL);
100} 100}
101 101
102static void dac_audio_set_rate(void) 102static void dac_audio_set_rate(void)
103{ 103{
104 unsigned long interval; 104 unsigned long interval;
105 struct clk *clk; 105 struct clk *clk;
106 106
107 clk = clk_get(NULL, "module_clk"); 107 clk = clk_get(NULL, "peripheral_clk");
108 interval = (clk_get_rate(clk) / 4) / rate; 108 interval = (clk_get_rate(clk) / 4) / rate;
109 clk_put(clk); 109 clk_put(clk);
110 ctrl_outl(interval, TMU1_TCOR); 110 ctrl_outl(interval, TMU1_TCOR);
111 ctrl_outl(interval, TMU1_TCNT); 111 ctrl_outl(interval, TMU1_TCNT);
112} 112}