diff options
| author | Kapil Porwal <kapilporwal@google.com> | 2022-12-07 16:09:32 +0530 |
|---|---|---|
| committer | Eric Lai <eric_lai@quanta.corp-partner.google.com> | 2022-12-12 01:31:48 +0000 |
| commit | 843699e3cf480de9f4d116c5cf0eb8d832103caa (patch) | |
| tree | 1790a6498edbd74a479a83626b0e67eaeff9968c | |
| parent | 3d1b2db1af97730ecfbfdb094dcface912c9c351 (diff) | |
drivers/wifi: Move ADL-P CNVi IDs from generic to IA common code CNVi driver
BUG=b:259716145
TEST=Dump SSDT and see that _PRW and _DSD for CNVi device contains
the value from the devicetree on google/redrix.
Before:
Scope (\_SB.PCI0.WFA3)
{
Name (_PRW, Package (0x02) // _PRW: Power Resources for Wake
{
0x6D,
0x03
})
Name (_DSD, Package (0x02) // _DSD: Device-Specific Data
{
ToUUID ("70d24161-6dd5-4c9e-8070-705531292865"),
Package (0x01)
{
Package (0x02)
{
"DmaProperty",
One
}
}
})
...
}
After:
Scope (\_SB.PCI0.CNVW)
{
Name (_PRW, Package (0x02) // _PRW: Power Resources for Wake
{
0x6D,
0x03
})
Name (_DSD, Package (0x02) // _DSD: Device-Specific Data
{
ToUUID ("70d24161-6dd5-4c9e-8070-705531292865"),
Package (0x01)
{
Package (0x02)
{
"DmaProperty",
One
}
}
})
...
}
Signed-off-by: Kapil Porwal <kapilporwal@google.com>
Change-Id: Ia4ffedcb53afe350694eb03a144d12f714190cc4
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70447
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Tarun Tuli <taruntuli@google.com>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/drivers/wifi/generic/generic.c | 4 | ||||
| -rw-r--r-- | src/include/device/pci_ids.h | 6 | ||||
| -rw-r--r-- | src/soc/intel/common/block/cnvi/cnvi.c | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/drivers/wifi/generic/generic.c b/src/drivers/wifi/generic/generic.c index 6d369ce3f7..2368f51e71 100644 --- a/src/drivers/wifi/generic/generic.c +++ b/src/drivers/wifi/generic/generic.c @@ -108,10 +108,6 @@ static const unsigned short intel_pci_device_ids[] = { PCI_DID_CyP_6SERIES_WIFI, /* Typhoon Peak */ PCI_DID_TyP_6SERIES_WIFI, - /* Garfield Peak */ - PCI_DID_GrP_6SERIES_1_WIFI, - PCI_DID_GrP_6SERIES_2_WIFI, - PCI_DID_GrP_6SERIES_3_WIFI, 0 }; diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index f1f77e092b..ffa4698066 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -4431,9 +4431,6 @@ #define PCI_DID_TP_9260_SERIES_WIFI 0x2526 #define PCI_DID_CyP_6SERIES_WIFI 0x2723 #define PCI_DID_TyP_6SERIES_WIFI 0x2725 -#define PCI_DID_GrP_6SERIES_1_WIFI 0x51f0 -#define PCI_DID_GrP_6SERIES_2_WIFI 0x7af0 -#define PCI_DID_GrP_6SERIES_3_WIFI 0x51f1 #define PCI_DID_INTEL_TGL_IPU 0x9a19 #define PCI_DID_INTEL_TGL_H_IPU 0x9a39 @@ -4477,6 +4474,9 @@ #define PCI_DID_INTEL_TGL_H_CNVI_BT_0 0x43f5 #define PCI_DID_INTEL_TGL_H_CNVI_BT_1 0x43f6 #define PCI_DID_INTEL_TGL_H_CNVI_BT_2 0x43f7 +#define PCI_DID_INTEL_ADL_P_CNVI_WIFI_0 0x51f0 +#define PCI_DID_INTEL_ADL_P_CNVI_WIFI_1 0x51f1 +#define PCI_DID_INTEL_ADL_S_CNVI_WIFI_0 0x7af0 #define PCI_DID_INTEL_ADL_N_CNVI_WIFI_0 0x54f0 #define PCI_DID_INTEL_ADL_N_CNVI_WIFI_1 0x54f1 #define PCI_DID_INTEL_ADL_N_CNVI_WIFI_2 0x54f2 diff --git a/src/soc/intel/common/block/cnvi/cnvi.c b/src/soc/intel/common/block/cnvi/cnvi.c index f4fa019702..789d5ae57d 100644 --- a/src/soc/intel/common/block/cnvi/cnvi.c +++ b/src/soc/intel/common/block/cnvi/cnvi.c @@ -43,6 +43,9 @@ static const unsigned short wifi_pci_device_ids[] = { PCI_DID_INTEL_TGL_H_CNVI_WIFI_1, PCI_DID_INTEL_TGL_H_CNVI_WIFI_2, PCI_DID_INTEL_TGL_H_CNVI_WIFI_3, + PCI_DID_INTEL_ADL_P_CNVI_WIFI_0, + PCI_DID_INTEL_ADL_P_CNVI_WIFI_1, + PCI_DID_INTEL_ADL_S_CNVI_WIFI_0, PCI_DID_INTEL_ADL_N_CNVI_WIFI_0, PCI_DID_INTEL_ADL_N_CNVI_WIFI_1, PCI_DID_INTEL_ADL_N_CNVI_WIFI_2, |