github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 23:22:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

mvebu pcie driver (kirkwood) for v3.11 (round 2)

Browse Source 
- kirkwood
     - migrate Netgear ReadyNAS Duo v2 to pcie DT init
 
 depends
  - mvebu/pcie
     - mvebu/of_pci
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQEcBAABAgAGBQJRrfATAAoJEAi3KVZQDZAea8MH/iwWWy+9EWQFzMjDD3ZvccBr
 FuNW8j5+nI3u421VNpjpTXCXlLzGZp47RvwVRX6PO84MWKF4ALcb5JhKkrBvzdt9
 76shBRPciLCT5cXibPKh8Dj7ffe/9hG+KVJkQhubEaJ2b2NUPx/o10eSI4WTvq0K
 094M2STqvQs+pgPzpg9K163sJvhxiWJiY5lF+suYEccN6sa3+p6E0QC2lmDN46VI
 hJi3YmKVcYLRrx3M2l0OadZOjI78Z5H42STbpVtrSOYI/Nn2jEkKhVv86OgwTa9A
 ZHl12mA5h1Gan87oVPS1eHVVhByFEfpHs2Ea/ekOmdMEVLQar2Suf3PeFcl97rM=
 =91cW
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2013-06-10 21:50:49 -07:00
commit ed3d27fecc
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
View File

@ -111,6 +111,14 @@ sata@80000 {
status = "okay";
nr-ports = <2>;
};
pcie-controller {
status = "okay";
pcie@1,0 {
status = "okay";
};
};
};
gpio-leds {

1
arch/arm/mach-kirkwood/board-readynas.c
View File

@ -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);
}