From 2565fe1bc31875f7c8c371471ec1a6e5dfb29c9c Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 18 Mar 2023 07:48:47 -0600 Subject: [PATCH] Move RPP-S XHCI from USB4 driver to XHCI driver Change-Id: I7853de5010123875cb0e0150c2e3763f1d3eaff8 --- src/include/device/pci_ids.h | 2 +- src/soc/intel/common/block/usb4/xhci.c | 1 - src/soc/intel/common/block/xhci/xhci.c | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index 2f061a1ecb..2a010d0cf0 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -4233,7 +4233,7 @@ #define PCI_DID_INTEL_MTL_M_TCSS_XHCI 0x7eb0 #define PCI_DID_INTEL_MTL_P_TCSS_XHCI 0x7ec0 #define PCI_DID_INTEL_RPP_P_TCSS_XHCI 0xa71e -#define PCI_DID_INTEL_RPP_S_TCSS_XHCI 0x7a60 +#define PCI_DID_INTEL_RPP_S_XHCI 0x7a60 /* Intel P2SB device Ids */ #define PCI_DID_INTEL_APL_P2SB 0x5a92 diff --git a/src/soc/intel/common/block/usb4/xhci.c b/src/soc/intel/common/block/usb4/xhci.c index fad918ba93..d1a2dc6659 100644 --- a/src/soc/intel/common/block/usb4/xhci.c +++ b/src/soc/intel/common/block/usb4/xhci.c @@ -27,7 +27,6 @@ static struct device_operations usb4_xhci_ops = { static const unsigned short pci_device_ids[] = { PCI_DID_INTEL_RPP_P_TCSS_XHCI, - PCI_DID_INTEL_RPP_S_TCSS_XHCI, PCI_DID_INTEL_MTL_M_TCSS_XHCI, PCI_DID_INTEL_MTL_P_TCSS_XHCI, PCI_DID_INTEL_TGP_TCSS_XHCI, diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c index 9931fb641e..9cc4211004 100644 --- a/src/soc/intel/common/block/xhci/xhci.c +++ b/src/soc/intel/common/block/xhci/xhci.c @@ -148,6 +148,7 @@ static const unsigned short pci_device_ids[] = { PCI_DID_INTEL_ADP_P_XHCI, PCI_DID_INTEL_ADP_S_XHCI, PCI_DID_INTEL_ADP_M_XHCI, + PCI_DID_INTEL_RPP_S_XHCI, 0 };