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

Commit 56eba7a1 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

parents a909d3e6 7a5857c3

sound/soc/intel/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ config SND_SOC_INTEL_SST_MATCH 


config SND_SOC_INTEL_HASWELL

	tristate

	select SND_SOC_INTEL_SST_FIRMWARE



config SND_SOC_INTEL_BAYTRAIL

	tristate
@@ -56,7 +57,6 @@ config SND_SOC_INTEL_HASWELL_MACH 
	depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM

	depends on DW_DMAC_CORE

	select SND_SOC_INTEL_SST

	select SND_SOC_INTEL_SST_FIRMWARE

	select SND_SOC_INTEL_HASWELL

	select SND_SOC_RT5640

	help
@@ -138,7 +138,6 @@ config SND_SOC_INTEL_BROADWELL_MACH 
		   I2C_DESIGNWARE_PLATFORM

	depends on DW_DMAC_CORE

	select SND_SOC_INTEL_SST

	select SND_SOC_INTEL_SST_FIRMWARE

	select SND_SOC_INTEL_HASWELL

	select SND_SOC_RT286

	help

sound/soc/intel/atom/sst/sst_acpi.c

+1 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ static const struct dmi_system_id cht_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),

		},

	},

	{ }

};

sound/soc/intel/boards/bxt_da7219_max98357a.c

+2 −2
Original line number Diff line number Diff line
@@ -130,8 +130,8 @@ static int broxton_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) 
	 */

	ret = snd_soc_card_jack_new(rtd->card, "Headset Jack",

			SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1 |

			SND_JACK_BTN_2 | SND_JACK_BTN_3, &broxton_headset,

			NULL, 0);

			SND_JACK_BTN_2 | SND_JACK_BTN_3 | SND_JACK_LINEOUT,

			&broxton_headset, NULL, 0);

	if (ret) {

		dev_err(rtd->dev, "Headset Jack creation failed: %d\n", ret);

		return ret;

sound/soc/intel/skylake/skl.c

+5 −3
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ static int skl_probe(struct pci_dev *pci, 


	if (skl->nhlt == NULL) {

		err = -ENODEV;

		goto out_free;

		goto out_display_power_off;

	}



	skl_nhlt_update_topology_bin(skl);
@@ -746,6 +746,9 @@ static int skl_probe(struct pci_dev *pci, 
	skl_machine_device_unregister(skl);

out_nhlt_free:

	skl_nhlt_free(skl->nhlt);

out_display_power_off:

	if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI))

		snd_hdac_display_power(bus, false);

out_free:

	skl->init_failed = 1;

	skl_free(ebus);
@@ -785,7 +788,6 @@ static void skl_remove(struct pci_dev *pci) 


	release_firmware(skl->tplg);



	if (pci_dev_run_wake(pci))

	pm_runtime_get_noresume(&pci->dev);



	/* codec removal, invoke bus_device_remove */