From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4105C47247 for ; Fri, 8 May 2020 13:23:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9CFB8208CA for ; Fri, 8 May 2020 13:23:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588944225; bh=3tC9DxM18mKL+1U6l7Oo5Sr5fzZeZQoNICJo4BJT8sk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EMOz/04uz8CL+VZGez5ICUA3q274Y81seXFIILx5xXn+PZheM/vF1afzUhndYkug/ vRM9ST2sqc6Q2p5d4YvDjBwXHfq4inruxWXvPFDcVIdaMfB8rCIGUO54VIyqtKQKf6 aRPe2oIRtexVZ8SWwxIOSsw5a+VfPdXCeiulYGXE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728206AbgEHMhs (ORCPT ); Fri, 8 May 2020 08:37:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:52362 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728229AbgEHMhp (ORCPT ); Fri, 8 May 2020 08:37:45 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3E21921473; Fri, 8 May 2020 12:37:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588941464; bh=3tC9DxM18mKL+1U6l7Oo5Sr5fzZeZQoNICJo4BJT8sk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mNd8FWhNMNYCVSrDN4aqShWdmC8HTVAHRqQ/NcLWQyceHeCDw2Bh+PoKFU++NrRxS +SkZrutS2zFYF3817rIjmURr1UKglapyvpBoEBHwOxrA/2GFyOiCCyIvBe10alYdo9 2GP0Bof5D+B5gbPxzh6Xw5nR4VBtbjgECgSo1jW0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Heinrich Schuchardt , Andrew Lunn , Gregory CLEMENT Subject: [PATCH 4.4 042/312] ARM: dts: kirkwood: use unique machine name for ds112 Date: Fri, 8 May 2020 14:30:33 +0200 Message-Id: <20200508123127.515499494@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123124.574959822@linuxfoundation.org> References: <20200508123124.574959822@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Heinrich Schuchardt 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 Reviewed-by: Andrew Lunn Signed-off-by: Gregory CLEMENT Signed-off-by: Greg Kroah-Hartman --- 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 {