Merge branch 'asoc-4.18' into asoc-4.19 wmadsp dep (35ef57a4) · Commits · e / devices / android_kernel_oneplus_sm7250

sound/soc/codecs/hdmi-codec.c

+15 −6

Original line number	Diff line number	Diff line
		@@ -291,10 +291,6 @@ static const struct snd_soc_dapm_widget hdmi_widgets[] = {
		SND_SOC_DAPM_OUTPUT("TX"),
		};

		static const struct snd_soc_dapm_route hdmi_routes[] = {
		{ "TX", NULL, "Playback" },
		};

		enum {
		DAI_ID_I2S = 0,
		DAI_ID_SPDIF,
		@@ -689,9 +685,23 @@ static int hdmi_codec_pcm_new(struct snd_soc_pcm_runtime *rtd,
		return snd_ctl_add(rtd->card->snd_card, kctl);
		}

		static int hdmi_dai_probe(struct snd_soc_dai *dai)
		{
		struct snd_soc_dapm_context *dapm;
		struct snd_soc_dapm_route route = {
		.sink = "TX",
		.source = dai->driver->playback.stream_name,
		};

		dapm = snd_soc_component_get_dapm(dai->component);

		return snd_soc_dapm_add_routes(dapm, &route, 1);
		}

		static const struct snd_soc_dai_driver hdmi_i2s_dai = {
		.name = "i2s-hifi",
		.id = DAI_ID_I2S,
		.probe = hdmi_dai_probe,
		.playback = {
		.stream_name = "I2S Playback",
		.channels_min = 2,
		@@ -707,6 +717,7 @@ static const struct snd_soc_dai_driver hdmi_i2s_dai = {
		static const struct snd_soc_dai_driver hdmi_spdif_dai = {
		.name = "spdif-hifi",
		.id = DAI_ID_SPDIF,
		.probe = hdmi_dai_probe,
		.playback = {
		.stream_name = "SPDIF Playback",
		.channels_min = 2,
		@@ -733,8 +744,6 @@ static int hdmi_of_xlate_dai_id(struct snd_soc_component *component,
		static const struct snd_soc_component_driver hdmi_driver = {
		.dapm_widgets = hdmi_widgets,
		.num_dapm_widgets = ARRAY_SIZE(hdmi_widgets),
		.dapm_routes = hdmi_routes,
		.num_dapm_routes = ARRAY_SIZE(hdmi_routes),
		.of_xlate_dai_id = hdmi_of_xlate_dai_id,
		.idle_bias_on = 1,
		.use_pmdown_time = 1,

+1 −0

Original line number	Diff line number	Diff line
		@@ -488,6 +488,7 @@ static const DECLARE_TLV_DB_RANGE(max98373_bde_gain_tlv,
		static bool max98373_readable_register(struct device *dev, unsigned int reg)
		{
		switch (reg) {
		case MAX98373_R2000_SW_RESET:
		case MAX98373_R2001_INT_RAW1 ... MAX98373_R200C_INT_EN3:
		case MAX98373_R2010_IRQ_CTRL:
		case MAX98373_R2014_THERM_WARN_THRESH

+4 −4

Original line number	Diff line number	Diff line
		@@ -64,8 +64,8 @@ static const struct reg_sequence rt5514_patch[] = {
		{RT5514_ANA_CTRL_LDO10, 0x00028604},
		{RT5514_ANA_CTRL_ADCFED, 0x00000800},
		{RT5514_ASRC_IN_CTRL1, 0x00000003},
		{RT5514_DOWNFILTER0_CTRL3, 0x10000362},
		{RT5514_DOWNFILTER1_CTRL3, 0x10000362},
		{RT5514_DOWNFILTER0_CTRL3, 0x10000352},
		{RT5514_DOWNFILTER1_CTRL3, 0x10000352},
		};

		static const struct reg_default rt5514_reg[] = {
		@@ -92,10 +92,10 @@ static const struct reg_default rt5514_reg[] = {
		{RT5514_ASRC_IN_CTRL1, 0x00000003},
		{RT5514_DOWNFILTER0_CTRL1, 0x00020c2f},
		{RT5514_DOWNFILTER0_CTRL2, 0x00020c2f},
		{RT5514_DOWNFILTER0_CTRL3, 0x10000362},
		{RT5514_DOWNFILTER0_CTRL3, 0x10000352},
		{RT5514_DOWNFILTER1_CTRL1, 0x00020c2f},
		{RT5514_DOWNFILTER1_CTRL2, 0x00020c2f},
		{RT5514_DOWNFILTER1_CTRL3, 0x10000362},
		{RT5514_DOWNFILTER1_CTRL3, 0x10000352},
		{RT5514_ANA_CTRL_LDO10, 0x00028604},
		{RT5514_ANA_CTRL_LDO18_16, 0x02000345},
		{RT5514_ANA_CTRL_ADC12, 0x0000a2a8},

+2 −2

Original line number	Diff line number	Diff line
		@@ -522,7 +522,7 @@ static inline int get_coeff(int mclk, int rate)
		/* The set of rates we can generate from the above for each SYSCLK */

		static const unsigned int rates_12288[] = {
		8000, 12000, 16000, 24000, 24000, 32000, 48000, 96000,
		8000, 12000, 16000, 24000, 32000, 48000, 96000,
		};

		static const struct snd_pcm_hw_constraint_list constraints_12288 = {
		@@ -540,7 +540,7 @@ static const struct snd_pcm_hw_constraint_list constraints_112896 = {
		};

		static const unsigned int rates_12[] = {
		8000, 11025, 12000, 16000, 22050, 2400, 32000, 41100, 48000,
		8000, 11025, 12000, 16000, 22050, 24000, 32000, 41100, 48000,
		48000, 88235, 96000,
		};

+8 −2

Original line number	Diff line number	Diff line
		@@ -2650,7 +2650,10 @@ int wm_adsp2_preloader_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
		struct wm_adsp *dsp = snd_soc_component_get_drvdata(component);
		struct wm_adsp *dsps = snd_soc_component_get_drvdata(component);
		struct soc_mixer_control *mc =
		(struct soc_mixer_control *)kcontrol->private_value;
		struct wm_adsp *dsp = &dsps[mc->shift - 1];

		ucontrol->value.integer.value[0] = dsp->preloaded;

		@@ -2662,10 +2665,11 @@ int wm_adsp2_preloader_put(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
		struct wm_adsp *dsp = snd_soc_component_get_drvdata(component);
		struct wm_adsp *dsps = snd_soc_component_get_drvdata(component);
		struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
		struct soc_mixer_control *mc =
		(struct soc_mixer_control *)kcontrol->private_value;
		struct wm_adsp *dsp = &dsps[mc->shift - 1];
		char preload[32];

		snprintf(preload, ARRAY_SIZE(preload), "DSP%u Preload", mc->shift);
		@@ -2679,6 +2683,8 @@ int wm_adsp2_preloader_put(struct snd_kcontrol *kcontrol,

		snd_soc_dapm_sync(dapm);

		flush_work(&dsp->boot_work);

		return 0;
		}
		EXPORT_SYMBOL_GPL(wm_adsp2_preloader_put);