| From | Greg Kroah-Hartman <> | Subject | [PATCH 4.4 042/312] ARM: dts: kirkwood: use unique machine name for ds112 | Date | Fri, 8 May 2020 14:30:33 +0200 |
| |
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
commit 9d021c9d1b4b774a35d8a03d58dbf029544debda upstream.
Downstream packages like Debian flash-kernel use /proc/device-tree/model to determine which dtb file to install.
Hence each dts in the Linux kernel should provide a unique model identifier.
Commit 2d0a7addbd10 ("ARM: Kirkwood: Add support for many Synology NAS devices") created the new files kirkwood-ds111.dts and kirkwood-ds112.dts using the same model identifier.
This patch provides a unique model identifier for the Synology DiskStation DS112.
Fixes: 2d0a7addbd10 ("ARM: Kirkwood: Add support for many Synology NAS devices") Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- arch/arm/boot/dts/kirkwood-ds112.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- 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 {
|