Merge remote-tracking branch 'alioth/sid'
Merge open changelog entry for 4.4.6-2 into our open changelog entry. Refresh the new patches.
This commit is contained in:
commit
68c5c5997c
|
@ -245,6 +245,15 @@ linux (4.5.1-1~exp1) UNRELEASED; urgency=medium
|
||||||
* [mips*/octeon] Enable CRYPTO_MD5_OCTEON, CRYPTO_SHA1_OCTEON, CRYPTO_SHA256
|
* [mips*/octeon] Enable CRYPTO_MD5_OCTEON, CRYPTO_SHA1_OCTEON, CRYPTO_SHA256
|
||||||
and CRYPTO_SHA512_OCTEON.
|
and CRYPTO_SHA512_OCTEON.
|
||||||
|
|
||||||
|
[ Roger Shimizu ]
|
||||||
|
* [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)
|
||||||
|
* [armel/marvell] Add DT support for "Buffalo/Revogear Kurobox Pro"
|
||||||
|
* [armhf/armmp] Enable DW_WATCHDOG as module, used on Firefly-RK3288.
|
||||||
|
Patch by Vagrant Cascadian. (Closes: #820834)
|
||||||
|
|
||||||
-- Ben Hutchings <ben@decadent.org.uk> Fri, 25 Mar 2016 13:43:57 +0000
|
-- Ben Hutchings <ben@decadent.org.uk> Fri, 25 Mar 2016 13:43:57 +0000
|
||||||
|
|
||||||
|
|
|
@ -373,8 +373,8 @@ CONFIG_MTD_CFI_I4=y
|
||||||
# CONFIG_MTD_OTP is not set
|
# CONFIG_MTD_OTP is not set
|
||||||
#. Needed e.g. on QNAP devices
|
#. Needed e.g. on QNAP devices
|
||||||
CONFIG_MTD_CFI_INTELEXT=y
|
CONFIG_MTD_CFI_INTELEXT=y
|
||||||
#. Needed e.g. on the D-Link DNS-323
|
#. Needed e.g. on D-Link DNS-323, Buffalo KuroBox-Pro, Buffalo Linkstation LS-GL / LS-WTGL, etc
|
||||||
CONFIG_MTD_CFI_AMDSTD=m
|
CONFIG_MTD_CFI_AMDSTD=y
|
||||||
CONFIG_MTD_CFI_STAA=m
|
CONFIG_MTD_CFI_STAA=m
|
||||||
# CONFIG_MTD_RAM is not set
|
# CONFIG_MTD_RAM is not set
|
||||||
# CONFIG_MTD_ROM is not set
|
# CONFIG_MTD_ROM is not set
|
||||||
|
|
|
@ -1086,6 +1086,7 @@ CONFIG_TWL4030_WATCHDOG=m
|
||||||
CONFIG_IMX2_WDT=m
|
CONFIG_IMX2_WDT=m
|
||||||
CONFIG_TEGRA_WATCHDOG=m
|
CONFIG_TEGRA_WATCHDOG=m
|
||||||
CONFIG_BCM2835_WDT=m
|
CONFIG_BCM2835_WDT=m
|
||||||
|
CONFIG_DW_WATCHDOG=m
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: kernel/power/Kconfig
|
## file: kernel/power/Kconfig
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
From: Heinrich Schuchardt <xypron.glpk@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@gmx.de>
|
||||||
|
Signed-off-by: Gregory CLEMENT <gregory.clement@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 \
|
|
@ -0,0 +1,26 @@
|
||||||
|
From: Heinrich Schuchardt <xypron.glpk@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@gmx.de>
|
||||||
|
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/Makefile | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
--- a/arch/arm/boot/dts/Makefile
|
||||||
|
+++ b/arch/arm/boot/dts/Makefile
|
||||||
|
@@ -210,6 +210,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
|
||||||
|
kirkwood-ns2mini.dtb \
|
||||||
|
kirkwood-nsa310.dtb \
|
||||||
|
kirkwood-nsa310a.dtb \
|
||||||
|
+ kirkwood-nsa320.dtb \
|
||||||
|
kirkwood-nsa325.dtb \
|
||||||
|
kirkwood-openblocks_a6.dtb \
|
||||||
|
kirkwood-openblocks_a7.dtb \
|
171
debian/patches/features/arm/device-tree/ARM-dts-orion5x-add-device-tree-for-kurobox-pro.patch
vendored
Normal file
171
debian/patches/features/arm/device-tree/ARM-dts-orion5x-add-device-tree-for-kurobox-pro.patch
vendored
Normal file
|
@ -0,0 +1,171 @@
|
||||||
|
From: Roger Shimizu <rogershimizu@gmail.com>
|
||||||
|
Date: Wed, 30 Mar 2016 01:11:45 +0900
|
||||||
|
Subject: [PATCH] ARM: dts: orion5x: add device tree for kurobox-pro
|
||||||
|
Origin: http://git.infradead.org/linux-mvebu.git/commitdiff/452cc94458237d4a26aa1e08f23f57f072368e4e
|
||||||
|
|
||||||
|
Add dts file to support Buffalo/Revogear Kurobox-Pro, which is marvell
|
||||||
|
orion5x based 3.5" HDD NAS.
|
||||||
|
|
||||||
|
It's a quite old product and already discontinued. So there's no
|
||||||
|
official website for it. But it was an early product which used marvell
|
||||||
|
orion5x 88F5182 chipset, it's popular in the community.
|
||||||
|
Some unofficial site:
|
||||||
|
- http://buffalo.nas-central.org/wiki/Category:KuroboxPro
|
||||||
|
- http://nice.kaze.com/KUROPRO_ProductSpecifications.pdf
|
||||||
|
|
||||||
|
This device tree is based on the board file:
|
||||||
|
arch/arm/mach-orion5x/kurobox_pro-setup.c
|
||||||
|
However, the probing order of NAND and JEDEC-Flash are different from
|
||||||
|
the original board file, this results in incompatible minor number
|
||||||
|
for a few /dev/mtdX and /dev/mtdblockX devices.
|
||||||
|
So I still want to keep the board file for the time being.
|
||||||
|
|
||||||
|
Signed-off-by: Roger Shimizu <rogershimizu@gmail.com>
|
||||||
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
||||||
|
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
|
||||||
|
---
|
||||||
|
arch/arm/boot/dts/Makefile | 1 +
|
||||||
|
arch/arm/boot/dts/orion5x-kuroboxpro.dts | 127 +++++++++++++++++++++++++++++++
|
||||||
|
2 files changed, 128 insertions(+)
|
||||||
|
create mode 100644 arch/arm/boot/dts/orion5x-kuroboxpro.dts
|
||||||
|
|
||||||
|
--- a/arch/arm/boot/dts/Makefile
|
||||||
|
+++ b/arch/arm/boot/dts/Makefile
|
||||||
|
@@ -517,6 +517,7 @@ dtb-$(CONFIG_SOC_DRA7XX) += \
|
||||||
|
dra7-evm.dtb \
|
||||||
|
dra72-evm.dtb
|
||||||
|
dtb-$(CONFIG_ARCH_ORION5X) += \
|
||||||
|
+ orion5x-kuroboxpro.dtb \
|
||||||
|
orion5x-lacie-d2-network.dtb \
|
||||||
|
orion5x-lacie-ethernet-disk-mini-v2.dtb \
|
||||||
|
orion5x-linkstation-lsgl.dtb \
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/arch/arm/boot/dts/orion5x-kuroboxpro.dts
|
||||||
|
@@ -0,0 +1,127 @@
|
||||||
|
+/*
|
||||||
|
+ * Device Tree file for Buffalo/Revogear Kurobox Pro
|
||||||
|
+ *
|
||||||
|
+ * Copyright (C) 2016
|
||||||
|
+ * Roger Shimizu <rogershimizu@gmail.com>
|
||||||
|
+ *
|
||||||
|
+ * Based on the board file arch/arm/mach-orion5x/kurobox_pro-setup.c
|
||||||
|
+ * Copyright (C) Ronen Shitrit <rshitrit@marvell.com>
|
||||||
|
+ *
|
||||||
|
+ * This file is dual-licensed: you can use it either under the terms
|
||||||
|
+ * of the GPL or the X11 license, at your option. Note that this dual
|
||||||
|
+ * licensing only applies to this file, and not this project as a
|
||||||
|
+ * whole.
|
||||||
|
+ *
|
||||||
|
+ * a) This file is free software; you can redistribute it and/or
|
||||||
|
+ * modify it under the terms of the GNU General Public License as
|
||||||
|
+ * published by the Free Software Foundation; either version 2 of the
|
||||||
|
+ * License, or (at your option) any later version.
|
||||||
|
+ *
|
||||||
|
+ * This file is distributed in the hope that it will be useful
|
||||||
|
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
+ * GNU General Public License for more details.
|
||||||
|
+ *
|
||||||
|
+ * Or, alternatively
|
||||||
|
+ *
|
||||||
|
+ * b) Permission is hereby granted, free of charge, to any person
|
||||||
|
+ * obtaining a copy of this software and associated documentation
|
||||||
|
+ * files (the "Software"), to deal in the Software without
|
||||||
|
+ * restriction, including without limitation the rights to use
|
||||||
|
+ * copy, modify, merge, publish, distribute, sublicense, and/or
|
||||||
|
+ * sell copies of the Software, and to permit persons to whom the
|
||||||
|
+ * Software is furnished to do so, subject to the following
|
||||||
|
+ * conditions:
|
||||||
|
+ *
|
||||||
|
+ * The above copyright notice and this permission notice shall be
|
||||||
|
+ * included in all copies or substantial portions of the Software.
|
||||||
|
+ *
|
||||||
|
+ * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
|
||||||
|
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||||
|
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
|
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
|
||||||
|
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
|
+ * OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+/dts-v1/;
|
||||||
|
+
|
||||||
|
+#include "orion5x-linkstation.dtsi"
|
||||||
|
+#include <dt-bindings/gpio/gpio.h>
|
||||||
|
+
|
||||||
|
+/ {
|
||||||
|
+ model = "Buffalo/Revogear Kurobox Pro";
|
||||||
|
+ compatible = "buffalo,kurobox-pro", "marvell,orion5x-88f5182", "marvell,orion5x";
|
||||||
|
+
|
||||||
|
+ soc {
|
||||||
|
+ ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>,
|
||||||
|
+ <MBUS_ID(0x09, 0x00) 0 0xf2200000 0x800>,
|
||||||
|
+ <MBUS_ID(0x01, 0x0f) 0 0xf4000000 0x40000>,
|
||||||
|
+ <MBUS_ID(0x01, 0x1e) 0 0xfc000000 0x1000000>;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ memory { /* 128 MB */
|
||||||
|
+ device_type = "memory";
|
||||||
|
+ reg = <0x00000000 0x8000000>;
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&pinctrl {
|
||||||
|
+ pmx_power_hdd: pmx-power-hdd {
|
||||||
|
+ marvell,pins = "mpp1";
|
||||||
|
+ marvell,function = "gpio";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ pmx_power_usb: pmx-power-usb {
|
||||||
|
+ marvell,pins = "mpp9";
|
||||||
|
+ marvell,function = "gpio";
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&devbus_cs0 {
|
||||||
|
+ status = "okay";
|
||||||
|
+ compatible = "marvell,orion-nand";
|
||||||
|
+ reg = <MBUS_ID(0x01, 0x1e) 0 0x400>;
|
||||||
|
+ cle = <0>;
|
||||||
|
+ ale = <1>;
|
||||||
|
+ bank-width = <1>;
|
||||||
|
+
|
||||||
|
+ partitions {
|
||||||
|
+ compatible = "fixed-partitions";
|
||||||
|
+ #address-cells = <1>;
|
||||||
|
+ #size-cells = <1>;
|
||||||
|
+
|
||||||
|
+ uImage@0 { /* 4 MB */
|
||||||
|
+ reg = <0 0x400000>;
|
||||||
|
+ read-only;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ rootfs@400000 { /* 64 MB */
|
||||||
|
+ reg = <0x400000 0x4000000>;
|
||||||
|
+ read-only;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ extra@4400000 { /* 188 MB */
|
||||||
|
+ reg = <0x4400000 0xBC00000>;
|
||||||
|
+ read-only;
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&hdd_power {
|
||||||
|
+ gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&usb_power {
|
||||||
|
+ gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&sata {
|
||||||
|
+ nr-ports = <2>;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+&ehci1 {
|
||||||
|
+ status = "okay";
|
||||||
|
+};
|
|
@ -62,6 +62,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-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-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-orion5x-add-for-buffalo-linkstation-ls-gl.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/device-tree/ARM-dts-orion5x-add-device-tree-for-kurobox-pro.patch
|
||||||
|
|
||||||
# Miscellaneous bug fixes
|
# Miscellaneous bug fixes
|
||||||
bugfix/all/misc-bmp085-Enable-building-as-a-module.patch
|
bugfix/all/misc-bmp085-Enable-building-as-a-module.patch
|
||||||
|
|
Loading…
Reference in New Issue