kirkwood: update patches and configuration (3.10)
[openwrt.git] / target / linux / kirkwood / patches-3.10 / 0015-arm-kirkwood-convert-QNAP-TS219-to-use-DT-for-the-PC.patch
1 From c184303509ea2ee9d519db5dbfb2063efca098f7 Mon Sep 17 00:00:00 2001
2 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
3 Date: Wed, 15 May 2013 15:37:00 +0200
4 Subject: [PATCH 15/29] arm: kirkwood: convert QNAP TS219 to use DT for the
5  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: Andrew Lunn <andrew@lunn.ch>
13 Signed-off-by: Jason Cooper <jason@lakedaemon.net>
14 ---
15  arch/arm/boot/dts/kirkwood-ts219-6281.dts | 3 ++-
16  arch/arm/boot/dts/kirkwood-ts219-6282.dts | 3 ++-
17  arch/arm/boot/dts/kirkwood-ts219.dtsi     | 9 +++++++--
18  3 files changed, 11 insertions(+), 4 deletions(-)
19
20 --- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts
21 +++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
22 @@ -1,7 +1,8 @@
23  /dts-v1/;
24  
25 -/include/ "kirkwood-ts219.dtsi"
26 +/include/ "kirkwood.dtsi"
27  /include/ "kirkwood-6281.dtsi"
28 +/include/ "kirkwood-ts219.dtsi"
29  
30  / {
31         ocp@f1000000 {
32 --- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts
33 +++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
34 @@ -1,7 +1,8 @@
35  /dts-v1/;
36  
37 -/include/ "kirkwood-ts219.dtsi"
38 +/include/ "kirkwood.dtsi"
39  /include/ "kirkwood-6282.dtsi"
40 +/include/ "kirkwood-ts219.dtsi"
41  
42  / {
43         ocp@f1000000 {
44 --- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
45 +++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
46 @@ -1,5 +1,3 @@
47 -/include/ "kirkwood.dtsi"
48 -
49  / {
50         model = "QNAP TS219 family";
51         compatible = "qnap,ts219", "marvell,kirkwood";
52 @@ -74,5 +72,12 @@
53                         status = "okay";
54                         nr-ports = <2>;
55                 };
56 +               pcie-controller {
57 +                       status = "okay";
58 +
59 +                       pcie@1,0 {
60 +                               status = "okay";
61 +                       };
62 +               };
63         };
64  };