malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next

Browse Source
This commit is contained in:
Mark Brown 2013-11-08 10:43:23 +00:00
commit 642cba7528
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sound/soc/codecs/arizona.c
View File

@ -1477,21 +1477,25 @@ static void arizona_enable_fll(struct arizona_fll *fll,
{ {
struct arizona *arizona = fll->arizona; struct arizona *arizona = fll->arizona;
int ret; int ret;
bool use_sync = false;
/* /*
* If we have both REFCLK and SYNCCLK then enable both, * If we have both REFCLK and SYNCCLK then enable both,
* otherwise apply the SYNCCLK settings to REFCLK. * otherwise apply the SYNCCLK settings to REFCLK.
*/ */
if (fll->ref_src >= 0 && fll->ref_src != fll->sync_src) { if (fll->ref_src >= 0 && fll->ref_freq &&
fll->ref_src != fll->sync_src) {
regmap_update_bits(arizona->regmap, fll->base + 5, regmap_update_bits(arizona->regmap, fll->base + 5,
ARIZONA_FLL1_OUTDIV_MASK, ARIZONA_FLL1_OUTDIV_MASK,
ref->outdiv << ARIZONA_FLL1_OUTDIV_SHIFT); ref->outdiv << ARIZONA_FLL1_OUTDIV_SHIFT);
arizona_apply_fll(arizona, fll->base, ref, fll->ref_src, arizona_apply_fll(arizona, fll->base, ref, fll->ref_src,
false); false);
if (fll->sync_src >= 0) if (fll->sync_src >= 0) {
arizona_apply_fll(arizona, fll->base + 0x10, sync, arizona_apply_fll(arizona, fll->base + 0x10, sync,
fll->sync_src, true); fll->sync_src, true);
use_sync = true;
}
} else if (fll->sync_src >= 0) { } else if (fll->sync_src >= 0) {
regmap_update_bits(arizona->regmap, fll->base + 5, regmap_update_bits(arizona->regmap, fll->base + 5,
ARIZONA_FLL1_OUTDIV_MASK, ARIZONA_FLL1_OUTDIV_MASK,
@ -1511,7 +1515,7 @@ static void arizona_enable_fll(struct arizona_fll *fll,
* Increase the bandwidth if we're not using a low frequency * Increase the bandwidth if we're not using a low frequency
* sync source. * sync source.
*/ */
if (fll->sync_src >= 0 && fll->sync_freq > 100000) if (use_sync && fll->sync_freq > 100000)
regmap_update_bits(arizona->regmap, fll->base + 0x17, regmap_update_bits(arizona->regmap, fll->base + 0x17,
ARIZONA_FLL1_SYNC_BW, 0); ARIZONA_FLL1_SYNC_BW, 0);
else else
@ -1526,8 +1530,7 @@ static void arizona_enable_fll(struct arizona_fll *fll,
regmap_update_bits(arizona->regmap, fll->base + 1, regmap_update_bits(arizona->regmap, fll->base + 1,
ARIZONA_FLL1_ENA, ARIZONA_FLL1_ENA); ARIZONA_FLL1_ENA, ARIZONA_FLL1_ENA);
if (fll->ref_src >= 0 && fll->sync_src >= 0 && if (use_sync)
fll->ref_src != fll->sync_src)
regmap_update_bits(arizona->regmap, fll->base + 0x11, regmap_update_bits(arizona->regmap, fll->base + 0x11,
ARIZONA_FLL1_SYNC_ENA, ARIZONA_FLL1_SYNC_ENA,
ARIZONA_FLL1_SYNC_ENA); ARIZONA_FLL1_SYNC_ENA);
@ -1561,10 +1564,12 @@ int arizona_set_fll_refclk(struct arizona_fll *fll, int source,
if (fll->ref_src == source && fll->ref_freq == Fref) if (fll->ref_src == source && fll->ref_freq == Fref)
return 0; return 0;
if (fll->fout && Fref > 0) { if (fll->fout) {
ret = arizona_calc_fll(fll, &ref, Fref, fll->fout); if (Fref > 0) {
if (ret != 0) ret = arizona_calc_fll(fll, &ref, Fref, fll->fout);
return ret; if (ret != 0)
return ret;
}
if (fll->sync_src >= 0) { if (fll->sync_src >= 0) {
ret = arizona_calc_fll(fll, &sync, fll->sync_freq, ret = arizona_calc_fll(fll, &sync, fll->sync_freq,

12
sound/soc/codecs/wm5110.c
View File

@ -983,24 +983,36 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = {
ARIZONA_MUX_ROUTES("ASRC2L", "ASRC2L"), ARIZONA_MUX_ROUTES("ASRC2L", "ASRC2L"),
ARIZONA_MUX_ROUTES("ASRC2R", "ASRC2R"), ARIZONA_MUX_ROUTES("ASRC2R", "ASRC2R"),
{ "AEC Loopback", "HPOUT1L", "OUT1L" },
{ "AEC Loopback", "HPOUT1R", "OUT1R" },
{ "HPOUT1L", NULL, "OUT1L" }, { "HPOUT1L", NULL, "OUT1L" },
{ "HPOUT1R", NULL, "OUT1R" }, { "HPOUT1R", NULL, "OUT1R" },
{ "AEC Loopback", "HPOUT2L", "OUT2L" },
{ "AEC Loopback", "HPOUT2R", "OUT2R" },
{ "HPOUT2L", NULL, "OUT2L" }, { "HPOUT2L", NULL, "OUT2L" },
{ "HPOUT2R", NULL, "OUT2R" }, { "HPOUT2R", NULL, "OUT2R" },
{ "AEC Loopback", "HPOUT3L", "OUT3L" },
{ "AEC Loopback", "HPOUT3R", "OUT3R" },
{ "HPOUT3L", NULL, "OUT3L" }, { "HPOUT3L", NULL, "OUT3L" },
{ "HPOUT3R", NULL, "OUT3L" }, { "HPOUT3R", NULL, "OUT3L" },
{ "AEC Loopback", "SPKOUTL", "OUT4L" },
{ "SPKOUTLN", NULL, "OUT4L" }, { "SPKOUTLN", NULL, "OUT4L" },
{ "SPKOUTLP", NULL, "OUT4L" }, { "SPKOUTLP", NULL, "OUT4L" },
{ "AEC Loopback", "SPKOUTR", "OUT4R" },
{ "SPKOUTRN", NULL, "OUT4R" }, { "SPKOUTRN", NULL, "OUT4R" },
{ "SPKOUTRP", NULL, "OUT4R" }, { "SPKOUTRP", NULL, "OUT4R" },
{ "AEC Loopback", "SPKDAT1L", "OUT5L" },
{ "AEC Loopback", "SPKDAT1R", "OUT5R" },
{ "SPKDAT1L", NULL, "OUT5L" }, { "SPKDAT1L", NULL, "OUT5L" },
{ "SPKDAT1R", NULL, "OUT5R" }, { "SPKDAT1R", NULL, "OUT5R" },
{ "AEC Loopback", "SPKDAT2L", "OUT6L" },
{ "AEC Loopback", "SPKDAT2R", "OUT6R" },
{ "SPKDAT2L", NULL, "OUT6L" }, { "SPKDAT2L", NULL, "OUT6L" },
{ "SPKDAT2R", NULL, "OUT6R" }, { "SPKDAT2R", NULL, "OUT6R" },