target/linux/kirkwood/patches-3.10/0009-pci-mvebu-enable-driver-usage-on-Kirkwood.patch

   1 From 3b93e75d1b66353b8f8ad7d965e17aad68982c55 Mon Sep 17 00:00:00 2001
   2 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
   3 Date: Wed, 27 Mar 2013 18:48:13 +0100
   4 Subject: [PATCH 09/29] pci: mvebu: enable driver usage on Kirkwood
   5
   6 We allow the pci-mvebu driver to be compiled on the Kirkwood platform,
   7 and add the 'marvell,kirkwood-pcie' as a compatible string supported
   8 by the driver.
   9
  10 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  11 Tested-by: Andrew Lunn <andrew@lunn.ch>
  12 ---
  13  Documentation/devicetree/bindings/pci/mvebu-pci.txt | 1 +
  14  drivers/pci/host/Kconfig                            | 2 +-
  15  drivers/pci/host/pci-mvebu.c                        | 1 +
  16  3 files changed, 3 insertions(+), 1 deletion(-)
  17
  18 diff --git a/Documentation/devicetree/bindings/pci/mvebu-pci.txt b/Documentation/devicetree/bindings/pci/mvebu-pci.txt
  19 index eb69d92..f8d4058 100644
  20 --- a/Documentation/devicetree/bindings/pci/mvebu-pci.txt
  21 +++ b/Documentation/devicetree/bindings/pci/mvebu-pci.txt
  22 @@ -4,6 +4,7 @@ Mandatory properties:
  23  - compatible: one of the following values:
  24      marvell,armada-370-pcie
  25      marvell,armada-xp-pcie
  26 +    marvell,kirkwood-pcie
  27  - #address-cells, set to <3>
  28  - #size-cells, set to <2>
  29  - #interrupt-cells, set to <1>
  30 diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
  31 index 6918fbc..1f1d67f 100644
  32 --- a/drivers/pci/host/Kconfig
  33 +++ b/drivers/pci/host/Kconfig
  34 @@ -3,6 +3,6 @@ menu "PCI host controller drivers"
  35
  36  config PCI_MVEBU
  37         bool "Marvell EBU PCIe controller"
  38 -       depends on ARCH_MVEBU
  39 +       depends on ARCH_MVEBU || ARCH_KIRKWOOD
  40
  41  endmenu
  42 diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
  43 index b0ee63b..6fe8b90 100644
  44 --- a/drivers/pci/host/pci-mvebu.c
  45 +++ b/drivers/pci/host/pci-mvebu.c
  46 @@ -853,6 +853,7 @@ static int __init mvebu_pcie_probe(struct platform_device *pdev)
  47  static const struct of_device_id mvebu_pcie_of_match_table[] = {
  48         { .compatible = "marvell,armada-xp-pcie", },
  49         { .compatible = "marvell,armada-370-pcie", },
  50 +       { .compatible = "marvell,kirkwood-pcie", },
  51         {},
  52  };
  53  MODULE_DEVICE_TABLE(of, mvebu_pcie_of_match_table);
  54 --
  55 1.8.4.rc1
  56