Skip to content

Commit

Permalink
Merge tag 'mvebu-fixes-4.8-2' of git://git.infradead.org/linux-mvebu …
Browse files Browse the repository at this point in the history
…into fixes

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
  • Loading branch information
arndb committed Sep 2, 2016
2 parents 0a10e85 + c721da1 commit 982098a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/kirkwood-ib62x0.dts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@

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

partition@100000 {
Expand Down
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/kirkwood-openrd.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@
};
};

&pciec {
status = "okay";
};

&pcie0 {
status = "okay";
};

0 comments on commit 982098a

Please sign in to comment.