PCI: Add Rockchip Vendor ID

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>

diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c
index d5ac71a4938659c4a5537f1c30bf18c668617088..b002740acf8d51cbec715dc4eaf1ece842422561 100644 (file)
--- a/drivers/misc/pci_endpoint_test.c
+++ b/drivers/misc/pci_endpoint_test.c
@@ -88,7 +88,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 5adac6adc046f8dcd9ec75e36f5e0cfc530c383a..6a46be17aa91b1d0b8ee95cb67b95d2dd03f37d8 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 11def598534b2f764f290032d8e3abd72d8d4e72..14954f43e5e9af229168a5c5f1c636c6495971c6 100644 (file)
--- a/drivers/pci/controller/pcie-rockchip.h
+++ b/drivers/pci/controller/pcie-rockchip.h
@@ -200,7 +200,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_TRAINING_DONE(x) \

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index de5deb1a0118fcf56570d461cbe7a501d4bd0da3..e1a270e7e0c5e79e62acfb5e7a2a04b5483071f2 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2609,6 +2609,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