|
@@ -686,7 +686,7 @@ int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk,
|
|
* @bclk_idx: bclk_divs index for found bclk
|
|
* @bclk_idx: bclk_divs index for found bclk
|
|
*
|
|
*
|
|
* Returns:
|
|
* Returns:
|
|
- * -1, in case no PLL frequency out available was found
|
|
|
|
|
|
+ * < 0, in case no PLL frequency out available was found
|
|
* >=0, in case we could derive bclk, lrclk, sysclk from PLL out using
|
|
* >=0, in case we could derive bclk, lrclk, sysclk from PLL out using
|
|
* (@sysclk_idx, @dac_idx, @bclk_idx) dividers
|
|
* (@sysclk_idx, @dac_idx, @bclk_idx) dividers
|
|
*/
|
|
*/
|
|
@@ -696,13 +696,13 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in,
|
|
{
|
|
{
|
|
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
|
|
struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
|
|
int sysclk, bclk, lrclk, freq_out;
|
|
int sysclk, bclk, lrclk, freq_out;
|
|
- int diff, best_freq_out;
|
|
|
|
|
|
+ int diff;
|
|
int i, j, k;
|
|
int i, j, k;
|
|
|
|
|
|
bclk = wm8960->bclk;
|
|
bclk = wm8960->bclk;
|
|
lrclk = wm8960->lrclk;
|
|
lrclk = wm8960->lrclk;
|
|
|
|
|
|
- *bclk_idx = -1;
|
|
|
|
|
|
+ *sysclk_idx = *dac_idx = *bclk_idx = -1;
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(sysclk_divs); ++i) {
|
|
for (i = 0; i < ARRAY_SIZE(sysclk_divs); ++i) {
|
|
if (sysclk_divs[i] == -1)
|
|
if (sysclk_divs[i] == -1)
|
|
@@ -720,21 +720,12 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in,
|
|
*sysclk_idx = i;
|
|
*sysclk_idx = i;
|
|
*dac_idx = j;
|
|
*dac_idx = j;
|
|
*bclk_idx = k;
|
|
*bclk_idx = k;
|
|
- best_freq_out = freq_out;
|
|
|
|
- break;
|
|
|
|
|
|
+ return freq_out;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if (k != ARRAY_SIZE(bclk_divs))
|
|
|
|
- break;
|
|
|
|
}
|
|
}
|
|
- if (j != ARRAY_SIZE(dac_divs))
|
|
|
|
- break;
|
|
|
|
}
|
|
}
|
|
-
|
|
|
|
- if (*bclk_idx != -1)
|
|
|
|
- wm8960_set_pll(codec, freq_in, best_freq_out);
|
|
|
|
-
|
|
|
|
- return *bclk_idx;
|
|
|
|
|
|
+ return -EINVAL;
|
|
}
|
|
}
|
|
static int wm8960_configure_clocking(struct snd_soc_codec *codec)
|
|
static int wm8960_configure_clocking(struct snd_soc_codec *codec)
|
|
{
|
|
{
|
|
@@ -783,11 +774,12 @@ static int wm8960_configure_clocking(struct snd_soc_codec *codec)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- ret = wm8960_configure_pll(codec, freq_in, &i, &j, &k);
|
|
|
|
- if (ret < 0) {
|
|
|
|
|
|
+ freq_out = wm8960_configure_pll(codec, freq_in, &i, &j, &k);
|
|
|
|
+ if (freq_out < 0) {
|
|
dev_err(codec->dev, "failed to configure clock via PLL\n");
|
|
dev_err(codec->dev, "failed to configure clock via PLL\n");
|
|
- return -EINVAL;
|
|
|
|
|
|
+ return freq_out;
|
|
}
|
|
}
|
|
|
|
+ wm8960_set_pll(codec, freq_in, freq_out);
|
|
|
|
|
|
configure_clock:
|
|
configure_clock:
|
|
/* configure sysclk clock */
|
|
/* configure sysclk clock */
|