Merge tag 'mvebu-fixes-4.8-2' of git://git.infradead.org/linux-mvebu into fixes (982098a9) · Commits · e / devices / android_kernel_teracube_2e

Merge "mvebu fixes for 4.8 (part 1)" from Gregory CLEMENT: Few device tree fix on kirkwood: - enable PCIe on OpenRD - use correct u-boot environment partition size on ib62x0 * tag 'mvebu-fixes-4.8-2' of git://git.infradead.org/linux-mvebu: ARM: dts: kirkwood: Fix PCIe label on OpenRD ARM: kirkwood: ib62x0: fix size of u-boot environment partition

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -113,7 +113,7 @@

	partition@e0000 {		partition@e0000 {
	label = "u-boot environment";		label = "u-boot environment";
	reg = <0xe0000 0x100000>;		reg = <0xe0000 0x20000>;
	};		};

	partition@100000 {		partition@100000 {

arch/arm/boot/dts/kirkwood-openrd.dtsi

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -116,6 +116,10 @@
	};		};
	};		};

			&pciec {
			status = "okay";
			};

	&pcie0 {		&pcie0 {
	status = "okay";		status = "okay";
	};		};