Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74a46ec6 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

mvebu fixes for 4.5 (part 2)

- Fix the missing mtd flash on linkstation lswtgl
- Use unique machine name for the kirkwood ds112 (for Debian flash-kernel tool)

* tag 'mvebu-fixes-4.5-2' of git://git.infradead.org/linux-mvebu

:
  ARM: dts: orion5x: fix the missing mtd flash on linkstation lswtgl
  ARM: dts: kirkwood: use unique machine name for ds112

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 81f70ba2 44361a2c

arch/arm/boot/dts/kirkwood-ds112.dts

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include "kirkwood-synology.dtsi"



/ {

	model = "Synology DS111";

	model = "Synology DS112";

	compatible = "synology,ds111", "marvell,kirkwood";



	memory {

arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts

+31 −0
Original line number Diff line number Diff line
@@ -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";