Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 182863
b: refs/heads/master
c: b2c3e92
h: refs/heads/master
i:
  182861: 993f3b2
  182859: 3b08317
  182855: d0f3f20
  182847: d1a1c04
v: v3
  • Loading branch information
Guennadi Liakhovetski authored and Mark Brown committed Jan 29, 2010
1 parent c141c70 commit 14d64a6
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 42 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 660c63a4a289a835aa9af93a45884c5d0c004b20
refs/heads/master: b2c3e923110f6ca60ccb30cf4a6bda5211454c4f
12 changes: 4 additions & 8 deletions trunk/sound/soc/codecs/wm8974.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@ SOC_ENUM("Aux Mode", wm8974_auxmode),

SOC_SINGLE("Capture Boost(+20dB)", WM8974_ADCBOOST, 8, 1, 0),
SOC_SINGLE("Mono Playback Switch", WM8974_MONOMIX, 6, 1, 1),

/* DAC / ADC oversampling */
SOC_SINGLE("DAC 128x Oversampling Switch", WM8974_DAC, 8, 1, 0),
SOC_SINGLE("ADC 128x Oversampling Switch", WM8974_ADC, 8, 1, 0),
};

/* Speaker Output Mixer */
Expand Down Expand Up @@ -381,14 +385,6 @@ static int wm8974_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
reg = snd_soc_read(codec, WM8974_CLOCK) & 0x11f;
snd_soc_write(codec, WM8974_CLOCK, reg | div);
break;
case WM8974_ADCCLK:
reg = snd_soc_read(codec, WM8974_ADC) & 0x1f7;
snd_soc_write(codec, WM8974_ADC, reg | div);
break;
case WM8974_DACCLK:
reg = snd_soc_read(codec, WM8974_DAC) & 0x1f7;
snd_soc_write(codec, WM8974_DAC, reg | div);
break;
case WM8974_BCLKDIV:
reg = snd_soc_read(codec, WM8974_CLOCK) & 0x1e3;
snd_soc_write(codec, WM8974_CLOCK, reg | div);
Expand Down
12 changes: 1 addition & 11 deletions trunk/sound/soc/codecs/wm8974.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,7 @@
/* Clock divider Id's */
#define WM8974_OPCLKDIV 0
#define WM8974_MCLKDIV 1
#define WM8974_ADCCLK 2
#define WM8974_DACCLK 3
#define WM8974_BCLKDIV 4

/* DAC clock dividers */
#define WM8974_DACCLK_F2 (1 << 3)
#define WM8974_DACCLK_F4 (0 << 3)

/* ADC clock dividers */
#define WM8974_ADCCLK_F2 (1 << 3)
#define WM8974_ADCCLK_F4 (0 << 3)
#define WM8974_BCLKDIV 2

/* PLL Out dividers */
#define WM8974_OPCLKDIV_1 (0 << 4)
Expand Down
19 changes: 4 additions & 15 deletions trunk/sound/soc/codecs/wm8978.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,10 @@ static const struct snd_kcontrol_new wm8978_snd_controls[] = {
/* Speaker */
SOC_DOUBLE_R("Speaker Switch",
WM8978_LOUT2_SPK_CONTROL, WM8978_ROUT2_SPK_CONTROL, 6, 1, 1),

/* DAC / ADC oversampling */
SOC_SINGLE("DAC 128x Oversampling Switch", WM8978_DAC_CONTROL, 8, 1, 0),
SOC_SINGLE("ADC 128x Oversampling Switch", WM8978_ADC_CONTROL, 8, 1, 0),
};

/* Mixer #1: Output (OUT1, OUT2) Mixer: mix AUX, Input mixer output and DAC */
Expand Down Expand Up @@ -513,21 +517,6 @@ static int wm8978_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
if (wm8978->f_mclk)
ret = wm8978_configure_pll(codec);
break;
case WM8978_MCLKDIV:
if (div & ~0xe0)
return -EINVAL;
snd_soc_update_bits(codec, WM8978_CLOCKING, 0xe0, div);
break;
case WM8978_ADCCLK:
if (div & ~8)
return -EINVAL;
snd_soc_update_bits(codec, WM8978_ADC_CONTROL, 8, div);
break;
case WM8978_DACCLK:
if (div & ~8)
return -EINVAL;
snd_soc_update_bits(codec, WM8978_DAC_CONTROL, 8, div);
break;
case WM8978_BCLKDIV:
if (div & ~0x1c)
return -EINVAL;
Expand Down
3 changes: 0 additions & 3 deletions trunk/sound/soc/codecs/wm8978.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@
/* Clock divider Id's */
enum wm8978_clk_id {
WM8978_OPCLKRATE,
WM8978_MCLKDIV,
WM8978_ADCCLK,
WM8978_DACCLK,
WM8978_BCLKDIV,
};

Expand Down
4 changes: 0 additions & 4 deletions trunk/sound/soc/sh/migor.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@ static int migor_hw_params(struct snd_pcm_substream *substream,
if (ret < 0)
return ret;

ret = snd_soc_dai_set_clkdiv(codec_dai, WM8978_DACCLK, 8);
if (ret < 0)
return ret;

ret = snd_soc_dai_set_clkdiv(codec_dai, WM8978_OPCLKRATE, rate * 512);
if (ret < 0)
return ret;
Expand Down

0 comments on commit 14d64a6

Please sign in to comment.