mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 23:27:06 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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
This commit is contained in:
Arnd Bergmann 2016-09-02 16:02:01 +02:00
commit 982098a9f7
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/kirkwood-ib62x0.dts
View file

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

4
arch/arm/boot/dts/kirkwood-openrd.dtsi
View file

@ -116,6 +116,10 @@ partition@600000 {
};
};
&pciec {
status = "okay";
};
&pcie0 {
status = "okay";
};