diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-11 12:37:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-11 12:37:35 -0800 |
| commit | bbb1955514877182e8d20a5f62c7f8c9fd330ec7 (patch) | |
| tree | 6c68d44122e8966ba5cd246e9379bc6998277648 /drivers | |
| parent | 738b52bb9845da183b6ff46a8f685b56a63379d1 (diff) | |
| parent | 860a445c25aa2f99aa5881603a1f4ed2cec64025 (diff) | |
Merge tag 'dt-fixes-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree fixes from Rob Herring:
- Fix compile error drivers/spi/spi-rspi.c with !CONFIG_OF
- Fix warnings for unused/uninitialized variables with !CONFIG_OF
- Fix PCIe bus matching for powerpc
- Add documentation for various vendor strings
* tag 'dt-fixes-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
DT: Add vendor prefix for Spansion Inc.
of/device: Nullify match table in of_match_device() for CONFIG_OF=n
dt-bindings: add vendor-prefix for neonode
of: fix PCI bus match for PCIe slots
of: restructure for_each macros to fix compile warnings
of: add vendor prefix for Honeywell
of: Update qcom vendor prefix description
of: add vendor prefix for Allwinner Technology
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/address.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index d3dd41c840f..1a54f1ffaad 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -99,11 +99,12 @@ static unsigned int of_bus_default_get_flags(const __be32 *addr) static int of_bus_pci_match(struct device_node *np) { /* + * "pciex" is PCI Express * "vci" is for the /chaos bridge on 1st-gen PCI powermacs * "ht" is hypertransport */ - return !strcmp(np->type, "pci") || !strcmp(np->type, "vci") || - !strcmp(np->type, "ht"); + return !strcmp(np->type, "pci") || !strcmp(np->type, "pciex") || + !strcmp(np->type, "vci") || !strcmp(np->type, "ht"); } static void of_bus_pci_count_cells(struct device_node *np, |