diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-10 21:50:49 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-10 22:00:59 -0700 |
| commit | ed3d27feccacf38299c244e9c0912e884a752b1d (patch) | |
| tree | 70242a927d8e60f43b33a000a2cd759a6eddffdc | |
| parent | e56c60c374bbcd343ed286c713116056bf3d6d36 (diff) | |
| parent | 6bd98481ab346964344e05a041f35ff83cb3d00c (diff) | |
| download | op-kernel-dev-ed3d27feccacf38299c244e9c0912e884a752b1d.zip op-kernel-dev-ed3d27feccacf38299c244e9c0912e884a752b1d.tar.gz | |
Merge tag 'pcie_kw-3.11-2' of git://git.infradead.org/users/jcooper/linux into next/soc
From Jason Cooper:
mvebu pcie driver (kirkwood) for v3.11 (round 2)
- kirkwood
- migrate Netgear ReadyNAS Duo v2 to pcie DT init
* tag 'pcie_kw-3.11-2' of git://git.infradead.org/users/jcooper/linux:
arm: kirkwood: NETGEAR ReadyNAS Duo v2 init PCIe via DT
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 8 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/board-readynas.c | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts index 1ca66ab..0f852b4 100644 --- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts +++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts @@ -111,6 +111,14 @@ status = "okay"; nr-ports = <2>; }; + + pcie-controller { + status = "okay"; + + pcie@1,0 { + status = "okay"; + }; + }; }; gpio-leds { diff --git a/arch/arm/mach-kirkwood/board-readynas.c b/arch/arm/mach-kirkwood/board-readynas.c index fb42c20..341b82d 100644 --- a/arch/arm/mach-kirkwood/board-readynas.c +++ b/arch/arm/mach-kirkwood/board-readynas.c @@ -24,5 +24,4 @@ static struct mv643xx_eth_platform_data netgear_readynas_ge00_data = { void __init netgear_readynas_init(void) { kirkwood_ge00_init(&netgear_readynas_ge00_data); - kirkwood_pcie_init(KW_PCIE0); } |
