From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm: kirkwood: convert QNAP TS219 to use DT for the PCIe interface
Date: Sat, 13 Apr 2013 13:03:56 +0200 [thread overview]
Message-ID: <1365851036-27363-1-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1365632436-25367-9-git-send-email-thomas.petazzoni@free-electrons.com>
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Now that the PCIe mvebu driver is usable on Kirkwood, use it instead
of the legacy PCIe code, since it allows to describe the PCIe
interfaces in the Device Tree.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/boot/dts/kirkwood-ts219-6281.dts | 3 ++-
arch/arm/boot/dts/kirkwood-ts219-6282.dts | 3 ++-
arch/arm/boot/dts/kirkwood-ts219.dtsi | 9 +++++++--
arch/arm/mach-kirkwood/board-ts219.c | 10 ----------
4 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
index 8295c83..42648ab 100644
--- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts
+++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
@@ -1,7 +1,8 @@
/dts-v1/;
-/include/ "kirkwood-ts219.dtsi"
+/include/ "kirkwood.dtsi"
/include/ "kirkwood-6281.dtsi"
+/include/ "kirkwood-ts219.dtsi"
/ {
ocp at f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
index df3f95d..95ceeb9 100644
--- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts
+++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
@@ -1,7 +1,8 @@
/dts-v1/;
-/include/ "kirkwood-ts219.dtsi"
+/include/ "kirkwood.dtsi"
/include/ "kirkwood-6282.dtsi"
+/include/ "kirkwood-ts219.dtsi"
/ {
ocp at f1000000 {
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 64ea27c..7c022fd 100644
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -1,5 +1,3 @@
-/include/ "kirkwood.dtsi"
-
/ {
model = "QNAP TS219 family";
compatible = "qnap,ts219", "marvell,kirkwood";
@@ -74,5 +72,12 @@
status = "okay";
nr-ports = <2>;
};
+ pcie-controller {
+ status = "okay";
+
+ pcie at 1,0 {
+ status = "okay";
+ };
+ };
};
};
diff --git a/arch/arm/mach-kirkwood/board-ts219.c b/arch/arm/mach-kirkwood/board-ts219.c
index acb0187..4695d5f 100644
--- a/arch/arm/mach-kirkwood/board-ts219.c
+++ b/arch/arm/mach-kirkwood/board-ts219.c
@@ -41,13 +41,3 @@ void __init qnap_dt_ts219_init(void)
pm_power_off = qnap_tsx1x_power_off;
}
-
-/* FIXME: Will not work with DT. Maybe use MPP40_GPIO? */
-static int __init ts219_pci_init(void)
-{
- if (machine_is_ts219())
- kirkwood_pcie_init(KW_PCIE0);
-
- return 0;
-}
-subsys_initcall(ts219_pci_init);
--
1.7.10.4
next prev parent reply other threads:[~2013-04-13 11:03 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-10 22:20 [PATCHv2 00/10] Use the mvebu PCIe driver on Kirkwood Thomas Petazzoni
2013-04-10 22:20 ` [PATCHv2 01/10] pci: mvebu: enable driver usage " Thomas Petazzoni
2013-04-10 22:20 ` [PATCHv2 02/10] bus: mvebu: fix mistake in PCIe window target attribute for Kirkwood Thomas Petazzoni
2013-04-11 17:14 ` Jason Cooper
2013-04-10 22:20 ` [PATCHv2 03/10] arm: kirkwood: move PCIe window init to legacy driver Thomas Petazzoni
2013-04-10 22:20 ` [PATCHv2 04/10] arm: kirkwood: add SoC-level Device Tree data for PCIe interfaces Thomas Petazzoni
2013-04-13 10:30 ` Andrew Lunn
2013-04-13 14:04 ` Thomas Petazzoni
2013-04-13 19:04 ` Jason Cooper
2013-04-10 22:20 ` [PATCHv2 05/10] arm: kirkwood: convert Iomega Iconnect to use DT for the PCIe interface Thomas Petazzoni
2013-04-10 22:20 ` [PATCHv2 06/10] arm: kirkwood: convert MPL CEC4 " Thomas Petazzoni
2013-04-10 22:20 ` [PATCHv2 07/10] arm: kirkwood: convert ZyXEL NSA310 " Thomas Petazzoni
2013-04-10 22:20 ` [PATCHv2 08/10] arm: kirkwood: convert QNAP TS219 " Thomas Petazzoni
2013-04-11 0:33 ` Jason Cooper
2013-04-11 5:24 ` Andrew Lunn
2013-04-11 16:51 ` Jason Gunthorpe
2013-04-13 9:26 ` Andrew Lunn
2013-04-13 10:40 ` Thomas Petazzoni
2013-04-11 19:45 ` Andrew Lunn
2013-04-11 19:33 ` Andrew Lunn
2013-04-13 10:36 ` Andrew Lunn
2013-04-13 11:03 ` Andrew Lunn [this message]
2013-04-10 22:20 ` [PATCHv2 09/10] arm: kirkwood: convert db-88f6281 to the Device Tree Thomas Petazzoni
2013-04-10 22:20 ` [PATCHv2 10/10] arm: kirkwood: update defconfig with PCIe driver and board updates Thomas Petazzoni
2013-04-13 13:14 ` [PATCHv2 00/10] Use the mvebu PCIe driver on Kirkwood Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1365851036-27363-1-git-send-email-andrew@lunn.ch \
--to=andrew@lunn.ch \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).