Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed3d27fe authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents e56c60c3 6bd98481

arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts

+8 −0
Original line number Diff line number Diff line
@@ -111,6 +111,14 @@ 
			status = "okay";

			nr-ports = <2>;

		};



		pcie-controller {

			status = "okay";



			pcie@1,0 {

				status = "okay";

			};

		};

	};



	gpio-leds {

arch/arm/mach-kirkwood/board-readynas.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

}