Commit 982098a9 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'mvebu-fixes-4.8-2' of git://git.infradead.org/linux-mvebu 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
parents 0a10e85b c721da1d
...@@ -113,7 +113,7 @@ partition@0 { ...@@ -113,7 +113,7 @@ partition@0 {
partition@e0000 { partition@e0000 {
label = "u-boot environment"; label = "u-boot environment";
reg = <0xe0000 0x100000>; reg = <0xe0000 0x20000>;
}; };
partition@100000 { partition@100000 {
......
...@@ -116,6 +116,10 @@ partition@600000 { ...@@ -116,6 +116,10 @@ partition@600000 {
}; };
}; };
&pciec {
status = "okay";
};
&pcie0 { &pcie0 {
status = "okay"; status = "okay";
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment