* [PATCH 1/1] ARM: kirkwood-ds112.dts: use unique machine name
@ 2016-02-07 18:34 Heinrich Schuchardt
2016-02-07 19:26 ` Andrew Lunn
0 siblings, 1 reply; 3+ messages in thread
From: Heinrich Schuchardt @ 2016-02-07 18:34 UTC (permalink / raw)
To: Jason Cooper, Andrew Lunn, Gregory Clement, Sebastian Hesselbarth
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Ben Peddell,
Kumar Gala, Russell King, linux-arm-kernel, devicetree,
linux-kernel, Heinrich Schuchardt
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] ARM: kirkwood-ds112.dts: use unique machine name
2016-02-07 18:34 [PATCH 1/1] ARM: kirkwood-ds112.dts: use unique machine name Heinrich Schuchardt
@ 2016-02-07 19:26 ` Andrew Lunn
2016-02-08 15:58 ` Gregory CLEMENT
0 siblings, 1 reply; 3+ messages in thread
From: Andrew Lunn @ 2016-02-07 19:26 UTC (permalink / raw)
To: Heinrich Schuchardt
Cc: Jason Cooper, Gregory Clement, Sebastian Hesselbarth, Rob Herring,
Pawel Moll, Mark Rutland, Ian Campbell, Ben Peddell, Kumar Gala,
Russell King, linux-arm-kernel, devicetree, linux-kernel
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] ARM: kirkwood-ds112.dts: use unique machine name
2016-02-07 19:26 ` Andrew Lunn
@ 2016-02-08 15:58 ` Gregory CLEMENT
0 siblings, 0 replies; 3+ messages in thread
From: Gregory CLEMENT @ 2016-02-08 15:58 UTC (permalink / raw)
To: Heinrich Schuchardt
Cc: Andrew Lunn, Jason Cooper, Sebastian Hesselbarth, Rob Herring,
Pawel Moll, Mark Rutland, Ian Campbell, Ben Peddell, Kumar Gala,
Russell King, linux-arm-kernel, devicetree, linux-kernel
Hi Heinrich,
On dim., févr. 07 2016, Andrew Lunn <andrew@lunn.ch> wrote:
> 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>
Applied on mvebu/fixes with the Fixes tag and Andrew Reviewed-by tag.
Thanks,
Gregory
>
> 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
>>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-08 15:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-07 18:34 [PATCH 1/1] ARM: kirkwood-ds112.dts: use unique machine name Heinrich Schuchardt
2016-02-07 19:26 ` Andrew Lunn
2016-02-08 15:58 ` Gregory CLEMENT
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).