Commit cab8cf49 authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Takashi Iwai
Browse files

ALSA: hda: Add controller matching macros 



Some HDA controllers require additional handling, so there are macros to
match them, however those are spread across multiple files. Add them all
in one place, so they can be reused.

Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20230717114511.484999-6-amadeuszx.slawinski@linux.intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 97b7aeb2

include/sound/hdaudio.h

+26 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/io.h>

#include <linux/io.h>

#include <linux/io-64-nonatomic-lo-hi.h>

#include <linux/io-64-nonatomic-lo-hi.h>

#include <linux/iopoll.h>

#include <linux/iopoll.h>

#include <linux/pci.h>

#include <linux/pm_runtime.h>

#include <linux/pm_runtime.h>

#include <linux/timecounter.h>

#include <linux/timecounter.h>

#include <sound/core.h>

#include <sound/core.h>
@@ -704,4 +705,29 @@ static inline unsigned int snd_array_index(struct snd_array *array, void *ptr) 
	for ((idx) = 0, (ptr) = (array)->list; (idx) < (array)->used; \

	for ((idx) = 0, (ptr) = (array)->list; (idx) < (array)->used; \

	     (ptr) = snd_array_elem(array, ++(idx)))

	     (ptr) = snd_array_elem(array, ++(idx)))





/*

 * Device matching

 */



#define HDA_CONTROLLER_IS_HSW(pci) (pci_match_id((struct pci_device_id []){ \

			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_HSW_0) }, \

			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_HSW_2) }, \

			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_HSW_3) }, \

			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_BDW) }, \

			{ } \

		}, pci))



#define HDA_CONTROLLER_IS_APL(pci) (pci_match_id((struct pci_device_id []){ \

			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_APL) }, \

			{ } \

		}, pci))



#define HDA_CONTROLLER_IN_GPU(pci) (pci_match_id((struct pci_device_id []){ \

			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_DG1) }, \

			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_DG2_0) }, \

			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_DG2_1) }, \

			{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HDA_DG2_2) }, \

			{ } \

		}, pci) || HDA_CONTROLLER_IS_HSW(pci))



#endif /* __SOUND_HDAUDIO_H */
 
#endif /* __SOUND_HDAUDIO_H */