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

Commit e5e49fe9 authored May 10, 2014 by Olof Johansson

Merge tag 'mvebu-dt-fixes-3.15-2' of git://git.infradead.org/linux-mvebu into fixes

Merge 'ARM: mvebu: DT fixes for v3.15 (incr #2)' from Jason Cooper:

mvebu DT fixes for v3.15 (incremental #2)

 - kirkwood: fix mis-located pcie controller nodes

* tag 'mvebu-dt-fixes-3.15-2' of git://git.infradead.org/linux-mvebu

:
  ARM: dts: kirkwood: fix mislocated pcie-controller nodes

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 90f4c594 788296b2

arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts

+10 −8

Original line number	Diff line number	Diff line
		@@ -30,6 +30,16 @@
		bootargs = "console=ttyS0,115200n8 earlyprintk";
		};

		mbus {
		pcie-controller {
		status = "okay";

		pcie@1,0 {
		status = "okay";
		};
		};
		};

		ocp@f1000000 {
		pinctrl@10000 {
		pmx_usb_led: pmx-usb-led {
		@@ -73,14 +83,6 @@
		ehci@50000 {
		status = "okay";
		};

		pcie-controller {
		status = "okay";

		pcie@1,0 {
		status = "okay";
		};
		};
		};

		gpio-leds {

arch/arm/boot/dts/kirkwood-nsa310-common.dtsi

+10 −8

Original line number	Diff line number	Diff line
		@@ -4,6 +4,16 @@
		/ {
		model = "ZyXEL NSA310";

		mbus {
		pcie-controller {
		status = "okay";

		pcie@1,0 {
		status = "okay";
		};
		};
		};

		ocp@f1000000 {
		pinctrl: pinctrl@10000 {

		@@ -26,14 +36,6 @@
		status = "okay";
		nr-ports = <2>;
		};

		pcie-controller {
		status = "okay";

		pcie@1,0 {
		status = "okay";
		};
		};
		};

		gpio_poweroff {