Merge branch 'asoc-4.18' into asoc-linus (6c084839) · Commits · e / devices / android_kernel_fairphone_FP5

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -773,6 +773,7 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream,
		if (WARN_ON(!rtd))
		return -EINVAL;

		if (pinfo)
		rtd->i2s_instance = pinfo->i2s_instance;
		if (adata->asic_type == CHIP_STONEY) {
		val = acp_reg_read(adata->acp_mmio,

+8 −0

Original line number	Diff line number	Diff line
		@@ -1283,6 +1283,12 @@ static int cs47l24_probe(struct platform_device *pdev)
		return ret;
		}

		ret = arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 1);
		if (ret != 0)
		dev_warn(&pdev->dev,
		"Failed to set compressed IRQ as a wake source: %d\n",
		ret);

		arizona_init_common(arizona);

		ret = arizona_init_vol_limit(arizona);
		@@ -1306,6 +1312,7 @@ static int cs47l24_probe(struct platform_device *pdev)
		err_spk_irqs:
		arizona_free_spk_irqs(arizona);
		err_dsp_irq:
		arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 0);
		arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, cs47l24);

		return ret;
		@@ -1323,6 +1330,7 @@ static int cs47l24_remove(struct platform_device *pdev)

		arizona_free_spk_irqs(arizona);

		arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 0);
		arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, cs47l24);

		return 0;

+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},