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

   1 From b7031bd802336c77a6b330f79b275ccbb55fdc96 Mon Sep 17 00:00:00 2001
   2 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
   3 Date: Wed, 10 Apr 2013 21:22:13 +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 ---
  13  arch/arm/boot/dts/kirkwood-iconnect.dts | 8 ++++++++
  14  arch/arm/mach-kirkwood/board-iconnect.c | 8 --------
  15  2 files changed, 8 insertions(+), 8 deletions(-)
  16
  17 diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
  18 index 12ccf74..e591d5d 100644
  19 --- a/arch/arm/boot/dts/kirkwood-iconnect.dts
  20 +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
  21 @@ -109,6 +109,14 @@
  22                                 reg = <0x980000 0x1f400000>;
  23                         };
  24                 };
  25 +
  26 +               pcie-controller {
  27 +                       status = "okay";
  28 +
  29 +                       pcie@1,0 {
  30 +                               status = "okay";
  31 +                       };
  32 +               };
  33         };
  34
  35         gpio-leds {
  36 diff --git a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c
  37 index c8ebde4..98b5ad1 100644
  38 --- a/arch/arm/mach-kirkwood/board-iconnect.c
  39 +++ b/arch/arm/mach-kirkwood/board-iconnect.c
  40 @@ -22,11 +22,3 @@ void __init iconnect_init(void)
  41  {
  42         kirkwood_ge00_init(&iconnect_ge00_data);
  43  }
  44 -
  45 -static int __init iconnect_pci_init(void)
  46 -{
  47 -       if (of_machine_is_compatible("iom,iconnect"))
  48 -               kirkwood_pcie_init(KW_PCIE0);
  49 -       return 0;
  50 -}
  51 -subsys_initcall(iconnect_pci_init);
  52 --
  53 1.8.4.rc1
  54