diff options
Diffstat (limited to 'target/linux/kirkwood/patches-3.10/0009-pci-mvebu-enable-driver-usage-on-Kirkwood.patch')
| -rw-r--r-- | target/linux/kirkwood/patches-3.10/0009-pci-mvebu-enable-driver-usage-on-Kirkwood.patch | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/target/linux/kirkwood/patches-3.10/0009-pci-mvebu-enable-driver-usage-on-Kirkwood.patch b/target/linux/kirkwood/patches-3.10/0009-pci-mvebu-enable-driver-usage-on-Kirkwood.patch index c1f4b1ccbd..4539519393 100644 --- a/target/linux/kirkwood/patches-3.10/0009-pci-mvebu-enable-driver-usage-on-Kirkwood.patch +++ b/target/linux/kirkwood/patches-3.10/0009-pci-mvebu-enable-driver-usage-on-Kirkwood.patch @@ -1,6 +1,6 @@ -From 3b93e75d1b66353b8f8ad7d965e17aad68982c55 Mon Sep 17 00:00:00 2001 +From 79ae3cf2d6c01b4394ea462f1c49a2e9fbcf0521 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Date: Wed, 27 Mar 2013 18:48:13 +0100 +Date: Wed, 15 May 2013 15:36:54 +0200 Subject: [PATCH 09/29] pci: mvebu: enable driver usage on Kirkwood We allow the pci-mvebu driver to be compiled on the Kirkwood platform, @@ -9,14 +9,13 @@ by the driver. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Andrew Lunn <andrew@lunn.ch> +Signed-off-by: Jason Cooper <jason@lakedaemon.net> --- Documentation/devicetree/bindings/pci/mvebu-pci.txt | 1 + drivers/pci/host/Kconfig | 2 +- drivers/pci/host/pci-mvebu.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) -diff --git a/Documentation/devicetree/bindings/pci/mvebu-pci.txt b/Documentation/devicetree/bindings/pci/mvebu-pci.txt -index eb69d92..f8d4058 100644 --- a/Documentation/devicetree/bindings/pci/mvebu-pci.txt +++ b/Documentation/devicetree/bindings/pci/mvebu-pci.txt @@ -4,6 +4,7 @@ Mandatory properties: @@ -27,8 +26,6 @@ index eb69d92..f8d4058 100644 - #address-cells, set to <3> - #size-cells, set to <2> - #interrupt-cells, set to <1> -diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig -index 6918fbc..1f1d67f 100644 --- a/drivers/pci/host/Kconfig +++ b/drivers/pci/host/Kconfig @@ -3,6 +3,6 @@ menu "PCI host controller drivers" @@ -39,11 +36,9 @@ index 6918fbc..1f1d67f 100644 + depends on ARCH_MVEBU || ARCH_KIRKWOOD endmenu -diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c -index b0ee63b..6fe8b90 100644 --- a/drivers/pci/host/pci-mvebu.c +++ b/drivers/pci/host/pci-mvebu.c -@@ -853,6 +853,7 @@ static int __init mvebu_pcie_probe(struct platform_device *pdev) +@@ -854,6 +854,7 @@ static int __init mvebu_pcie_probe(struc static const struct of_device_id mvebu_pcie_of_match_table[] = { { .compatible = "marvell,armada-xp-pcie", }, { .compatible = "marvell,armada-370-pcie", }, @@ -51,6 +46,3 @@ index b0ee63b..6fe8b90 100644 {}, }; MODULE_DEVICE_TABLE(of, mvebu_pcie_of_match_table); --- -1.8.4.rc1 - |