Merge tag 'pcie-3.11-2' of git://git.infradead.org/users/jcooper/linux into next/soc

PCI-e driver for mvebu.

* tag 'pcie-3.11-2' of git://git.infradead.org/users/jcooper/linux:
  pci: mvebu: fix return value check in mvebu_pcie_probe()
  arm: mvebu: PCIe support is now available on mvebu
  pci: PCIe driver for Marvell Armada 370/XP systems
  clk: mvebu: add more PCIe clocks for Armada XP
  clk: mvebu: create parent-child relation for PCIe clocks on Armada 370
  of/pci: Add of_pci_parse_bus_range() function
  of/pci: Add of_pci_get_devfn() function
  of/pci: Provide support for parsing PCI DT ranges property

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 12 insertions, 6 deletions

diff --git a/drivers/clk/mvebu/clk-gating-ctrl.c b/drivers/clk/mvebu/clk-gating-ctrl.c
index ebf141d4374b..2f037235bdbd 100644
--- a/drivers/clk/mvebu/clk-gating-ctrl.c
+++ b/drivers/clk/mvebu/clk-gating-ctrl.c
@@ -119,8 +119,8 @@ static const struct mvebu_soc_descr __initconst armada_370_gating_descr[] = {
         { "pex1_en", NULL,  2 },
         { "ge1", NULL, 3 },
         { "ge0", NULL, 4 },
-        { "pex0", NULL, 5 },
-        { "pex1", NULL, 9 },
+        { "pex0", "pex0_en", 5 },
+        { "pex1", "pex1_en", 9 },
         { "sata0", NULL, 15 },
         { "sdio", NULL, 17 },
         { "tdm", NULL, 25 },
@@ -137,10 +137,14 @@ static const struct mvebu_soc_descr __initconst armada_xp_gating_descr[] = {
         { "ge2", NULL,  2 },
         { "ge1", NULL, 3 },
         { "ge0", NULL, 4 },
-        { "pex0", NULL, 5 },
-        { "pex1", NULL, 6 },
-        { "pex2", NULL, 7 },
-        { "pex3", NULL, 8 },
+        { "pex00", NULL, 5 },
+        { "pex01", NULL, 6 },
+        { "pex02", NULL, 7 },
+        { "pex03", NULL, 8 },
+        { "pex10", NULL, 9 },
+        { "pex11", NULL, 10 },
+        { "pex12", NULL, 11 },
+        { "pex13", NULL, 12 },
         { "bp", NULL, 13 },
         { "sata0lnk", NULL, 14 },
         { "sata0", "sata0lnk", 15 },
@@ -152,6 +156,8 @@ static const struct mvebu_soc_descr __initconst armada_xp_gating_descr[] = {
         { "xor0", NULL, 22 },
         { "crypto", NULL, 23 },
         { "tdm", NULL, 25 },
+        { "pex20", NULL, 26 },
+        { "pex30", NULL, 27 },
         { "xor1", NULL, 28 },
         { "sata1lnk", NULL, 29 },
         { "sata1", "sata1lnk", 30 },