target/linux/kirkwood/patches-3.10/0012-arm-kirkwood-convert-Iomega-Iconnect-to-use-DT-for-t.patch

   1 From cce41fad080eb7e5f3e3e27bbcc5730d624c5d4b Mon Sep 17 00:00:00 2001
   2 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
   3 Date: Wed, 15 May 2013 15:36:57 +0200
   4 Subject: [PATCH 12/29] arm: kirkwood: convert Iomega Iconnect to use DT for
   5  the PCIe interface
   6
   7 Now that the PCIe mvebu driver is usable on Kirkwood, use it instead
   8 of the legacy PCIe code, since it allows to describe the PCIe
   9 interfaces in the Device Tree.
  10
  11 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  12 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
  13 ---
  14  arch/arm/boot/dts/kirkwood-iconnect.dts | 8 ++++++++
  15  arch/arm/mach-kirkwood/board-iconnect.c | 8 --------
  16  2 files changed, 8 insertions(+), 8 deletions(-)
  17
  18 --- a/arch/arm/boot/dts/kirkwood-iconnect.dts
  19 +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
  20 @@ -109,6 +109,14 @@
  21                                 reg = <0x980000 0x1f400000>;
  22                         };
  23                 };
  24 +
  25 +               pcie-controller {
  26 +                       status = "okay";
  27 +
  28 +                       pcie@1,0 {
  29 +                               status = "okay";
  30 +                       };
  31 +               };
  32         };
  33
  34         gpio-leds {
  35 --- a/arch/arm/mach-kirkwood/board-iconnect.c
  36 +++ b/arch/arm/mach-kirkwood/board-iconnect.c
  37 @@ -22,11 +22,3 @@ void __init iconnect_init(void)
  38  {
  39         kirkwood_ge00_init(&iconnect_ge00_data);
  40  }
  41 -
  42 -static int __init iconnect_pci_init(void)
  43 -{
  44 -       if (of_machine_is_compatible("iom,iconnect"))
  45 -               kirkwood_pcie_init(KW_PCIE0);
  46 -       return 0;
  47 -}
  48 -subsys_initcall(iconnect_pci_init);