diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-02 16:02:01 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-02 16:09:44 +0200 |
| commit | 982098a9f7e2391e735e639a6816715da8dda3b9 (patch) | |
| tree | 812a6b4eab8bb4459a0eda6f5ee6e3272c909f08 /arch | |
| parent | 0a10e85b6c546c2f34ee257b955f33dbb4ece746 (diff) | |
| parent | c721da1d05760ad0b4e7670896dae31b6b07d8d6 (diff) | |
| download | linux-982098a9f7e2391e735e639a6816715da8dda3b9.tar.gz linux-982098a9f7e2391e735e639a6816715da8dda3b9.tar.bz2 linux-982098a9f7e2391e735e639a6816715da8dda3b9.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-ib62x0.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-openrd.dtsi | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts index ef84d8699a76..5bf62897014c 100644 --- a/arch/arm/boot/dts/kirkwood-ib62x0.dts +++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts @@ -113,7 +113,7 @@ partition@e0000 { label = "u-boot environment"; - reg = <0xe0000 0x100000>; + reg = <0xe0000 0x20000>; }; partition@100000 { diff --git a/arch/arm/boot/dts/kirkwood-openrd.dtsi b/arch/arm/boot/dts/kirkwood-openrd.dtsi index e4ecab112601..7175511a92da 100644 --- a/arch/arm/boot/dts/kirkwood-openrd.dtsi +++ b/arch/arm/boot/dts/kirkwood-openrd.dtsi @@ -116,6 +116,10 @@ }; }; +&pciec { + status = "okay"; +}; + &pcie0 { status = "okay"; }; |