[linux] 01/01: [armel/marvell] Add DT support for "Synology DS112" and "Zyxel NSA320"
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Thu Mar 31 16:20:42 UTC 2016
This is an automated email from the git hooks/post-receive script.
rosh-guest pushed a commit to branch sid
in repository linux.
commit b1e9b11e7af69837160cb52d3bc74c5cc0179ea7
Author: Roger Shimizu <rogershimizu at gmail.com>
Date: Thu Mar 31 00:30:03 2016 +0900
[armel/marvell] Add DT support for "Synology DS112" and "Zyxel NSA320"
Thanks to Heinrich Schuchardt.
(Closes: #819393)
---
debian/changelog | 2 ++
...rkwood-add-kirkwood-ds112.dtb-to-Makefile.patch | 28 +++++++++++++++
...kwood-add-kirkwood-nsa320.dtb-to-Makefile.patch | 28 +++++++++++++++
...irkwood-use-unique-machine-name-for-ds112.patch | 40 ++++++++++++++++++++++
debian/patches/series | 3 ++
5 files changed, 101 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 6bbfe0e..0742dda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ linux (4.4.6-2) UNRELEASED; urgency=medium
* [armel/marvell] Change MTD_CFI_AMDSTD from module to built-in
because orion5x-based Buffalo Linkstation devices still need it
(Closes: #818598)
+ * [armel/marvell] Add DT support for "Synology DS112" and "Zyxel NSA320".
+ Thanks to Heinrich Schuchardt. (Closes: #819393)
-- Salvatore Bonaccorso <carnil at debian.org> Thu, 17 Mar 2016 18:19:26 +0100
diff --git a/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-ds112.dtb-to-Makefile.patch b/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-ds112.dtb-to-Makefile.patch
new file mode 100644
index 0000000..e673e89
--- /dev/null
+++ b/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-ds112.dtb-to-Makefile.patch
@@ -0,0 +1,28 @@
+From: Heinrich Schuchardt <xypron.glpk at gmx.de>
+Date: Mon, 28 Mar 2016 10:03:48 +0200
+Subject: [PATCH 1/2] ARM: dts: kirkwood: add kirkwood-ds112.dtb to Makefile
+Origin: http://git.infradead.org/linux-mvebu.git/commitdiff/fc5c796e12511a7c027b5a4438719dde2f796208
+
+Commit 2d0a7addbd10 ("ARM: Kirkwood: Add support for many Synology
+NAS devices") created the new file kirkwood-ds112.dts but did not
+add it to the Makefile.
+
+Fixes: 2d0a7addbd10 ("ARM: Kirkwood: Add support for many Synology NAS devices")
+Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
+Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
+---
+ arch/arm/boot/dts/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 95c1923..67d5368 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -177,6 +177,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
+ kirkwood-ds109.dtb \
+ kirkwood-ds110jv10.dtb \
+ kirkwood-ds111.dtb \
++ kirkwood-ds112.dtb \
+ kirkwood-ds209.dtb \
+ kirkwood-ds210.dtb \
+ kirkwood-ds212.dtb \
diff --git a/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-nsa320.dtb-to-Makefile.patch b/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-nsa320.dtb-to-Makefile.patch
new file mode 100644
index 0000000..c1a160e
--- /dev/null
+++ b/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-nsa320.dtb-to-Makefile.patch
@@ -0,0 +1,28 @@
+From: Heinrich Schuchardt <xypron.glpk at gmx.de>
+Date: Mon, 28 Mar 2016 10:38:31 +0200
+Subject: [PATCH 2/2] ARM: dts: kirkwood: add kirkwood-nsa320.dtb to Makefile
+Origin: http://git.infradead.org/linux-mvebu.git/commitdiff/9ec423ed62b8278412400fae6c064edb6ce1bb51
+
+Commit be3d7d023b87 ("ARM: kirkwood: Add DTS file for NSA320")
+created the new file kirkwood-nsa320.dts but did not
+add it to the Makefile.
+
+Fixes: be3d7d023b87 ("ARM: kirkwood: Add DTS file for NSA320")
+Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
+Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
+---
+ arch/arm/boot/dts/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 67d5368..e9083a9 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -215,6 +215,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
+ kirkwood-ns2mini.dtb \
+ kirkwood-nsa310.dtb \
+ kirkwood-nsa310a.dtb \
++ kirkwood-nsa320.dtb \
+ kirkwood-openblocks_a6.dtb \
+ kirkwood-openblocks_a7.dtb \
+ kirkwood-openrd-base.dtb \
diff --git a/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-use-unique-machine-name-for-ds112.patch b/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-use-unique-machine-name-for-ds112.patch
new file mode 100644
index 0000000..ccf7796
--- /dev/null
+++ b/debian/patches/features/arm/device-tree/ARM-dts-kirkwood-use-unique-machine-name-for-ds112.patch
@@ -0,0 +1,40 @@
+From: Heinrich Schuchardt <xypron.glpk at gmx.de>
+Date: Sun, 7 Feb 2016 19:34:26 +0100
+Subject: [PATCH] ARM: dts: kirkwood: use unique machine name for ds112
+Origin: https://git.kernel.org/linus/9d021c9d1b4b774a35d8a03d58dbf029544debda
+
+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 at gmx.de>
+Reviewed-by: Andrew Lunn <andrew at lunn.ch>
+Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
+---
+ 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 {
diff --git a/debian/patches/series b/debian/patches/series
index 84c84a1..c38f871 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -94,6 +94,9 @@ features/arm/device-tree/ARM-dts-kirkwood-split-lswvl-dts-to-linkstation-lsvl-an
features/arm/device-tree/ARM-dts-kirkwood-add-for-buffalo-linkstation-ls-qvl.patch
features/arm/device-tree/ARM-dts-orion5x-split-linkstation-lswtgl-into-common-and-.patch
features/arm/device-tree/ARM-dts-orion5x-add-for-buffalo-linkstation-ls-gl.patch
+features/arm/device-tree/ARM-dts-kirkwood-use-unique-machine-name-for-ds112.patch
+features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-ds112.dtb-to-Makefile.patch
+features/arm/device-tree/ARM-dts-kirkwood-add-kirkwood-nsa320.dtb-to-Makefile.patch
features/arm/novena/ARM-dts-imx6q-add-Novena-board.patch
features/arm/novena/ARM-dts-imx6q-clean-up-unused-ipu2grp.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list