From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/1] ARM: kirkwood-ds112.dts: use unique machine name
Date: Sun, 7 Feb 2016 20:26:32 +0100 [thread overview]
Message-ID: <20160207192632.GA28121@lunn.ch> (raw)
In-Reply-To: <1454870066-3353-1-git-send-email-xypron.glpk@gmx.de>
On Sun, Feb 07, 2016 at 07:34:26PM +0100, Heinrich Schuchardt wrote:
> 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 <xypron.glpk@gmx.de>
Fixes: 2d0a7addbd10 ("ARM: Kirkwood: Add support for many Synology NAS devices")
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Thanks
Andrew
> ---
> 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 {
> --
> 2.1.4
>
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Lunn <andrew@lunn.ch>
To: Heinrich Schuchardt <xypron.glpk@gmx.de>
Cc: Jason Cooper <jason@lakedaemon.net>,
Gregory Clement <gregory.clement@free-electrons.com>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Ben Peddell <klightspeed@killerwolves.net>,
Kumar Gala <galak@codeaurora.org>,
Russell King <linux@arm.linux.org.uk>,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/1] ARM: kirkwood-ds112.dts: use unique machine name
Date: Sun, 7 Feb 2016 20:26:32 +0100 [thread overview]
Message-ID: <20160207192632.GA28121@lunn.ch> (raw)
In-Reply-To: <1454870066-3353-1-git-send-email-xypron.glpk@gmx.de>
On Sun, Feb 07, 2016 at 07:34:26PM +0100, Heinrich Schuchardt wrote:
> 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 <xypron.glpk@gmx.de>
Fixes: 2d0a7addbd10 ("ARM: Kirkwood: Add support for many Synology NAS devices")
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Thanks
Andrew
> ---
> 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 {
> --
> 2.1.4
>
next prev parent reply other threads:[~2016-02-07 19:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-07 18:34 [PATCH 1/1] ARM: kirkwood-ds112.dts: use unique machine name Heinrich Schuchardt
2016-02-07 18:34 ` Heinrich Schuchardt
2016-02-07 19:26 ` Andrew Lunn [this message]
2016-02-07 19:26 ` Andrew Lunn
2016-02-08 15:58 ` Gregory CLEMENT
2016-02-08 15:58 ` Gregory CLEMENT
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160207192632.GA28121@lunn.ch \
--to=andrew@lunn.ch \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.