Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2d64282 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/adau17x1', 'asoc/topic/adsp',... 

Merge remote-tracking branches 'asoc/topic/adau17x1', 'asoc/topic/adsp', 'asoc/topic/ak4642', 'asoc/topic/amd' and 'asoc/topic/arizona' into asoc-next
parents 99d35094 1d007348 d589d8b8 fc1e65c3 30cd8497 acff07d0

sound/soc/amd/acp-pcm-dma.c

+0 −3
Original line number Diff line number Diff line
@@ -670,13 +670,10 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, 
{

	int status;

	uint64_t size;

	struct snd_dma_buffer *dma_buffer;

	struct page *pg;

	struct snd_pcm_runtime *runtime;

	struct audio_substream_data *rtd;



	dma_buffer = &substream->dma_buffer;



	runtime = substream->runtime;

	rtd = runtime->private_data;

sound/soc/codecs/adau17x1.c

+1 −2
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ static int adau17x1_pll_event(struct snd_soc_dapm_widget *w, 
{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct adau *adau = snd_soc_codec_get_drvdata(codec);

	int ret;



	if (SND_SOC_DAPM_EVENT_ON(event)) {

		adau->pll_regs[5] = 1;
@@ -78,7 +77,7 @@ static int adau17x1_pll_event(struct snd_soc_dapm_widget *w, 
	}



	/* The PLL register is 6 bytes long and can only be written at once. */

	ret = regmap_raw_write(adau->regmap, ADAU17X1_PLL_CONTROL,

	regmap_raw_write(adau->regmap, ADAU17X1_PLL_CONTROL,

			adau->pll_regs, ARRAY_SIZE(adau->pll_regs));



	if (SND_SOC_DAPM_EVENT_ON(event)) {

sound/soc/codecs/ak4642.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static int ak4642_lout_event(struct snd_soc_dapm_widget *w, 
	case SND_SOC_DAPM_POST_PMU:

	case SND_SOC_DAPM_POST_PMD:

		/* Power save mode OFF */

		mdelay(300);

		msleep(300);

		snd_soc_update_bits(codec, SG_SL2, LOPS, 0);

		break;

	}

sound/soc/codecs/arizona.h

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ extern unsigned int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS]; 
#define ARIZONA_DSP_ROUTES(name) \

	{ name, NULL, name " Preloader"}, \

	{ name " Preloader", NULL, "SYSCLK" }, \

	{ name " Preload", NULL, name " Preloader"}, \

	{ name, NULL, name " Aux 1" }, \

	{ name, NULL, name " Aux 2" }, \

	{ name, NULL, name " Aux 3" }, \

sound/soc/codecs/cs47l24.c

+7 −1
Original line number Diff line number Diff line
@@ -173,6 +173,9 @@ SOC_ENUM("ISRC2 FSH", arizona_isrc_fsh[1]), 
SOC_ENUM("ISRC3 FSH", arizona_isrc_fsh[2]),

SOC_ENUM("ASRC RATE 1", arizona_asrc_rate1),



WM_ADSP2_PRELOAD_SWITCH("DSP2", 2),

WM_ADSP2_PRELOAD_SWITCH("DSP3", 3),



ARIZONA_MIXER_CONTROLS("DSP2L", ARIZONA_DSP2LMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("DSP2R", ARIZONA_DSP2RMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("DSP3L", ARIZONA_DSP3LMIX_INPUT_1_SOURCE),
@@ -1121,7 +1124,10 @@ static int cs47l24_codec_probe(struct snd_soc_codec *codec) 


	priv->core.arizona->dapm = dapm;



	arizona_init_spk(codec);

	ret = arizona_init_spk(codec);

	if (ret < 0)

		return ret;



	arizona_init_gpio(codec);

	arizona_init_mono(codec);

	arizona_init_notifiers(codec);