From da9f8742cfa1388a375c263d1c11b51f80107ffa Mon Sep 17 00:00:00 2001 From: Ksawlii Date: Sun, 24 Nov 2024 00:22:58 +0100 Subject: [PATCH] Revert "PCI: Add function 0 DMA alias quirk for Glenfly Arise chip" This reverts commit b63ccbac6dee2f6ba51a18759b1c00ce8204ccac. --- drivers/pci/quirks.c | 4 ---- include/linux/pci_ids.h | 2 -- sound/pci/hda/hda_intel.c | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 2e7a0e6ae..2e59404cb 100755 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4091,10 +4091,6 @@ static void quirk_dma_func0_alias(struct pci_dev *dev) DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_RICOH, 0xe832, quirk_dma_func0_alias); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_RICOH, 0xe476, quirk_dma_func0_alias); -/* Some Glenfly chips use function 0 as the PCIe Requester ID for DMA */ -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_GLENFLY, 0x3d40, quirk_dma_func0_alias); -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_GLENFLY, 0x3d41, quirk_dma_func0_alias); - static void quirk_dma_func1_alias(struct pci_dev *dev) { if (PCI_FUNC(dev->devfn) != 1) diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index fdae1e7aa..9394950db 100755 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2659,8 +2659,6 @@ #define PCI_DEVICE_ID_DCI_PCCOM8 0x0002 #define PCI_DEVICE_ID_DCI_PCCOM2 0x0004 -#define PCI_VENDOR_ID_GLENFLY 0x6766 - #define PCI_VENDOR_ID_INTEL 0x8086 #define PCI_DEVICE_ID_INTEL_EESSC 0x0008 #define PCI_DEVICE_ID_INTEL_PXHD_0 0x0320 diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index b92095bb2..a3c6a5eeb 100755 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2777,7 +2777,7 @@ static const struct pci_device_id azx_ids[] = { .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS | AZX_DCAPS_PM_RUNTIME }, /* GLENFLY */ - { PCI_DEVICE(PCI_VENDOR_ID_GLENFLY, PCI_ANY_ID), + { PCI_DEVICE(0x6766, PCI_ANY_ID), .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8, .class_mask = 0xffffff, .driver_data = AZX_DRIVER_GFHDMI | AZX_DCAPS_POSFIX_LPIB |