Skip to content

L
linux-davinci
Commit 442b3a71 authored by Tony Lindgren's avatar Tony Lindgren
Browse files
Options

Merge source.mvista.com:/home/git/linux-omap-2.6

parents ddb984bc 6bc09656
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 12 deletions
arch/arm/mach-omap1/board-nokia770.c
View file @ 442b3a71
...@@ -194,6 +194,7 @@ static void codec_delayed_power_down(void *arg) ...@@ -194,6 +194,7 @@ static void codec_delayed_power_down(void *arg)
down(&audio_pwr_sem); down(&audio_pwr_sem);
if (audio_pwr_state == -1) if (audio_pwr_state == -1)
tlv320aic23_power_down(); tlv320aic23_power_down();
clk_disable(dspxor_ck);
up(&audio_pwr_sem); up(&audio_pwr_sem);
} }
...@@ -201,8 +202,6 @@ static DECLARE_WORK(codec_power_down_work, codec_delayed_power_down, NULL); ...@@ -201,8 +202,6 @@ static DECLARE_WORK(codec_power_down_work, codec_delayed_power_down, NULL);
static void nokia770_audio_pwr_down(void) static void nokia770_audio_pwr_down(void)
{ {
clk_disable(dspxor_ck);
/* Turn off amplifier */ /* Turn off amplifier */
omap_set_gpio_dataout(AMPLIFIER_CTRL_GPIO, 0); omap_set_gpio_dataout(AMPLIFIER_CTRL_GPIO, 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment