From patchwork Sun Feb 7 18:34:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 8244951 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4B7BCBEEE5 for ; Sun, 7 Feb 2016 18:38:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6AAE8201D3 for ; Sun, 7 Feb 2016 18:38:32 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7CD88201BC for ; Sun, 7 Feb 2016 18:38:31 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aSUBb-0005u1-Ps; Sun, 07 Feb 2016 18:35:51 +0000 Received: from mout.gmx.net ([212.227.17.22]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aSUBL-0005pe-T6 for linux-arm-kernel@lists.infradead.org; Sun, 07 Feb 2016 18:35:37 +0000 Received: from workstation4.fritz.box ([37.24.8.189]) by mail.gmx.com (mrgmx103) with ESMTPSA (Nemesis) id 0LjquD-1Zv4IN2uVt-00bprF; Sun, 07 Feb 2016 19:34:42 +0100 From: Heinrich Schuchardt To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth Subject: [PATCH 1/1] ARM: kirkwood-ds112.dts: use unique machine name Date: Sun, 7 Feb 2016 19:34:26 +0100 Message-Id: <1454870066-3353-1-git-send-email-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.1.4 X-Provags-ID: V03:K0:Tvop6Zyg30ho1DSP2Y4Fj2yoRCs0Ss3c9ikei8i6XiJsI6A9RXq qWiw9j4Dz0jb3K49H+uyfRbIs29NaoZjeTj9bXMxzTXQoYnZUI3Qq1gr+421tERXVzWpOWz XDHjJRC7psyWAru630dtnJfTcjp9Hsp0TP0beNzwKT03pPcnv+0y1FHXDcOr9mXvKouWBPc vWO00DURi0RNLUsDFvhxA== X-UI-Out-Filterresults: notjunk:1; V01:K0:yLmkm0jxRSU=:rUKc6iGYyDg/T0P0enr2fV hPQQbawbL6rz7cEnw+89FpvsopcbWDQVrgoQ9jjdYU0B874H7mzccxhe6oYVd8TDtzitnP6jb SBpXU1x9XbxjnKdn9sNPuqtkQl9RBWMRwegzzMdHxCnT0eyFYHZPOr6QdCC+eczt4DUbpKZWV yZ4Zsynojjuhs64sri0JGXaZBmzdHZnLcZU60X1d6ztTLqMbSIx8yarj2Spqfqyt2+QgP6bbx nCYA8ghfpeXKQCDDRl088oU35oIsnmbpaQcMrdHCTKJ7/GAtNmCXbBXK723rFu8ory61lOI3A a/qkSmtAFBeTb0uTpI0/MjKWUki5B50Ckol8X57irYciFUByZMrRq3xJJkAUmqQFS3Y+7Oaaq UNA5uVFuePeHPV33nCDR6YCsjBvUC0oV3soh+6cVmChqX9uq1fXu9PnNn/SKKDhqi7DowUz2O Ug+SqQvhT6UeYtFmvT3EH/5DgC+uFMC/6BVIkWbNccWG7MuxvlADi/+Xr+yyBwS5ROqJC5fMj eki4RSqZ/pvMXGsEeUNUnGo4yxnxrkyPA2IQEBgAAqTvOJlGZGiZDBWsKTEnk5Jpp82j27G2F aVkP8PDFEFXOhhjc8rrQ+M3e1ZFlzSmvVuF3P7GiVCwwZU0lus6Kv9AATRrmVXMX1rH0PldK6 TKz7AIL8FBFKUSsUKnUKsMF05XnP7vhr/8kjIv6XeJbqs/J7ok0baUyV9t59EXEYnfXtfqny1 dxV53O196pf1QcPvrT6BRAH+rWrD4HR1L7PYxT2aT53cvFiad+oePiNyH8k= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160207_103536_516962_15FB663C X-CRM114-Status: GOOD ( 11.69 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Ben Peddell , Pawel Moll , Ian Campbell , Heinrich Schuchardt , linux-kernel@vger.kernel.org, Rob Herring , Kumar Gala , Russell King , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. Signed-off-by: Heinrich Schuchardt Reviewed-by: Andrew Lunn --- arch/arm/boot/dts/kirkwood-ds112.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/kirkwood-ds112.dts b/arch/arm/boot/dts/kirkwood-ds112.dts index bf4143c..b84af3d 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 {