x86: pci: Tidy up the generic x86 PCI driver

This driver should use the x86 PCI configuration functions. Also adjust its
compatible string to something generic (i.e. without a vendor name).

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/cpu/coreboot/pci.c b/arch/x86/cpu/coreboot/pci.c
index 67eb14ce99406dd90c6bb819715a9d94f8f2d4c5..41e29a6086fdfb661ea521002c24f68426b119a2 100644 (file)
--- a/arch/x86/cpu/coreboot/pci.c
+++ b/arch/x86/cpu/coreboot/pci.c
@@ -11,29 +11,7 @@
 
 #include <common.h>
 #include <dm.h>
-#include <errno.h>
 #include <pci.h>
-#include <asm/io.h>
-#include <asm/pci.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-static const struct dm_pci_ops pci_x86_ops = {
-       .read_config    = pci_x86_read_config,
-       .write_config   = pci_x86_write_config,
-};
-
-static const struct udevice_id pci_x86_ids[] = {
-       { .compatible = "pci-x86" },
-       { }
-};
-
-U_BOOT_DRIVER(pci_x86_drv) = {
-       .name           = "pci_x86",
-       .id             = UCLASS_PCI,
-       .of_match       = pci_x86_ids,
-       .ops            = &pci_x86_ops,
-};
 
 static const struct udevice_id generic_pch_ids[] = {
        { .compatible = "intel,pch" },

diff --git a/drivers/pci/pci_x86.c b/drivers/pci/pci_x86.c
index 901bdcacce432a3167406203198681d61fb20f9e..89e8c119b7d554874d738fb052d31f983df0edd5 100644 (file)
--- a/drivers/pci/pci_x86.c
+++ b/drivers/pci/pci_x86.c
@@ -7,18 +7,21 @@
 #include <common.h>
 #include <dm.h>
 #include <pci.h>
+#include <asm/pci.h>
 
-static const struct dm_pci_ops x86_pci_ops = {
+static const struct dm_pci_ops pci_x86_ops = {
+       .read_config    = pci_x86_read_config,
+       .write_config   = pci_x86_write_config,
 };
 
-static const struct udevice_id x86_pci_ids[] = {
-       { .compatible = "x86,pci" },
+static const struct udevice_id pci_x86_ids[] = {
+       { .compatible = "pci-x86" },
        { }
 };
 
 U_BOOT_DRIVER(pci_x86) = {
        .name   = "pci_x86",
        .id     = UCLASS_PCI,
-       .of_match = x86_pci_ids,
-       .ops    = &x86_pci_ops,
+       .of_match = pci_x86_ids,
+       .ops    = &pci_x86_ops,
 };