From 843699e3cf480de9f4d116c5cf0eb8d832103caa Mon Sep 17 00:00:00 2001
From: Kapil Porwal <kapilporwal@google.com>
Date: Wed, 7 Dec 2022 16:09:32 +0530
Subject: 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>
---
 src/include/device/pci_ids.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/include')

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
-- 
cgit v1.2.3