diff options
| author |   Gregory CLEMENT <gregory.clement@free-electrons.com> | 2016-02-09 11:18:11 +0100 |
|---|---|---|
| committer | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2016-02-09 11:18:11 +0100 |
| commit | 38b162032fa4bad33a0688c79177a06a133d86f9 (patch) | |
| tree | 1a41d64e56c9a2c5279c8db16e921ee2e31de1b7 | |
| parent | ARM: dts: kirkwood: add device tree for buffalo linkstation ls-qvl (diff) | |
| parent | ARM: dts: orion5x: fix the missing mtd flash on linkstation lswtgl (diff) | |
| download | linux-dev-38b162032fa4bad33a0688c79177a06a133d86f9.tar.xz linux-dev-38b162032fa4bad33a0688c79177a06a133d86f9.zip | |
Merge branch 'mvebu/fixes' into mvebu/dt
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-ds112.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 31 |
2 files changed, 32 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-ds112.dts b/arch/arm/boot/dts/kirkwood-ds112.dts index bf4143c6cb8f..b84af3da8c84 100644 --- a/arch/arm/boot/dts/kirkwood-ds112.dts +++ b/arch/arm/boot/dts/kirkwood-ds112.dts @@ -14,7 +14,7 @@ #include "kirkwood-synology.dtsi" / { - model = "Synology DS111"; + model = "Synology DS112"; compatible = "synology,ds111", "marvell,kirkwood"; memory { diff --git a/arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts b/arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts index 420788229e6f..aae8a7aceab7 100644 --- a/arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts +++ b/arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts @@ -228,6 +228,37 @@ }; }; +&devbus_bootcs { + status = "okay"; + devbus,keep-config; + + flash@0 { + compatible = "jedec-flash"; + reg = <0 0x40000>; + bank-width = <1>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + header@0 { + reg = <0 0x30000>; + read-only; + }; + + uboot@30000 { + reg = <0x30000 0xF000>; + read-only; + }; + + uboot_env@3F000 { + reg = <0x3F000 0x1000>; + }; + }; + }; +}; + &mdio { status = "okay"; |