of: fix PCI bus match for PCIe slots
authorKleber Sacilotto de Souza <klebers@linux.vnet.ibm.com>
Mon, 3 Feb 2014 15:31:03 +0000 (13:31 -0200)
committerRob Herring <robh@kernel.org>
Wed, 5 Feb 2014 15:59:20 +0000 (09:59 -0600)
On IBM pseries systems the device_type device-tree property of a PCIe
bridge contains the string "pciex". The of_bus_pci_match() function was
looking only for "pci" on this property, so in such cases the bus
matching code was falling back to the default bus, causing problems on
functions that should be using "assigned-addresses" for region address
translation. This patch fixes the problem by also looking for "pciex" on
the PCI bus match function.

v2: added comment

Signed-off-by: Kleber Sacilotto de Souza <klebers@linux.vnet.ibm.com>
Acked-by: Grant Likely <grant.likely@linaro.org>
Cc: stable@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
drivers/of/address.c

Simple merge