kirkwood: update patches and configuration (3.10)
[openwrt/svn-archive/archive.git] / target / linux / kirkwood / patches-3.10 / 0009-pci-mvebu-enable-driver-usage-on-Kirkwood.patch
1 From 79ae3cf2d6c01b4394ea462f1c49a2e9fbcf0521 Mon Sep 17 00:00:00 2001
2 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
3 Date: Wed, 15 May 2013 15:36:54 +0200
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 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
13 ---
14 Documentation/devicetree/bindings/pci/mvebu-pci.txt | 1 +
15 drivers/pci/host/Kconfig | 2 +-
16 drivers/pci/host/pci-mvebu.c | 1 +
17 3 files changed, 3 insertions(+), 1 deletion(-)
18
19 --- a/Documentation/devicetree/bindings/pci/mvebu-pci.txt
20 +++ b/Documentation/devicetree/bindings/pci/mvebu-pci.txt
21 @@ -4,6 +4,7 @@ Mandatory properties:
22 - compatible: one of the following values:
23 marvell,armada-370-pcie
24 marvell,armada-xp-pcie
25 + marvell,kirkwood-pcie
26 - #address-cells, set to <3>
27 - #size-cells, set to <2>
28 - #interrupt-cells, set to <1>
29 --- a/drivers/pci/host/Kconfig
30 +++ b/drivers/pci/host/Kconfig
31 @@ -3,6 +3,6 @@ menu "PCI host controller drivers"
32
33 config PCI_MVEBU
34 bool "Marvell EBU PCIe controller"
35 - depends on ARCH_MVEBU
36 + depends on ARCH_MVEBU || ARCH_KIRKWOOD
37
38 endmenu
39 --- a/drivers/pci/host/pci-mvebu.c
40 +++ b/drivers/pci/host/pci-mvebu.c
41 @@ -854,6 +854,7 @@ static int __init mvebu_pcie_probe(struc
42 static const struct of_device_id mvebu_pcie_of_match_table[] = {
43 { .compatible = "marvell,armada-xp-pcie", },
44 { .compatible = "marvell,armada-370-pcie", },
45 + { .compatible = "marvell,kirkwood-pcie", },
46 {},
47 };
48 MODULE_DEVICE_TABLE(of, mvebu_pcie_of_match_table);