samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Actions Packages Projekty Wydania Wiki Aktywność

Merge "ASoC: remove error prints and warning at bootup log"

Przeglądaj źródła
This commit is contained in:
Linux Build Service Account
2017-12-20 00:31:39 -08:00
zatwierdzone przez Gerrit - the friendly Code Review server
rodzic 6b6dae7320 52697fe50c
commit 344329b79c
4 zmienionych plików z 25 dodań i 14 usunięć
Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
asoc/codecs/sdm660_cdc/msm-analog-cdc.c
Wyświetl plik

@@ -3630,18 +3630,6 @@ static const struct sdm660_cdc_reg_mask_val
{MSM89XX_PMIC_ANALOG_RX_COM_OCP_COUNT, 0xFF, 0xFF},
};
static void msm_anlg_cdc_codec_init_cache(struct snd_soc_codec *codec)
{
u32 i;
regcache_cache_only(codec->component.regmap, true);
/* update cache with POR values */
for (i = 0; i < ARRAY_SIZE(msm89xx_pmic_cdc_defaults); i++)
snd_soc_write(codec, msm89xx_pmic_cdc_defaults[i].reg,
msm89xx_pmic_cdc_defaults[i].def);
regcache_cache_only(codec->component.regmap, false);
}
static void msm_anlg_cdc_codec_init_reg(struct snd_soc_codec *codec)
{
u32 i;
@@ -3687,7 +3675,7 @@ static struct regulator *msm_anlg_cdc_find_regulator(
return sdm660_cdc->supplies[i].consumer;
}
dev_err(sdm660_cdc->dev, "Error: regulator not found:%s\n"
dev_dbg(sdm660_cdc->dev, "Error: regulator not found:%s\n"
, name);
return NULL;
}
@@ -4139,7 +4127,6 @@ static int msm_anlg_cdc_soc_probe(struct snd_soc_codec *codec)
ARRAY_SIZE(hph_type_detect_controls));
msm_anlg_cdc_bringup(codec);
msm_anlg_cdc_codec_init_cache(codec);
msm_anlg_cdc_codec_init_reg(codec);
msm_anlg_cdc_update_reg_defaults(codec);

6
asoc/codecs/sdm660_cdc/msm-digital-cdc.c
Wyświetl plik

@@ -1397,6 +1397,9 @@ static const struct snd_soc_dapm_route audio_dig_map[] = {
{"RX2 MIX1 INP2", "RX3", "I2S RX3"},
{"RX2 MIX1 INP2", "IIR1", "IIR1"},
{"RX2 MIX1 INP2", "IIR2", "IIR2"},
{"RX2 MIX1 INP3", "RX1", "I2S RX1"},
{"RX2 MIX1 INP3", "RX2", "I2S RX2"},
{"RX2 MIX1 INP3", "RX3", "I2S RX3"},
{"RX3 MIX1 INP1", "RX1", "I2S RX1"},
{"RX3 MIX1 INP1", "RX2", "I2S RX2"},
@@ -1408,6 +1411,9 @@ static const struct snd_soc_dapm_route audio_dig_map[] = {
{"RX3 MIX1 INP2", "RX3", "I2S RX3"},
{"RX3 MIX1 INP2", "IIR1", "IIR1"},
{"RX3 MIX1 INP2", "IIR2", "IIR2"},
{"RX3 MIX1 INP3", "RX1", "I2S RX1"},
{"RX3 MIX1 INP3", "RX2", "I2S RX2"},
{"RX3 MIX1 INP3", "RX3", "I2S RX3"},
{"RX1 MIX2 INP1", "IIR1", "IIR1"},
{"RX2 MIX2 INP1", "IIR1", "IIR1"},