PCI: Add Rockchip Vendor ID

[ Upstream commit 20bbb083bbc9d3f8db390f2e35e168f1b23dae8a ]

Move PCI_VENDOR_ID_ROCKCHIP from pci_endpoint_test.c to pci_ids.h and
reuse it in pcie-rockchip-host.c.

Link: https://lore.kernel.org/r/20250218092120.2322784-2-cassel@kernel.org
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Niklas Cassel <cassel@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c
index 3aaaf47fa4ee2008942f3f4c0d063535b7efeed0..b5c8422fd2f04bff875e457a169bf68b24c12f42 100644 (file)
--- a/drivers/misc/pci_endpoint_test.c
+++ b/drivers/misc/pci_endpoint_test.c
@@ -85,7 +85,6 @@
 #define PCI_DEVICE_ID_RENESAS_R8A774E1         0x0025
 #define PCI_DEVICE_ID_RENESAS_R8A779F0         0x0031
 
-#define PCI_VENDOR_ID_ROCKCHIP                 0x1d87
 #define PCI_DEVICE_ID_ROCKCHIP_RK3588          0x3588
 
 static DEFINE_IDA(pci_endpoint_test_ida);

diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c
index cbec711148253a00a0a61edf1d882552d514d3a8..481dcc476c556b77edffd579028f458061bf20a5 100644 (file)
--- a/drivers/pci/controller/pcie-rockchip-host.c
+++ b/drivers/pci/controller/pcie-rockchip-host.c
@@ -367,7 +367,7 @@ static int rockchip_pcie_host_init_port(struct rockchip_pcie *rockchip)
                }
        }
 
-       rockchip_pcie_write(rockchip, ROCKCHIP_VENDOR_ID,
+       rockchip_pcie_write(rockchip, PCI_VENDOR_ID_ROCKCHIP,
                            PCIE_CORE_CONFIG_VENDOR);
        rockchip_pcie_write(rockchip,
                            PCI_CLASS_BRIDGE_PCI_NORMAL << 8,

diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h
index 15ee949f2485e34e8752b85e3432dbef5548203c..688f51d9bde6312cf44dd198b7a8f24971fae354 100644 (file)
--- a/drivers/pci/controller/pcie-rockchip.h
+++ b/drivers/pci/controller/pcie-rockchip.h
@@ -188,7 +188,6 @@
 #define AXI_WRAPPER_NOR_MSG                    0xc
 
 #define PCIE_RC_SEND_PME_OFF                   0x11960
-#define ROCKCHIP_VENDOR_ID                     0x1d87
 #define PCIE_LINK_IS_L2(x) \
        (((x) & PCIE_CLIENT_DEBUG_LTSSM_MASK) == PCIE_CLIENT_DEBUG_LTSSM_L2)
 #define PCIE_LINK_UP(x) \

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index c9dc15355f1bac828ea5f706fc3778f3ea0993e5..c395b3c5c05cfb8c9c636cce3028c7595a1fdc76 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2605,6 +2605,8 @@
 
 #define PCI_VENDOR_ID_ZHAOXIN          0x1d17
 
+#define PCI_VENDOR_ID_ROCKCHIP         0x1d87
+
 #define PCI_VENDOR_ID_HYGON            0x1d94
 
 #define PCI_VENDOR_ID_META             0x1d9b