On 5 July 2015 at 21:20, Bin Meng <[email protected]> wrote: > On Sat, Jul 4, 2015 at 8:28 AM, Simon Glass <[email protected]> wrote: >> 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 <[email protected]> >> --- >> >> Changes in v3: >> - Drop the asm/pci.h header file also >> >> Changes in v2: >> - Rename the ops and ids arrays for consistency >> - Drop the coreboot PCI driver which is no-longer needed >> >> arch/x86/cpu/coreboot/pci.c | 22 ---------------------- >> drivers/pci/pci_x86.c | 13 ++++++++----- >> 2 files changed, 8 insertions(+), 27 deletions(-) >> >> diff --git a/arch/x86/cpu/coreboot/pci.c b/arch/x86/cpu/coreboot/pci.c >> index 67eb14c..41e29a6 100644 >> --- 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 901bdca..89e8c11 100644 >> --- 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, >> }; >> -- > > Reviewed-by: Bin Meng <[email protected]>
Applied to u-boot-x86. _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
