Skip to content

Commit 20bbb08

Browse files
shawn1221kwilczynski
authored andcommitted
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/[email protected] Signed-off-by: Shawn Lin <[email protected]> Signed-off-by: Niklas Cassel <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Signed-off-by: Krzysztof Wilczyński <[email protected]>
1 parent f0f3044 commit 20bbb08

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

drivers/misc/pci_endpoint_test.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
#define PCI_DEVICE_ID_RENESAS_R8A774E1 0x0025
8989
#define PCI_DEVICE_ID_RENESAS_R8A779F0 0x0031
9090

91-
#define PCI_VENDOR_ID_ROCKCHIP 0x1d87
9291
#define PCI_DEVICE_ID_ROCKCHIP_RK3588 0x3588
9392

9493
static DEFINE_IDA(pci_endpoint_test_ida);

drivers/pci/controller/pcie-rockchip-host.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ static int rockchip_pcie_host_init_port(struct rockchip_pcie *rockchip)
367367
}
368368
}
369369

370-
rockchip_pcie_write(rockchip, ROCKCHIP_VENDOR_ID,
370+
rockchip_pcie_write(rockchip, PCI_VENDOR_ID_ROCKCHIP,
371371
PCIE_CORE_CONFIG_VENDOR);
372372
rockchip_pcie_write(rockchip,
373373
PCI_CLASS_BRIDGE_PCI_NORMAL << 8,

drivers/pci/controller/pcie-rockchip.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@
200200
#define AXI_WRAPPER_NOR_MSG 0xc
201201

202202
#define PCIE_RC_SEND_PME_OFF 0x11960
203-
#define ROCKCHIP_VENDOR_ID 0x1d87
204203
#define PCIE_LINK_IS_L2(x) \
205204
(((x) & PCIE_CLIENT_DEBUG_LTSSM_MASK) == PCIE_CLIENT_DEBUG_LTSSM_L2)
206205
#define PCIE_LINK_TRAINING_DONE(x) \

include/linux/pci_ids.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2609,6 +2609,8 @@
26092609

26102610
#define PCI_VENDOR_ID_ZHAOXIN 0x1d17
26112611

2612+
#define PCI_VENDOR_ID_ROCKCHIP 0x1d87
2613+
26122614
#define PCI_VENDOR_ID_HYGON 0x1d94
26132615

26142616
#define PCI_VENDOR_ID_META 0x1d9b

0 commit comments

Comments
 (0)