Merge branch 'mvebu/fixes' into mvebu/dt (38b16203) · Commits · e / devices / android_kernel_teracube_emerald

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 {

+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";