Commit d700a116 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/intel-hda' into for-next 

Pull ArrowLake-S PCI ID addition and config for MTL/LNL

Link: https://lore.kernel.org/r/20230802150105.24604-1-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents cfad53a9 3f8c530f

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -3058,6 +3058,7 @@ 
#define PCI_DEVICE_ID_INTEL_HDA_RPL_S	0x7a50

#define PCI_DEVICE_ID_INTEL_HDA_ADL_S	0x7ad0

#define PCI_DEVICE_ID_INTEL_HDA_MTL	0x7e28

#define PCI_DEVICE_ID_INTEL_HDA_ARL_S	0x7f50

#define PCI_DEVICE_ID_INTEL_SCH_LPC	0x8119

#define PCI_DEVICE_ID_INTEL_SCH_IDE	0x811a

#define PCI_DEVICE_ID_INTEL_HDA_POULSBO	0x811b

sound/hda/hdac_i915.c

+10 −4
Original line number Diff line number Diff line
@@ -75,14 +75,20 @@ static bool connectivity_check(struct pci_dev *i915, struct pci_dev *hdac) 
	if (bus_a == bus_b)

		return true;



	/*

	 * on i915 discrete GPUs with embedded HDA audio, the two

	 * devices are connected via 2nd level PCI bridge

	 */

	bus_a = bus_a->parent;

	bus_b = bus_b->parent;



	/* connected via parent bus (may be NULL!) */

	if (bus_a == bus_b)

		return true;



	if (!bus_a || !bus_b)

		return false;



	/*

	 * on i915 discrete GPUs with embedded HDA audio, the two

	 * devices are connected via 2nd level PCI bridge

	 */

	bus_a = bus_a->parent;

	bus_b = bus_b->parent;

	if (bus_a && bus_a == bus_b)

sound/hda/intel-dsp-config.c

+9 −1
Original line number Diff line number Diff line
@@ -461,10 +461,18 @@ static const struct config_entry config_table[] = { 
	/* Meteorlake-P */

	{

		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,

		.device = 0x7e28,

		.device = PCI_DEVICE_ID_INTEL_HDA_MTL,

	},

#endif



/* Lunar Lake */

#if IS_ENABLED(CONFIG_SND_SOC_SOF_LUNARLAKE)

	/* Lunarlake-P */

	{

		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,

		.device = PCI_DEVICE_ID_INTEL_HDA_LNL_P,

	},

#endif

};



static const struct config_entry *snd_intel_dsp_find_config

sound/pci/hda/hda_intel.c

+2 −0
Original line number Diff line number Diff line
@@ -2499,6 +2499,8 @@ static const struct pci_device_id azx_ids[] = { 
	{ PCI_DEVICE_DATA(INTEL, HDA_MTL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },

	/* Lunarlake-P */

	{ PCI_DEVICE_DATA(INTEL, HDA_LNL_P, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },

	/* Arrow Lake-S */

	{ PCI_DEVICE_DATA(INTEL, HDA_ARL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE) },

	/* Apollolake (Broxton-P) */

	{ PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },

	/* Gemini-Lake */